commits May 2011

commits@lists.open-mesh.org

1 participants
84 discussions

batctl; branch, master, updated. v2011.1.0-15-g8be851a

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 8be851a7aea795e13de946fe72a4221a0798b045 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:15 2011 +0200 batctl: Make called tools in clean and install configurable Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index edd8907..c2b07e7 100755 --- a/Makefile +++ b/Makefile @@ -39,6 +39,9 @@ endif # standard build tools CC ?= gcc +RM ?= rm -f +INSTALL ?= install +MKDIR ?= mkdir -p COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) @@ -61,11 +64,11 @@ $(BINARY_NAME): $(OBJ) $(LINK.o) $^ $(LDLIBS) -o $@ clean: - rm -f $(BINARY_NAME) $(OBJ) $(DEP) + $(RM) $(BINARY_NAME) $(OBJ) $(DEP) install: $(BINARY_NAME) - mkdir -p $(SBINDIR) - install -m 0755 $(BINARY_NAME) $(SBINDIR) + $(MKDIR) $(SBINDIR) + $(INSTALL) -m 0755 $(BINARY_NAME) $(SBINDIR) # load dependencies DEP = $(OBJ:.o=.d) -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-14-g21a79a1

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 21a79a12e377457286d12d2348680de2988b3052 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:14 2011 +0200 batctl: Use standard-like build rules User expect a specific naming inside makefile rules which they can modify by changing environment variables or providing them explicitely as parameters of the make call. The naming was extracted from the gnu make standard rules database. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 0683fd7..edd8907 100755 --- a/Makefile +++ b/Makefile @@ -23,9 +23,9 @@ BINARY_NAME = batctl OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o # batctl flags and options -CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -EXTRA_CFLAGS += -DREVISION_VERSION=$(REVISION_VERSION) -LDFLAGS += -lm +CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD +CPPFLAGS += -DREVISION_VERSION=$(REVISION_VERSION) +LDLIBS += -lm # disable verbose output ifneq ($(findstring $(MAKEFLAGS),s),s) @@ -39,6 +39,8 @@ endif # standard build tools CC ?= gcc +COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c +LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) # standard install paths SBINDIR = $(INSTALL_PREFIX)/usr/sbin @@ -53,10 +55,10 @@ all: $(BINARY_NAME) # standard build rules .SUFFIXES: .o .c .c.o: - $(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@ + $(COMPILE.c) -o $@ $< -$(BINARY_NAME): $(OBJ) Makefile - $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) +$(BINARY_NAME): $(OBJ) + $(LINK.o) $^ $(LDLIBS) -o $@ clean: rm -f $(BINARY_NAME) $(OBJ) $(DEP) -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-13-g6e05c19

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 6e05c19209d8ed697c1f6a03ca23aeed1c77b09f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:13 2011 +0200 batctl: Reorder Makefile for better readability Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index c8cb62f..0683fd7 100755 --- a/Makefile +++ b/Makefile @@ -18,6 +18,16 @@ # 02110-1301, USA # +# batctl build and install configuration +BINARY_NAME = batctl +OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o + +# batctl flags and options +CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing +EXTRA_CFLAGS += -DREVISION_VERSION=$(REVISION_VERSION) +LDFLAGS += -lm + +# disable verbose output ifneq ($(findstring $(MAKEFLAGS),s),s) ifndef V Q_CC = @echo ' ' CC $@; @@ -27,32 +37,26 @@ ifndef V endif endif +# standard build tools CC ?= gcc -CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) -LDFLAGS += -lm +# standard install paths SBINDIR = $(INSTALL_PREFIX)/usr/sbin -OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o -DEP = $(OBJ:.o=.d) - -BINARY_NAME = batctl - -REVISION= $(shell if [ -d .git ]; then \ - echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \ - fi) - +# try to generate revision +REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) REVISION_VERSION =\"\ $(REVISION)\" +# default target all: $(BINARY_NAME) -$(BINARY_NAME): $(OBJ) Makefile - $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) - +# standard build rules +.SUFFIXES: .o .c .c.o: $(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@ --include $(DEP) + +$(BINARY_NAME): $(OBJ) Makefile + $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) clean: rm -f $(BINARY_NAME) $(OBJ) $(DEP) @@ -61,4 +65,8 @@ install: $(BINARY_NAME) mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) +# load dependencies +DEP = $(OBJ:.o=.d) +-include $(DEP) + .PHONY: all clean install -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-12-g75c9f10

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 75c9f1095fe1372954ec15b0f2e3dc1b044ea553 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:12 2011 +0200 batctl: Build binary before installing it Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index a06177d..c8cb62f 100755 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ $(BINARY_NAME): $(OBJ) Makefile clean: rm -f $(BINARY_NAME) $(OBJ) $(DEP) -install: +install: $(BINARY_NAME) mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-11-g8ae5eed

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 8ae5eed8e9225045f449246cabf057ea7aa79cf4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:11 2011 +0200 batctl: Only define CC when not already specified It is possible that a build environment specifies the CC different than gcc (for example gcc-4.6). The Makefile should only set it when the compiler wasn't explicitely set. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index f95a9d2..a06177d 100755 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ifndef V endif endif -CC = gcc +CC ?= gcc CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lm -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-10-gd487861

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit d487861eab6748165c72e6f064f37742057049ff Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:10 2011 +0200 batctl: Mark makefile targets without output as PHONY Normally makefile targets should create an output with the same name as the target. It is necessary to mark them as PHONY to prevent that the virtual target like all, clean or install aren't executed when a file with the same name exists. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 8fc2300..f95a9d2 100755 --- a/Makefile +++ b/Makefile @@ -60,3 +60,5 @@ clean: install: mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) + +.PHONY: all clean install -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-9-g4866155

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 4866155949559809b37714873b938cacb7ae3af8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:09 2011 +0200 batctl: Provide shebang to inform about interpreter Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 1bc4879..8fc2300 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +#!/usr/bin/make -f +# -*- makefile -*- # # Copyright (C) 2006-2011 B.A.T.M.A.N. contributors # -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-8-ga6f3c76

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit a6f3c761b6393692f1ffb0760fc887b404d521a7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:08 2011 +0200 batctl: Directly specify objects in Makefile The information about header and source files aren't needed by the Makefile. Only the dependencies to headers provide useful information, but these are automatically included by the generated *.d files. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index cf0b5c5..1bc4879 100644 --- a/Makefile +++ b/Makefile @@ -32,12 +32,8 @@ LDFLAGS += -lm SBINDIR = $(INSTALL_PREFIX)/usr/sbin -EXTRA_MODULES_C := bisect.c -EXTRA_MODULES_H := bisect.h - -SRC_C = main.c bat-hosts.c functions.c sys.c debug.c ping.c traceroute.c tcpdump.c list-batman.c hash.c vis.c debugfs.c $(EXTRA_MODULES_C) -SRC_H = main.h bat-hosts.h functions.h sys.h debug.h ping.h traceroute.h tcpdump.h list-batman.h hash.h allocate.h vis.h debugfs.h $(EXTRA_MODULES_H) -SRC_O = $(SRC_C:.c=.o) +OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o list-batman.o hash.o vis.o debugfs.o bisect.o +DEP = $(OBJ:.o=.d) BINARY_NAME = batctl @@ -49,15 +45,15 @@ REVISION_VERSION =\"\ $(REVISION)\" all: $(BINARY_NAME) -$(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile - $(Q_LD)$(CC) -o $@ $(SRC_O) $(LDFLAGS) +$(BINARY_NAME): $(OBJ) Makefile + $(Q_LD)$(CC) -o $@ $(OBJ) $(LDFLAGS) .c.o: $(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@ --include $(SRC_C:.c=.d) +-include $(DEP) clean: - rm -f $(BINARY_NAME) *.o *.d + rm -f $(BINARY_NAME) $(OBJ) $(DEP) install: mkdir -p $(SBINDIR) -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-7-ge7b045c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit e7b045c7b266b330f1c385fd89332579302312c0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:07 2011 +0200 batctl: Remove unused Makefile variables Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 61a81fb..cf0b5c5 100644 --- a/Makefile +++ b/Makefile @@ -32,10 +32,6 @@ LDFLAGS += -lm SBINDIR = $(INSTALL_PREFIX)/usr/sbin -LOG_BRANCH = trunk/batctl - -SRC_FILES = "$\.c$\|$\.h$\|$Makefile$\|$INSTALL$\|$LIESMICH$\|$README$\|$THANKS$\|$TRASH$\|$Doxyfile$\|$./posix$\|$./linux$\|$./bsd$\|$./man$\|$./doc$" - EXTRA_MODULES_C := bisect.c EXTRA_MODULES_H := bisect.h @@ -43,9 +39,7 @@ SRC_C = main.c bat-hosts.c functions.c sys.c debug.c ping.c traceroute.c tcpdump SRC_H = main.h bat-hosts.h functions.h sys.h debug.h ping.h traceroute.h tcpdump.h list-batman.h hash.h allocate.h vis.h debugfs.h $(EXTRA_MODULES_H) SRC_O = $(SRC_C:.c=.o) -PACKAGE_NAME = batctl BINARY_NAME = batctl -SOURCE_VERSION_HEADER = main.h REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \ -- batctl

11 years, 10 months

batctl; branch, master, updated. v2011.1.0-6-gb2e3f83

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit b2e3f83a290334d272f3c4a7ea7d834750a6f7d3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 14:28:06 2011 +0200 batctl: Don't automatically build in parallel Distributions like Gentoo and Debian have policies which make it necessary to use some kind of environmental variable to control the parallel build. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 3b9e853..61a81fb 100644 --- a/Makefile +++ b/Makefile @@ -53,10 +53,7 @@ REVISION= $(shell if [ -d .git ]; then \ REVISION_VERSION =\"\ $(REVISION)\" -NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) - -all: - $(MAKE) -j $(NUM_CPUS) $(BINARY_NAME) +all: $(BINARY_NAME) $(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile $(Q_LD)$(CC) -o $@ $(SRC_O) $(LDFLAGS) -- batctl

11 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2011