[netfilter-cvslog] r3329 - trunk/nfsim

[rusty at netfilter.org]

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

Modified:
   trunk/nfsim/Makefile.in
   trunk/nfsim/configure
Log:
GCOV and CC controlled by env vars to ./configure.


Modified: trunk/nfsim/Makefile.in
===================================================================
--- trunk/nfsim/Makefile.in	2004-12-13 02:30:03 UTC (rev 3328)
+++ trunk/nfsim/Makefile.in	2004-12-13 02:58:55 UTC (rev 3329)
@@ -1,8 +1,8 @@
 GCOVFLAGS = %GCOVFLAGS%
 TYPE=%TYPE%
+GCOV=%GCOV%
+CC=%CC%
 
-CC = gcc
-
 CFLAGS   = -DVERSION=\"%VERSION%\" -Wstrict-prototypes -Wunused -Wall -g -Wa,-W
 CPPFLAGS = -I. -I$(shell pwd)/core -I$(shell pwd)/kernelenv/include \
 	   -I$(shell pwd)/netfilter/include

Modified: trunk/nfsim/configure
===================================================================
--- trunk/nfsim/configure	2004-12-13 02:30:03 UTC (rev 3328)
+++ trunk/nfsim/configure	2004-12-13 02:58:55 UTC (rev 3329)
@@ -5,6 +5,8 @@
 KERNELDIR=/lib/modules/$(uname -r)/build
 TYPE=ipv4
 VERSION=0.2
+GCOV=${GCOV:-gcov}
+CC=${CC:-gcc}
 
 barf()
 {
@@ -16,13 +18,13 @@
     case "$arg" in
 	--kerneldir=*) KERNELDIR=$(echo "$arg" | cut -d= -f2-);;
 	--gcov) GCOVGLAGS='-fprofile-arcs -ftest-coverage';;
-	--help)
+	*)
 	    barf "Usage: ./configure [--gcov] --kerneldir=<DIR>"
 	    ;;
     esac
 done
 
-SUB='s/%GCOVFLAGS%/'$GCOVFLAGS'/;s/%TYPE%/'$TYPE'/;s/%VERSION%/'$VERSION'/'
+SUB='s/%GCOVFLAGS%/'$GCOVFLAGS'/;s/%TYPE%/'$TYPE'/;s/%VERSION%/'$VERSION'/;s/%GCOV%/'$GCOV'/;s/%CC%/'$CC'/'
 
 [ -d $KERNELDIR/net/$TYPE/netfilter ] ||
 	barf No netfilter directory found in $KERNELDIR