commits December 2011

commits@lists.open-mesh.org

1 participants
80 discussions

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 6c8503eef90b2134c5444f6d68b3d6c9a1166882 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:38 2011 +0200 batmand: 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 a25f3fc..a0a7f88 100755 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ endif ifeq ($(UNAME),GNU/kFreeBSD) OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) -LDFLAGS += -lfreebsd -lbsd +LDLIBS += -lfreebsd -lbsd endif ifeq ($(UNAME),FreeBSD) @@ -53,9 +53,9 @@ OBJ = batman.o originator.o schedule.o list-batman.o allocate.o bitarray.o hash. #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING # batmand flags and options -CFLAGS += -pedantic -Wall -W -std=gnu99 -EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) -LDFLAGS += -lpthread +CFLAGS += -pedantic -Wall -W -std=gnu99 -MD +CPPFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) +LDLIBS += -lpthread # disable verbose output ifneq ($(findstring $(MAKEFLAGS),s),s) @@ -69,6 +69,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 @@ -83,10 +85,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) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 9eba222c470369af82ad512848941335ef1f40cc Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:39 2011 +0200 batmand: Make called tools in clean and install configurable Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index a0a7f88..6c77fe7 100755 --- a/Makefile +++ b/Makefile @@ -69,6 +69,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) @@ -91,11 +94,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) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit db8f0e250e4acdf3a24dc1fa5ae8320a02e277dd Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:40 2011 +0200 batmand: Rename INSTALL_PREFIX to DESTDIR Makefile generators like cmake or configure (generated by autotools) usually use DESTDIR to allow the modification of the "root" path without affecting other build steps. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 6c77fe7..4f64373 100755 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ 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 +SBINDIR = /usr/sbin # try to generate revision REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) @@ -97,8 +97,8 @@ clean: $(RM) $(BINARY_NAME) $(OBJ) $(DEP) install: $(BINARY_NAME) - $(MKDIR) $(SBINDIR) - $(INSTALL) -m 0755 $(BINARY_NAME) $(SBINDIR) + $(MKDIR) $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR) # load dependencies DEP = $(OBJ:.o=.d) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 264214e45d2f084830bd80cf4ce8f3d7963e1024 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:41 2011 +0200 batmand: Introduce PREFIX as standard installation prefix cmake and configure (generated by autotools) use a prefix configuration which is by default /usr/local to define to which all other paths are relative to. SBINDIR is then defined as $PREFIX/sbin but can also be redefined. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 4f64373..21a379c 100755 --- a/Makefile +++ b/Makefile @@ -76,7 +76,8 @@ COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) # standard install paths -SBINDIR = /usr/sbin +PREFIX = /usr/local +SBINDIR = $(PREFIX)/sbin # try to generate revision REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit bf55c5ddcdc080c245f4241ef16174b0b7f13185 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:42 2011 +0200 batmand: Install manpage Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 21a379c..4f6fe64 100755 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) endif OBJ = batman.o originator.o schedule.o list-batman.o allocate.o bitarray.o hash.o profile.o ring_buffer.o hna.o $(OS_OBJ) +MANPAGE = man/batmand.8 # activate this variable to deactivate policy routing for backward compatibility #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING @@ -78,6 +79,7 @@ LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) # standard install paths PREFIX = /usr/local SBINDIR = $(PREFIX)/sbin +MANDIR = $(PREFIX)/share/man # try to generate revision REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) @@ -99,7 +101,9 @@ clean: install: $(BINARY_NAME) $(MKDIR) $(DESTDIR)$(SBINDIR) + $(MKDIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 0644 $(MANPAGE) $(DESTDIR)$(MANDIR)/man8 # load dependencies DEP = $(OBJ:.o=.d) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 96f375d18dd825de0ac351bb2f8194dffebbc082 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 5 10:54:59 2011 +0200 batmand: Replace version info instead of appending them The version number of batmand can get revision numbers added. This is useful to give hints about the revision of a distribution package and the used patchset or the commit which was used to build it. The prepended source number or branch name doesn't add any additional information which would help to identify problems and can therefore be omitted. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 4f6fe64..346b14a 100755 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ MANPAGE = man/batmand.8 # batmand flags and options CFLAGS += -pedantic -Wall -W -std=gnu99 -MD -CPPFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) +CPPFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) LDLIBS += -lpthread # disable verbose output @@ -82,8 +82,12 @@ SBINDIR = $(PREFIX)/sbin MANDIR = $(PREFIX)/share/man # try to generate revision -REVISION = $(shell if [ -d .git ]; then echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); fi) -REVISION_VERSION =\"\ $(REVISION)\" +REVISION= $(shell if [ -d .git ]; then \ + echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ + fi) +ifneq ($(REVISION),) +CPPFLAGS += -DSOURCE_VERSION=\"$(REVISION)\" +endif # default target all: $(BINARY_NAME) diff --git a/batman.h b/batman.h index b1a3076..ae51c22 100644 --- a/batman.h +++ b/batman.h @@ -40,7 +40,9 @@ #include "profile.h" #include "ring_buffer.h" -#define SOURCE_VERSION "0.4-alpha" /* put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ +#ifndef SOURCE_VERSION +#define SOURCE_VERSION "0.4" +#endif #define ADDR_STR_LEN 16 #define TQ_MAX_VALUE 255 @@ -59,11 +61,6 @@ ***/ -#ifndef REVISION_VERSION -#define REVISION_VERSION "0" -#endif - - /* * No configuration files or fancy command line switches yet diff --git a/linux/modules/Makefile.kbuild b/linux/modules/Makefile.kbuild index 1be319b..ae538ad 100644 --- a/linux/modules/Makefile.kbuild +++ b/linux/modules/Makefile.kbuild @@ -3,7 +3,11 @@ ifeq ($(MAKING_MODULES),1) endif LINUX24:=2.4 -EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ $(REVISION)\" +ifneq ($(REVISION),) +ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" +else +ccflags-y += -DSOURCE_VERSION=\"\" +endif ifneq ($(strip $(findstring $(LINUX24),$(LINUX_VERSION))),$(LINUX24)) diff --git a/linux/modules/gateway.c b/linux/modules/gateway.c index 63456aa..49b958f 100644 --- a/linux/modules/gateway.c +++ b/linux/modules/gateway.c @@ -95,7 +95,7 @@ int init_module(void) device_create(batman_class, NULL, MKDEV(Major, 0), NULL, "batgat"); - DBG( "batgat loaded %s", strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : "" ); + DBG( "batgat loaded %s", SOURCE_VERSION ); DBG( "I was assigned major number %d. To talk to", Major ); DBG( "the driver, create a dev file with 'mknod /dev/batgat c %d 0'.", Major ); DBG( "Remove the device file and module when done." ); diff --git a/linux/modules/gateway.h b/linux/modules/gateway.h index 238b518..fc98174 100644 --- a/linux/modules/gateway.h +++ b/linux/modules/gateway.h @@ -69,10 +69,6 @@ #define PROC_ROOT_DIR "batgat" #define PROC_FILE_CLIENTS "clients" -#ifndef REVISION_VERSION -#define REVISION_VERSION "1" -#endif - struct gw_client { uint32_t wip_addr; uint32_t vip_addr; diff --git a/linux/modules/gateway24.c b/linux/modules/gateway24.c index 858aa27..a6b91d2 100644 --- a/linux/modules/gateway24.c +++ b/linux/modules/gateway24.c @@ -80,7 +80,7 @@ int init_module(void) } - DBG( "batgat loaded %s", strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : "" ); + DBG( "batgat loaded %s", SOURCE_VERSION ); DBG( "I was assigned major number %d. To talk to", Major ); DBG( "the driver, create a dev file with 'mknod /dev/batgat c %d 0'.", Major ); printk(KERN_DEBUG "Remove the device file and module when done." ); diff --git a/linux/modules/gateway24.h b/linux/modules/gateway24.h index a9a27b6..b1958a7 100644 --- a/linux/modules/gateway24.h +++ b/linux/modules/gateway24.h @@ -74,10 +74,6 @@ #define PROC_ROOT_DIR "batgat" #define PROC_FILE_CLIENTS "clients" -#ifndef REVISION_VERSION -#define REVISION_VERSION "1" -#endif - struct gw_client { uint32_t wip_addr; uint32_t vip_addr; diff --git a/originator.c b/originator.c index 99d7734..a96c3d4 100644 --- a/originator.c +++ b/originator.c @@ -423,7 +423,7 @@ void debug_orig(void) { uptime_sec = (uint64_t)(get_time_msec64() / 1000); debug_output(2, "BOD\n"); - debug_output(2, "%''12s (%s/%i) %''15s [%10s], gw_class ... [B.A.T.M.A.N. %s%s, MainIF/IP: %s/%s, UT: %id%2ih%2im] \n", "Gateway", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), ((struct batman_if *)if_list.next)->dev, orig_str, (uint32_t)(uptime_sec/86400), (uint32_t)((uptime_sec%86400)/3600), (uint32_t)((uptime_sec%3600)/60)); + debug_output(2, "%''12s (%s/%i) %''15s [%10s], gw_class ... [B.A.T.M.A.N. %s, MainIF/IP: %s/%s, UT: %id%2ih%2im] \n", "Gateway", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", SOURCE_VERSION, ((struct batman_if *)if_list.next)->dev, orig_str, (uint32_t)(uptime_sec/86400), (uint32_t)((uptime_sec%86400)/3600), (uint32_t)((uptime_sec%3600)/60)); if ( list_empty( &gw_list ) ) { @@ -467,7 +467,7 @@ void debug_orig(void) { uptime_sec = (uint64_t)(get_time_msec64() / 1000); debug_output(1, "BOD \n"); - debug_output(1, " %-11s (%s/%i) %''15s [%10s]: %''20s ... [B.A.T.M.A.N. %s%s, MainIF/IP: %s/%s, UT: %id%2ih%2im] \n", "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", "Potential nexthops", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), ((struct batman_if *)if_list.next)->dev, orig_str, (uint32_t)(uptime_sec/86400), (uint32_t)((uptime_sec%86400)/3600), (uint32_t)((uptime_sec%3600)/60)); + debug_output(1, " %-11s (%s/%i) %''15s [%10s]: %''20s ... [B.A.T.M.A.N. %s, MainIF/IP: %s/%s, UT: %id%2ih%2im] \n", "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", "Potential nexthops", SOURCE_VERSION, ((struct batman_if *)if_list.next)->dev, orig_str, (uint32_t)(uptime_sec/86400), (uint32_t)((uptime_sec%86400)/3600), (uint32_t)((uptime_sec%3600)/60)); if ( debug_clients.clients_num[3] > 0 ) { diff --git a/posix/init.c b/posix/init.c index 4fe2324..afd409f 100644 --- a/posix/init.c +++ b/posix/init.c @@ -166,9 +166,6 @@ void apply_init_args( int argc, char *argv[] ) { stop = 0; prog_name = argv[0]; - if ( strstr( SOURCE_VERSION, "-" ) != NULL ) - printf( "WARNING: You are using the unstable batman branch. If you are interested in *using* batman get the latest stable release !\n" ); - while ( ( optchar = getopt_long( argc, argv, "a:A:bcd:hHio:g:p:r:s:vV", long_options, &option_index ) ) != -1 ) { switch ( optchar ) { @@ -359,14 +356,14 @@ void apply_init_args( int argc, char *argv[] ) { case 'v': - printf("B.A.T.M.A.N. %s%s (compatibility version %i)\n", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), COMPAT_VERSION); + printf("B.A.T.M.A.N. %s (compatibility version %i)\n", SOURCE_VERSION, COMPAT_VERSION); exit(EXIT_SUCCESS); case 'V': print_animation(); - printf("\x1B[0;0HB.A.T.M.A.N. %s%s (compatibility version %i)\n", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), COMPAT_VERSION); + printf("\x1B[0;0HB.A.T.M.A.N. %s (compatibility version %i)\n", SOURCE_VERSION, COMPAT_VERSION); printf("\x1B[9;0H \t May the bat guide your path ...\n\n\n"); exit(EXIT_SUCCESS); @@ -551,7 +548,7 @@ void apply_init_args( int argc, char *argv[] ) { } else { - printf("B.A.T.M.A.N. %s%s (compatibility version %i)\n", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), COMPAT_VERSION); + printf("B.A.T.M.A.N. %s (compatibility version %i)\n", SOURCE_VERSION, COMPAT_VERSION); debug_clients.clients_num[ debug_level - 1 ]++; debug_level_info = debugMalloc( sizeof(struct debug_level_info), 205 ); -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit f085a77693d5de3014a53788af662bbefd80dbea Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:29 2011 +0200 batmand: Remove optimisation and debugging options Distributions like Gentoo or Debian have to strip the options regarding the optimisation levels and debugging information to fulfil their policies. There is currently no valid reason why the Makefile should override it. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index cb7c950..b472805 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ endif #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING CC = gcc -CFLAGS += -pedantic -Wall -W -Os -g3 -std=gnu99 +CFLAGS += -pedantic -Wall -W -std=gnu99 EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lpthread -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit d60a44a2d299a1881e257bac436625d62780021e Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 23 14:12:58 2010 +0200 batmand: 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 b472805..ce94472 100644 --- a/Makefile +++ b/Makefile @@ -71,11 +71,8 @@ REVISION= $(shell if [ -d .git ]; then \ fi) REVISION_VERSION =\"\ $(REVISION)\" -NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 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) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 2c72483bd83d14c15358174ecbfd7b65ccdbe167 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:32 2011 +0200 batmand: 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 ce94472..3ac2885 100644 --- a/Makefile +++ b/Makefile @@ -36,33 +36,33 @@ LDFLAGS += -lpthread SBINDIR = $(INSTALL_PREFIX)/usr/sbin UNAME = $(shell uname) -POSIX_C = posix/init.c posix/posix.c posix/tunnel.c posix/unix_socket.c -BSD_C = bsd/route.c bsd/tun.c bsd/kernel.c bsd/compat.c +POSIX_OBJ = posix/init.o posix/posix.o posix/tunnel.o posix/unix_socket.o +BSD_OBJ = bsd/route.o bsd/tun.o bsd/kernel.o bsd/compat.o +LINUX_OBJ = linux/route.o linux/tun.o linux/kernel.o ifeq ($(UNAME),Linux) -OS_C = linux/route.c linux/tun.c linux/kernel.c $(POSIX_C) +OS_OBJ = $(LINUX_OBJ) $(POSIX_OBJ) endif ifeq ($(UNAME),Darwin) -OS_C = $(BSD_C) $(POSIX_C) +OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) endif ifeq ($(UNAME),GNU/kFreeBSD) -OS_C = $(BSD_C) $(POSIX_C) +OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) LDFLAGS += -lfreebsd -lbsd endif ifeq ($(UNAME),FreeBSD) -OS_C = $(BSD_C) $(POSIX_C) +OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) endif ifeq ($(UNAME),OpenBSD) -OS_C = $(BSD_C) $(POSIX_C) +OS_OBJ = $(BSD_OBJ) $(POSIX_OBJ) endif -SRC_C= batman.c originator.c schedule.c list-batman.c allocate.c bitarray.c hash.c profile.c ring_buffer.c hna.c $(OS_C) -SRC_H= batman.h originator.h schedule.h list-batman.h os.h allocate.h bitarray.h hash.h profile.h packet.h types.h ring_buffer.h hna.h -SRC_O= $(SRC_C:.c=.o) +OBJ = batman.o originator.o schedule.o list-batman.o allocate.o bitarray.o hash.o profile.o ring_buffer.o hna.o $(OS_OBJ) +DEP = $(OBJ:.o=.d) BINARY_NAME = batmand @@ -74,16 +74,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 posix/*.o linux/*.o bsd/*.o - rm -f *.d posix/*.d linux/*.d bsd/*.d + rm -f $(BINARY_NAME) $(OBJ) $(DEP) install: mkdir -p $(SBINDIR) -- batmand

1 0

batmand; branch, master, updated. v0.3.2-45-g50aebcf
by postmaster＠open-mesh.org 06 Dec '11

06 Dec '11

The following commit has been merged in the master branch: commit 25119fc0da21628e1d2d590d50b49fd3b11dc9d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 21 15:10:34 2011 +0200 batmand: 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 2514c2d..3b517da 100755 --- a/Makefile +++ b/Makefile @@ -89,3 +89,5 @@ clean: install: mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR) + +.PHONY: all clean install -- batmand

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2011