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

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-13 06:58:13 +0100 (Mon, 13 Dec 2004)
New Revision: 3340

Modified:
   trunk/nfsim/Makefile.in
   trunk/nfsim/configure
   trunk/nfsim/netfilter/Makefile.kbuild
Log:
More gcov fixes

Modified: trunk/nfsim/Makefile.in
===================================================================
--- trunk/nfsim/Makefile.in	2004-12-13 04:33:42 UTC (rev 3339)
+++ trunk/nfsim/Makefile.in	2004-12-13 05:58:13 UTC (rev 3340)
@@ -1,7 +1,7 @@
-GCOVFLAGS = %GCOVFLAGS%
 TYPE=%TYPE%
+CC=%CC%
 GCOV=%GCOV%
-CC=%CC%
+GCOVFLAGS=%GCOVFLAGS%
 
 CFLAGS   = -DVERSION=\"%VERSION%\" -Wstrict-prototypes -Wunused -Wall -g -Wa,-W
 CPPFLAGS = -I. -I$(shell pwd)/core -I$(shell pwd)/kernelenv/include \
@@ -56,16 +56,21 @@
 	cd doc && $(MAKE) $@
 
 gcov:
-	set -e; for f in `find netfilter/ -name '*.c'`; do (cd `dirname $$f` && $(GCOV) `basename $$f`); done
+	set -e; for f in `find netfilter/$(TYPE) -name '*.c'`; do	\
+		OBJFILE=$$(echo $$f | sed 's/.c$$/.o/');		\
+		if [ -f $$OBJFILE ]; then				\
+			(cd `dirname $$f` && $(GCOV) `basename $$f`);	\
+		fi;							\
+	done
 
 gcov-clean:
-	find . \( -name '*.da' -o -name '*.bb' -o -name '*.bbg' -o -name '*.gcov' \) -exec rm \{\} \;
+	find . \( -name '*.da' -o -name '*.gcov' \) -exec rm \{\} \;
 importclean: distclean
 
 .PHONY:	clean
 clean: gcov-clean
 	cd doc && $(MAKE) $@
-	find . -name '*.o' -exec rm \{\} \;
+	find . -name '*.o' -o -name '*.bb' -o -name '*.bbg' -exec rm \{\} \;
 	rm -f kernelenv/include/linux/config.h
 	rm -f simulator core/fakesockopt.so.1.0 fakesockopt.so.1.0
 

Modified: trunk/nfsim/configure
===================================================================
--- trunk/nfsim/configure	2004-12-13 04:33:42 UTC (rev 3339)
+++ trunk/nfsim/configure	2004-12-13 05:58:13 UTC (rev 3340)
@@ -17,7 +17,7 @@
 for arg; do
     case "$arg" in
 	--kerneldir=*) KERNELDIR=$(echo "$arg" | cut -d= -f2-);;
-	--gcov) GCOVGLAGS='-fprofile-arcs -ftest-coverage';;
+	--gcov) GCOVFLAGS='-fprofile-arcs -ftest-coverage';;
 	*)
 	    barf "Usage: ./configure [--gcov] --kerneldir=<DIR>"
 	    ;;
@@ -36,7 +36,7 @@
 
 [ -d netfilter/$TYPE ] ||  mkdir -p netfilter/$TYPE
 sed -f netfilter.c.sed $KERNELDIR/net/core/netfilter.c > netfilter/core/netfilter.c
-for f in $(cd $KERNELDIR/net/$TYPE/netfilter/; find . -name '*.[ch]' -o -name Makefile); do
+for f in $(cd $KERNELDIR/net/$TYPE/netfilter/; find . -name '*.[ch]' ! -name '*.mod.c'; echo Makefile); do
     mkdir -p $(dirname netfilter/$TYPE/$f)
     cp $KERNELDIR/net/$TYPE/netfilter/$f netfilter/$TYPE/$f
 done

Modified: trunk/nfsim/netfilter/Makefile.kbuild
===================================================================
--- trunk/nfsim/netfilter/Makefile.kbuild	2004-12-13 04:33:42 UTC (rev 3339)
+++ trunk/nfsim/netfilter/Makefile.kbuild	2004-12-13 05:58:13 UTC (rev 3340)
@@ -12,7 +12,7 @@
 	$(COMPILE.c) $(GCOVFLAGS) -DKBUILD_MODNAME=$(@:.o=) $(OUTPUT_OPTION) $<
 
 %.o:	
-	@$(MAKE) CFLAGS="$(CFLAGS) -DKBUILD_MODNAME=$(@:.o=)" $($(@:.o=-objs))
+	@$(MAKE) CFLAGS="$(CFLAGS) $(GCOVFLAGS) -DKBUILD_MODNAME=$(@:.o=)" $($(@:.o=-objs))
 	$(LD) $(LDFLAGS) -r -o $(@) $($(@:.o=-objs))