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
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
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
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