X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=04df7b38cee20d8546a7e0c603b0ddca738899d4;hb=53da0612c64ea2347789db8d960c40536edbb96f;hp=3aea05268e3083ab71078583f1fd841d076c13e3;hpb=fd2c6b6d080f69a4b21c662e357899bc4f4f8cff;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3aea0526..04df7b38 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.216 2013/01/10 11:03:58 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.221 2013/02/05 14:04:11 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2013 members of the
 # Privoxy team. http://www.privoxy.org/
@@ -573,12 +573,9 @@ dok-release:
 
 # The main Privoxy config file, generated from sgml sources.
 # NOTE: This will require some hand editing.
-config-file: dok-release
-	cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
-	$(W3M_DUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
-	$(PERL) -i.bak utils/prepare-configfile.pl config
+config-file: dok-release generate-config-file
 
-	$(RM) *.bak
+	$(RM) config.bak config.html
 	@$(ECHO)  "****************************************************"
 	@$(ECHO)  "The config file has been optimistically updated"
 	@$(ECHO)  "Now -- you may need to hand edit the results!"
@@ -588,6 +585,11 @@ config-file: dok-release
 	@$(ECHO)  "might have gotten hammered."
 	@$(ECHO)  "****************************************************"
 
+generate-config-file:
+	cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > ../../config.html
+	$(W3M_DUMP) -cols 67 config.html > config
+	$(PERL) -i.bak utils/prepare-configfile.pl config
+
 # config file, alternate version using lynx (perl stuff unfinished). Lynx
 # does not do so good a job.
 config-file-alt:
@@ -676,7 +678,7 @@ dok-tidy:
 # Source file dependencies
 #############################################################################
 
-actions.@OBJEXT@:   actions.c   actions.h   config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h
+actions.@OBJEXT@:   actions.c   actions.h   config.h $(PROJECT_H_DEPS) errlog.h filters.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h
 cgi.@OBJEXT@:       cgi.c       cgi.h       config.h $(PROJECT_H_DEPS) cgiedit.h cgisimple.h jbsockets.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h
 cgiedit.@OBJEXT@:   cgiedit.c   cgiedit.h   config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actionlist.h actions.h errlog.h miscutil.h
 cgisimple.@OBJEXT@: cgisimple.c cgisimple.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h urlmatch.h
@@ -741,7 +743,8 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 
 clean:
 	$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
-		`find . -name TAGS -o -name tags | $(GREP) -v .git` config.base config.tmp \
+		config.base config.tmp \
+		`find . \( -name TAGS -o -name tags \) -and -not -path "./.git/refs/tags"` \
 		`find . -name "*.orig" -a -not -name rc.privoxy.orig`
 
 clean-editor-files: