[netfilter-cvslog] r4324 - in trunk/nfsim: . tools

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-10-07 19:59:45 +0200 (Fri, 07 Oct 2005)
New Revision: 4324

Modified:
   trunk/nfsim/Makefile.in
   trunk/nfsim/tools/config.c
Log:
Introduce source-list target for nfsim-testsuite to cache properly, and clean up properly on "distclean".


Modified: trunk/nfsim/Makefile.in
===================================================================
--- trunk/nfsim/Makefile.in	2005-10-07 17:04:25 UTC (rev 4323)
+++ trunk/nfsim/Makefile.in	2005-10-07 17:59:45 UTC (rev 4324)
@@ -20,7 +20,7 @@
 
 export
 
-OBJS:=core/usage.o
+OBJS:=core/generated_usage.o
 
 # OBJS which need help functions extracted
 HELP_OBJS:=
@@ -45,15 +45,19 @@
 	$(CC) $(GCOVFLAGS) $(CFLAGS) $(LDFLAGS) -rdynamic -o $@ \
 		-ldl -lreadline -lcurses $(HELP_OBJS) $(OBJS) $(USAGE)
 
+source-list:
+	@find core kernelenv tools -type l -o -name 'generated_*' -o -wholename core/config.h -o -name '*.[ch]' -print
+	@echo netfilter/dummy.c
+
 kernelenv/include/linux/config.h: .config
 	sed -ne 's/^\([A-Z0-9_]*\)=\(.*\)$$/#define \1 \2/p' < $< > $@
 
 netfilter/netfilter.o: netfilter/ kernelenv/include/linux/config.h
 	cd $(@D) && $(MAKE)
 
-tools/config.o: tools/config.c tools/config_string.c
+tools/config.o: tools/config.c tools/generated_config_string.c
 
-tools/config_string.c: .config
+tools/generated_config_string.c: .config
 	echo "static const char config_string[] = " > $@
 	grep '^CONFIG' $^ | tr -d '"' | sed 's/\(.*\)/"\1\\n"/' >> $@
 	echo ";" >> $@
@@ -69,8 +73,8 @@
 core/utils.o:
 	$(CC) $(CFLAGS) -c -fPIC core/utils.c -o core/utils.o
 
-core/usage.o: core/usage.c
-core/usage.c: $(USAGE_SOURCES) doc/gen-usage
+core/generated_usage.o: core/generated_usage.c
+core/generated_usage.c: $(USAGE_SOURCES) doc/gen-usage
 	doc/gen-usage $(USAGE_SOURCES) >$@
 
 docs:
@@ -104,11 +108,12 @@
 .PHONY:	distclean
 distclean: clean importclean
 	cd doc && $(MAKE) $@
-	rm -f .config
+	rm -f .config core/config.h
 	rm -f tags
 	rm -f nfsim-*.tar.gz
 	rm -f Makefile
-	rm -f kernelenv/include/kernelenv_endian.h
+	find . -type l -exec rm {} \;
+	find . -name 'generated_*' -exec rm {} \;
 
 .PHONY:	tags
 tags:

Modified: trunk/nfsim/tools/config.c
===================================================================
--- trunk/nfsim/tools/config.c	2005-10-07 17:04:25 UTC (rev 4323)
+++ trunk/nfsim/tools/config.c	2005-10-07 17:59:45 UTC (rev 4324)
@@ -25,7 +25,7 @@
 #include <kernelenv.h>
 #include <linux/netfilter_ipv4.h>
 #include <utils.h>
-#include "config_string.c"
+#include "generated_config_string.c"
 
 static bool config_cmd(int argc, char **argv)
 {