More boilerplate.

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3085d52..5da6a33 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.52 2002/04/03 02:56:18 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.56 2002/04/03 22:28:03 gliptak Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -150,12 +150,9 @@ PCRE_SRC     = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/
 PCRE_OBJS    = @STATIC_PCRE_ONLY@$(PCRE_SRC:.c=.@OBJEXT@)
 PCRE_HDRS    = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h pcre/pcre.h
 
-# No REGEX (Either because dynamically linked pcreposix, or no regex at all):
+# No REGEX (maybe because dynamically linked pcreposix):
 REGEX_SRC    =
-# GNU REGEX:
-@GNU_REGEX_ONLY@REGEX_SRC    = gnu_regex.c
-# PCRE REGEX:
-@PCRE_REGEX_ONLY@@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
+@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
 
 REGEX_OBJS   = $(REGEX_SRC:.c=.@OBJEXT@)
 REGEX_HDRS   = $(REGEX_SRC:.c=.h)
@@ -245,7 +242,7 @@ re_filterfile.txt: re_filterfile
 #############################################################################
 # RPM specifice stuff (SuSE or Redhat, ..)
 #############################################################################
-rpm-stuff:
+rpm-stuff: clean clobber
        for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
                if [ ! -w $(RPM_BASE)/$$dir ]; then \
                        $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \
@@ -255,9 +252,6 @@ rpm-stuff:
                fi; \
        done; \
 
-       $(MAKE) clobber
-       if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
-
 #############################################################################
 # redhat distribution alpha and x86
 #############################################################################
@@ -377,7 +371,7 @@ gen-clean:
        $(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar*
 
 #############################################################################
-# solaris distribution
+# solaris distribution. verified on SF machines by swa.
 #############################################################################
 solaris-dist: gen-dist
        @$(ECHO) Done.
@@ -421,12 +415,16 @@ amiga-upload:
        @$(ECHO) coming soon. 
 
 #############################################################################
-# freebsd distribution
+# freebsd distribution. verified on SF machines by swa.
 #############################################################################
-freebsd-dist:
-       @$(ECHO) coming soon. 
-freebsd-upload:
-       @$(ECHO) coming soon. 
+freebsd-dist: gen-dist
+       @$(ECHO) Done.
+# anonymously ncftps the package to sourceforge
+freebsd-upload: gen-upload
+       @$(ECHO) Done.
+# use with care
+freebsd-clean: gen-clean
+       @$(ECHO) Done.
 
 #############################################################################
 # Windows distribution
@@ -436,14 +434,31 @@ win-dist:
 
 
 #############################################################################
-# Tarball distribution
+# Tarball distribution. Only source files. No binaries.
 #############################################################################
-tarball-dist: clobber
+tarball-dist: clean clobber
        $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
-       cd .. && find privoxy-$(VERSION)-$(CODE_STATUS)
-#      cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS)
-#      $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
-       @$(ECHO) Tarball without any binary created.
+# add source files
+       for foo in `find . -name ".*\.c"`; do \
+               (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+       done; 
+# add header files
+       for foo in `find . -name ".*\.h"`; do \
+               (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+       done; 
+# add misc files
+       for foo in configure.in GNUMakefile.in ; do \
+               (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+       done; 
+# add documentation
+       for foo in $(DOC_FILES); do \
+               (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+       done;
+# and zip the archive
+       $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
+       $(GZIP_PROG) ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar
+       @$(ECHO) Tarball distribution created.
+
 
 # anonymously ncftps the tarball to sourceforge
 tarball-upload:
@@ -645,13 +660,15 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 clean:
        $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -iname TAGS`
 
-clobber: clean
-       $(RM) configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *~ *.tar.gz *.tar \#*\#
+clobber:
+       $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *~ *.tar.gz *.tar \#*\#
 #
 # FIXME: What is all this? 
 #
        $(RM) cscope.*  *.pdb *.lib *.exp 
 
+distclean: clobber
+
 tags: $(SRCS) $(HDRS)
        etags $(SRCS) $(HDRS)
 
@@ -682,6 +699,18 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.56  2002/04/03 22:28:03  gliptak
+# Removed references to gnu_regex
+#
+# Revision 1.55  2002/04/03 19:54:29  swa
+# freebsd tested to work. attempt to move tarball dist target forward
+#
+# Revision 1.54  2002/04/03 14:54:07  oes
+# Standard clean and clobber semantics II
+#
+# Revision 1.53  2002/04/03 14:19:16  oes
+# Standard clean and clobber semantics
+#
 # Revision 1.52  2002/04/03 02:56:18  hal9
 # Revert previous FAQ numbering kludge.
 #