The following commit has been merged in the master branch:
commit b226dcaa1c3dc7a70beff6df766c4e8d20c7d218
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat May 21 15:45:17 2011 +0200
vis: 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 2ecf090..745b6e3 100755
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,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)
--
vis
The following commit has been merged in the master branch:
commit 9c767f8fc578222183214001b947f3f6fb1f8928
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Apr 3 23:36:52 2011 +0200
vis: Remove subversion/svk revision information
The current version of batmand cannot be obtained from subversion or
svk anymore. It is unnecessary to provide the functionality to retrieve
the current revision using these tools.
We only have to differenciate between git checkout and official release.
We cannot detect a git snapshot and thus the distribution has to provide
the REVISION variable for snapshots.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
diff --git a/Makefile b/Makefile
index db1f885..5cd4b00 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,10 @@ SRC_O= $(SRC_C:.c=.o)
BINARY_NAME= vis
-REVISION:= $(shell if [ -d .svn ]; then svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; else if [ -d ~/.svk ]; then echo $$(svk info | grep "Mirrored From" | awk '{print $$5}'); fi; fi)
-REVISION_VERSION=\"\ rv$(REVISION)\"
+REVISION= $(shell if [ -d .git ]; then \
+ echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \
+ 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`)
--
vis
The following commit has been merged in the master branch:
commit f15c90371469fbd2196fb94cec6aa75e35f2a4ef
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat May 21 15:45:05 2011 +0200
vis: 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 5cd4b00..ccfcfd5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endif
endif
CC = gcc
-CFLAGS += -pedantic -Wall -W -O1 -g3 -std=gnu99
+CFLAGS += -pedantic -Wall -W -std=gnu99
EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DREVISION_VERSION=$(REVISION_VERSION)
LDFLAGS += -lpthread
--
vis
The following commit has been merged in the master branch:
commit 21f0d6faa338d075ee584699daf483c53b2dccc8
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat May 21 15:45:06 2011 +0200
vis: 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 ccfcfd5..f7bcef9 100644
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,7 @@ 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)
--
vis
The following commit has been merged in the master branch:
commit ca6696af9176470dea70ca5559dfecf31cd5466c
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat May 21 15:45:09 2011 +0200
vis: 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 a18aa72..d9b011c
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
#
# Copyright (C) 2006-2009 BATMAN contributors
#
--
vis
The following commit has been merged in the master branch:
commit 50aebcf2f96c5837f8765c4d0bf0f0020a0e33fb
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Dec 5 20:32:29 2011 +0100
batmand: Remove wrong information about daemon size reduction
33a5773ab39a089870667634e08ce98fad1a2fd1 introduced a regression in the
documentation. It recommended to use non-existing options DEBUG_GREATER_2 abd
ENABLE_EASTEREGG in the Makefile. Also adding those variables doesn't change
the behavior of the build system at all.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
diff --git a/INSTALL b/INSTALL
index 58be950..41566ab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -35,28 +35,6 @@ running, because it requires to install a different kernel.
Remove the comment hash (#) leading this line in the Makefile:
#NO_POLICY_ROUTING = -DNO_POLICY_ROUTING
-
-Reducing the batmand daemon size:
-
-In case you don't need debug output levels greater than 2 (debug level 1
-shows originators, debug level 2 shows Internet gateways), add a
-comment hash leading this line in the Makefile:
-
-DEBUG_GREATER_2 = -DDEBUG
-
-This will skip tons of debug information from the binary and save about 8 KB.
-
-
-Disable the easter-egg. The developers thought it would be fancy to have a
-easter-egg. If you are bartering for every single byte of binary size, you
-can disable it as well. Add a hash to this line:
-
-ENABLE_EASTEREGG = -DEASTEREGG
-
-This will save another 4 KB.
-
-
-
Compiling
---------
--
batmand