- Added generation of default.action from defaul.action.master

- Deleted obsolete re_filterfile.txt generation

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b40872c..7a4eda5 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.104.2.7 2002/06/07 00:23:47 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.104.2.8 2002/07/12 10:04:32 kick_ Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -74,6 +74,7 @@ LD         = @CC@
 RM         = rm -f
 STRIP_PROG = strip
 SED       = sed
+GREP       = grep
 CAT        = cat
 RPM        = rpm
 RPMBUILD   = rpmbuild
@@ -207,7 +208,7 @@ LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
 #
 # There should NOT be any targets above this line.
 #############################################################################
-all: $(PROGRAM)
+all: $(PROGRAM) default.action
 
 
 #############################################################################
@@ -225,6 +226,12 @@ install conectiva-spec conectiva-dist conectiva-upload
        $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 
+#############################################################################
+# Strip master copy comments from default.action:
+#############################################################################
+default.action: default.action.master
+       $(GREP) -v '^#MASTER#' $< > $@
+
 #############################################################################
 # Win32 config files
 #############################################################################
@@ -246,10 +253,6 @@ config.txt: config
 trust.txt: trust
        $(DOSFILTER) < $< > $@ 
 
-re_filterfile.txt: re_filterfile
-       $(DOSFILTER) < $< > $@ 
-
-
 #############################################################################
 # Pre-dist check:
 #############################################################################
@@ -417,6 +420,7 @@ redhat-srpm:
        $(MV) $(PROGRAM)-rh-$(VERSION).tar.gz $(PROGRAM)-$(VERSION).tar.gz
        $(RPMBUILD) -ts --nodeps $(PROGRAM)-$(VERSION).tar.gz
 
+
 #############################################################################
 # suse distribution. works fine. no need to be root. 
 #############################################################################
@@ -916,7 +920,7 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
        $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
 
 clean:
-       $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -name TAGS -o -name tags` 
+       $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action `find . -name TAGS -o -name tags` 
 
 tidy:
        $(RM) `find . -name "*~"`
@@ -970,6 +974,15 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.104.2.8  2002/07/12 10:04:32  kick_
+# added helper targets to the makefile. They shouldn't break anything, but
+# make my life a lot easier.
+#
+# The new rpm has been splitted into two parts, one for package installation/
+# removal, one for package building.
+# Therefore rpm -ta isn't a valid command anymore and needs to be replaced
+# by rpmbuild -ta  (this is backwards compatible)
+#
 # Revision 1.104.2.7  2002/06/07 00:23:47  hal9
 # Fixing a quirk of man2html (on my system) that pulls punctuation into URLs,
 # thus breaking them completely.