The following commit has been merged in the master branch: commit 2899e7a30582492c4655bf33495aa1bd221f9e68 Author: Sven Eckelmann sven@narfation.org Date: Sun Apr 3 23:06:20 2011 +0200
batmand: Remove obsolete creation of source packages
The creation of source packages is now either done by the release team using special scripts or through gitweb. It is not needed to provide the source target inside the Makefile and may not work in the future anyway.
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/Makefile b/Makefile index 8eafb26..0249b10 100644 --- a/Makefile +++ b/Makefile @@ -60,23 +60,15 @@ ifeq ($(UNAME),OpenBSD) OS_C = $(BSD_C) $(POSIX_C) endif
-LOG_BRANCH = trunk/batman - -SRC_FILES = "(.c)|(.h)|(Makefile)|(INSTALL)|(LIESMICH)|(README)|(THANKS)|(TRASH)|(Doxyfile)|(./posix)|(./linux)|(./bsd)|(./man)|(./doc)" - 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)
-PACKAGE_NAME = batmand BINARY_NAME = batmand -SOURCE_VERSION_HEADER = batman.h
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)"
-BAT_VERSION = $(shell grep "^#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}') -FILE_NAME = $(PACKAGE_NAME)_$(BAT_VERSION)-rv$(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`)
@@ -90,27 +82,10 @@ $(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile $(Q_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MD -c $< -o $@ -include $(SRC_C:.c=.d)
-sources: - mkdir -p $(FILE_NAME) - - for i in $$( find . | grep $(SRC_FILES) | grep -v ".svn" ); do [ -d $$i ] && mkdir -p $(FILE_NAME)/$$i ; [ -f $$i ] && cp -Lvp $$i $(FILE_NAME)/$$i ;done - - wget -O changelog.html http://www.open-mesh.net/log/$(LOG_BRANCH)/ - html2text -o changelog.txt -nobs -ascii changelog.html - awk '/View revision/,/10/01/06 20:23:03/' changelog.txt > $(FILE_NAME)/CHANGELOG - - for i in $$( find man | grep -v ".svn" ); do [ -f $$i ] && groff -man -Thtml $$i > $(FILE_NAME)/$$i.html ;done - - tar czvf $(FILE_NAME).tgz $(FILE_NAME) - clean: rm -f $(BINARY_NAME) *.o posix/*.o linux/*.o bsd/*.o rm -f `find . -name '*.d' -print`
- -clean-long: - rm -rf $(PACKAGE_NAME)_* - install: mkdir -p $(SBINDIR) install -m 0755 $(BINARY_NAME) $(SBINDIR)