Minor updates to reflect status of 3.1.x.

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 92ba4fb..7b36259 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.111 2002/06/05 00:26:21 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.113 2002/07/30 21:50:25 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -43,6 +43,8 @@ VERSION_POINT = @VERSION_POINT@
 CODE_STATUS   = @CODE_STATUS@
 VERSION       = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
 RPM_VERSION   = $(VERSION)
+RPM_PACKAGEV  = ""
+SNAPVERSION   = $(RPM_VERSION)-$(shell date "+%Y%m%d")
 
 
 #############################################################################
@@ -79,6 +81,7 @@ LD         = @CC@
 RM         = rm -f
 STRIP_PROG = strip
 SED       = sed
+GREP       = grep
 CAT        = cat
 RPM        = rpm
 MV        = mv
@@ -98,7 +101,7 @@ TARGET_OS  = @host@
 PERL       = perl
 DOC_DIR    = doc/source
 DOC_TMP    = $(DOC_DIR)/tmp
-
+DKPREFIX   = @DKPREFIX@
 
 #User Group paras
 USER       = @USER@
@@ -228,13 +231,13 @@ LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
 #
 # There should NOT be any targets above this line.
 #############################################################################
-all: $(PROGRAM)
+all: $(PROGRAM) default.action
 
 
 #############################################################################
 # Phony targets
 #############################################################################
-.PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \
+.PHONY: all inifiles redhat-dist redhat-upload redhat-test solaris-dist suse-dist \
 suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
 install conectiva-spec conectiva-dist conectiva-upload debian-dist \
 debian-upload ensure-wdump ensure-jadebin ensure-dkprefix
@@ -252,6 +255,12 @@ $(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC_PCRE)/%.c $(DIR_PRIVOXY_OBJ)
 $(DIR_PRIVOXY_OBJ):
        mkdir obj
 
+#############################################################################
+# Strip master copy comments from default.action:
+#############################################################################
+default.action: default.action.master
+       $(GREP) -v '^#MASTER#' $< > $@
+
 #############################################################################
 # Win32 config files
 #############################################################################
@@ -273,10 +282,6 @@ config.txt: config
 trust.txt: trust
        $(DOSFILTER) < $< > $@ 
 
-re_filterfile.txt: re_filterfile
-       $(DOSFILTER) < $< > $@ 
-
-
 #############################################################################
 # Pre-dist check:
 #############################################################################
@@ -360,10 +365,18 @@ conectiva-upload: check-release
 # redhat distribution alpha and x86
 #############################################################################
 redhat-dist: rpm-stuff
+       echo $(CONFIG_FILES)
+       $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
+       $(RPMBUILD) --clean -ta  $(TAR_ARCH)
+       if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
 
+# For testing build issues only! Use redhat-dist for official releases.
+redhat-test: 
+       echo $(CONFIG_FILES)
        $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
-       $(RPM) --clean -ta  $(TAR_ARCH)
+       $(RPMBUILD) --clean -tb  $(TAR_ARCH)
        if [ -f $(TAR_ARCH) ]; then  $(RM) $(TAR_ARCH); fi
+       @echo "WARNING: This target is only for testing. Use redhat-dist for releases!!!"
 
 # anonymously ncftps the rpms to sourceforge
 redhat-upload: check-release
@@ -427,6 +440,7 @@ suse-clean:
        $(RM) /usr/sbin/rcprivoxy
        $(RM) /usr/share/man/man1/privoxy.1.gz
 
+
 #############################################################################
 # generic distribution
 #############################################################################
@@ -641,7 +655,7 @@ $(DIR_PRIVOXY_OBJ)/ssplit.@OBJEXT@:    $(DIR_PRIVOXY_SRC)/ssplit.c    $(DIR_PRIV
 $(DIR_PRIVOXY_OBJ)/urlmatch.@OBJEXT@:  $(DIR_PRIVOXY_SRC)/urlmatch.c  $(DIR_PRIVOXY_SRC)/urlmatch.h  $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h  $(DIR_PRIVOXY_SRC)/miscutil.h  $(DIR_PRIVOXY_SRC)/ssplit.h
 
 # PCRS
-$(DIR_PRIVOXY_OBJ)/pcrs.@OBJEXT@: $(DIR_PRIVOXY_SRC)/pcrs.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC)/pcrs.h
+$(DIR_PRIVOXY_OBJ)/pcrs.@OBJEXT@: $(DIR_PRIVOXY_SRC)/pcrs.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/config.h
 
 # PCRE
 $(DIR_PRIVOXY_OBJ)/get.@OBJEXT@:        $(DIR_PRIVOXY_SRC_PCRE)/get.c        $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h
@@ -691,7 +705,7 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 
 clean:
        $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) \
-       `find . -name TAGS -o -name tags`
+       default.action `find . -name TAGS -o -name tags`
 
 tidy:
        $(RM) `find . -name "*~"`
@@ -746,6 +760,12 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.113  2002/07/30 21:50:25  hal9
+# Add redhat-test target, and migrate the RPM_PACKAGEV stuff from 3.0 branch.
+#
+# Revision 1.112  2002/06/28 18:30:10  jongfoster
+# Fixing bugs compiling PCRE
+#
 # Revision 1.111  2002/06/05 00:26:21  hal9
 # Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok'
 # target only in toplevel. Add DOC_STATUS variable so docs can be built without