[netfilter-cvslog] r4313 - in trunk/nfsim: . netfilter

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-10-04 19:25:17 +0200 (Tue, 04 Oct 2005)
New Revision: 4313

Added:
   trunk/nfsim/netfilter/Makefile.kbuild.in
Removed:
   trunk/nfsim/netfilter/Makefile.kbuild
Modified:
   trunk/nfsim/configure
Log:
User might not have -lgcov, so only link when --gcov specified (needs Makefile.kbuild to be generated)
Clean up netfilter/$TYPE dir during config, to remove old import.
Use $< instead of $^ in cp rules in Makefile.import (no different currently, but more correct)


Modified: trunk/nfsim/configure
===================================================================
--- trunk/nfsim/configure	2005-10-01 15:49:07 UTC (rev 4312)
+++ trunk/nfsim/configure	2005-10-04 17:25:17 UTC (rev 4313)
@@ -24,7 +24,7 @@
 for arg; do
     case "$arg" in
 	--kerneldir=*) KERNELDIR=$(echo "$arg" | cut -d= -f2-);;
-	--gcov) GCOVFLAGS='-fprofile-arcs -ftest-coverage';;
+	--gcov) GCOVFLAGS='-fprofile-arcs -ftest-coverage'; LIBGCOV='-lgcov';;
 	--prefix=*) PREFIX=$(echo "$arg" | cut -d= -f2-);;
 	--bindir=*) BINDIR=$(echo "$arg" | cut -d= -f2-)/;;
 	--libdir=*) LIBDIR=$(echo "$arg" | cut -d= -f2-)/;;
@@ -55,7 +55,7 @@
     esac
 }
 
-SUB='s@%GCOVFLAGS%@'$GCOVFLAGS'@;s@%TYPE%@'$TYPE'@;s@%VERSION%@'$VERSION'@;s@%GCOV%@'$GCOV'@;s@%CC%@'$CC'@;s@%LIBDIR%@'$LIBDIR'@;s@%BINDIR%@'$BINDIR'@;s@%BASEDIR%@'$BASEDIR'@'
+SUB='s@%GCOVFLAGS%@'$GCOVFLAGS'@;s@%TYPE%@'$TYPE'@;s@%VERSION%@'$VERSION'@;s@%GCOV%@'$GCOV'@;s@%CC%@'$CC'@;s@%LIBDIR%@'$LIBDIR'@;s@%BINDIR%@'$BINDIR'@;s@%BASEDIR%@'$BASEDIR'@;s@%LIBGCOV%@'$LIBGCOV'@'
 
 [ -d $KERNELDIR/net/$TYPE/netfilter ] ||
 	barf No netfilter directory found in $KERNELDIR
@@ -69,10 +69,11 @@
 
 echo Setting up rules to import netfilter $TYPE code from $KERNELDIR
 rm -f Makefile.import
+rm -rf netfilter/$TYPE
 
-[ -d netfilter/$TYPE ] ||  mkdir -p netfilter/$TYPE
+mkdir -p netfilter/$TYPE
 echo "netfilter/core/netfilter.c: $KERNELDIR/net/core/netfilter.c" >> Makefile.import
-echo '	@sed -f netfilter.c.sed $^ > $@ && chmod a-w $@' >> Makefile.import
+echo '	@sed -f netfilter.c.sed $< > $@ && chmod a-w $@' >> Makefile.import
 echo "import: netfilter/core/netfilter.c" >> Makefile.import
 
 files=$(cd $KERNELDIR/net/$TYPE/netfilter/; \
@@ -81,7 +82,7 @@
 for f in $files; do
     mkdir -p $(dirname netfilter/$TYPE/$f)
     echo "netfilter/$TYPE/$f":"$KERNELDIR/net/$TYPE/netfilter/$f" >> Makefile.import
-    echo '	@cp $^ $@ && chmod a-w $@' >> Makefile.import
+    echo '	@cp $< $@ && chmod a-w $@' >> Makefile.import
     echo "import: netfilter/$TYPE/$f" >> Makefile.import
 done
 

Deleted: trunk/nfsim/netfilter/Makefile.kbuild
===================================================================
--- trunk/nfsim/netfilter/Makefile.kbuild	2005-10-01 15:49:07 UTC (rev 4312)
+++ trunk/nfsim/netfilter/Makefile.kbuild	2005-10-04 17:25:17 UTC (rev 4313)
@@ -1,27 +0,0 @@
-
-include $(TOPDIR)/.config
-
-include Makefile
-
-.PHONY: modules
-modules: $(obj-m:.o=.so)
-
-# We can end up with nothing (everything is a module): dummy.o fixes this.
-$(TYPE).o: $(obj-y) ../dummy.o
-	$(LD) $(LDFLAGS) -r -o $(@) $^
-
-%.o:%.c
-	$(COMPILE.c) $(GCOVFLAGS) -DKBUILD_MODNAME=$(@:.o=) $(OUTPUT_OPTION) $<
-
-%.o:	
-	$(MAKE) CFLAGS="$(CFLAGS) $(GCOVFLAGS) -DKBUILD_MODNAME=$(@:.o=)" $($(@:.o=-objs))
-	$(LD) $(LDFLAGS) -g -r -o $(@) $($(@:.o=-objs))
-
-%.so:%.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(GCOVFLAGS) -fPIC -shared -DMODULE -DKBUILD_MODNAME=$(@:.so=) $(OUTPUT_OPTION) -lgcov $<
-
-%.so:
-	$(MAKE) CFLAGS="$(CFLAGS) -fPIC $(GCOVFLAGS) -DMODULE -DKBUILD_MODNAME=$(@:.so=)" $($(@:.so=-objs))
-	$(CC) -shared -o $(@) $($(@:.so=-objs)) -lgcov
-
-

Added: trunk/nfsim/netfilter/Makefile.kbuild.in
===================================================================
--- trunk/nfsim/netfilter/Makefile.kbuild.in	2005-10-01 15:49:07 UTC (rev 4312)
+++ trunk/nfsim/netfilter/Makefile.kbuild.in	2005-10-04 17:25:17 UTC (rev 4313)
@@ -0,0 +1,27 @@
+
+include $(TOPDIR)/.config
+
+include Makefile
+
+.PHONY: modules
+modules: $(obj-m:.o=.so)
+
+# We can end up with nothing (everything is a module): dummy.o fixes this.
+$(TYPE).o: $(obj-y) ../dummy.o
+	$(LD) $(LDFLAGS) -r -o $(@) $^
+
+%.o:%.c
+	$(COMPILE.c) $(GCOVFLAGS) -DKBUILD_MODNAME=$(@:.o=) $(OUTPUT_OPTION) $<
+
+%.o:	
+	$(MAKE) CFLAGS="$(CFLAGS) $(GCOVFLAGS) -DKBUILD_MODNAME=$(@:.o=)" $($(@:.o=-objs))
+	$(LD) $(LDFLAGS) -g -r -o $(@) $($(@:.o=-objs))
+
+%.so:%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(GCOVFLAGS) -fPIC -shared -DMODULE -DKBUILD_MODNAME=$(@:.so=) $(OUTPUT_OPTION) -lgcov $<
+
+%.so:
+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC $(GCOVFLAGS) -DMODULE -DKBUILD_MODNAME=$(@:.so=)" $($(@:.so=-objs))
+	$(CC) -shared -o $(@) $($(@:.so=-objs)) %LIBGCOV%
+
+