Improve makefile clean_libs code to prevent leftover from crosscompiling
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 21 Jan 2010 07:07:14 +0000 (08:07 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 21 Jan 2010 07:07:14 +0000 (08:07 +0100)
Add .project and .cproject to excludes in mk-tarball script

Makefile
scripts/mk-tarball.sh

index 38f718f..658400e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -163,15 +163,7 @@ libs:
                set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR);done
 
 libs_clean clean_libs:
-               -for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;done
-ifeq ($(OS), win32)
-               -rm -f lib/pgraph/olsrd_pgraph.dll
-               -rm -f lib/txtinfo/olsrd_txtinfo.dll
-               -rm -f lib/httpinfo/olsrd_httpinfo.dll
-               -rm -f lib/secure/olsrd_secure.dll
-               -rm -f lib/dot_draw/olsrd_dot_draw.dll
-               -rm -f lib/mini/olsrd_mini.dll
-endif
+               -for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;rm -f lib/$$dir/*.so lib/$$dir/*.dll;done
 
 libs_install install_libs:
                set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
index 1435fee..52263b4 100755 (executable)
@@ -50,7 +50,7 @@ mkdir /tmp/$NAME
 # clean stuff up first
 cd ..;make uberclean
 # sync the stuff to a working directory
-rsync -a . /tmp/$NAME/ --exclude=.hg* --exclude=.git* --exclude=*.rej --delete
+rsync -a . /tmp/$NAME/ --exclude=.project --exclude=.cproject --exclude=.hg* --exclude=.git* --exclude=*.rej --delete
 cd /tmp/
 echo "### creating /tmp/$NAME.tar.gz"
 tar -czf /tmp/$NAME.tar.gz $NAME