X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=9a97ce82ff638a33d6f953e6ba6c3dfc9229335b;hb=d69c3bf75074252359d168ab52e9669621ba5b7c;hp=29130839f385083c0f45f3890646e224f5d0483e;hpb=bbb221e468a90807e6f3ba828db1ff43ff37c67d;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 29130839..9a97ce82 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.53 2002/04/03 14:19:16 oes Exp $
+# $Id: GNUmakefile.in,v 1.57 2002/04/04 00:36:36 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)
@@ -374,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.
@@ -418,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
@@ -433,14 +434,31 @@ win-dist:
 
 
 #############################################################################
-# Tarball distribution
+# Tarball distribution. Only source files. No binaries.
 #############################################################################
 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:
@@ -509,7 +527,13 @@ dok-man: doc/source/ldpOK.dsl
           $(MAKE) groff2html; \
 	fi
 
-dok: dok-devel dok-user dok-faq dok-man
+readme: doc/source/ldpOK.dsl
+	cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks readme.sgml > tmp.html &&\
+     lynx -dump tmp.html > ../../README && rm -rf tmp.html 
+     # kludge to force recreation on next run. Rodgrigo?
+	@rm -f doc/source/ldpOK.dsl
+
+dok: dok-devel dok-user dok-faq dok-man readme
 ## kludge to force recreation on next run. Rodgrigo?
 	@rm -f doc/source/ldpOK.dsl
 	@$(ECHO) Documentation created.
@@ -539,6 +563,8 @@ redhat-dok: doc/source/ldpOK.dsl man2html
 	cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver
 	cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \
           tmp.html > ../text/faq.txt && rm -rf tmp.html faq
+## readme
+	$(MAKE) redhat-readme
 # kludge to force recreation on next run. Rodgrigo?
 	@rm -f doc/source/ldpOK.dsl
 
@@ -552,6 +578,13 @@ man2html:
           $(MAKE) groff2html; \
 	fi
 
+## Make README
+redhat-readme: doc/source/ldpOK.dsl
+	cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \
+          tmp.html > ../../README && rm -rf tmp.html
+     # kludge to force recreation on next run. Rodgrigo?
+	@rm -f doc/source/ldpOK.dsl
+
 #############################################################################
 #
 # Webserver
@@ -681,6 +714,18 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.57  2002/04/04 00:36:36  gliptak
+# always use pcre for matching
+#
+# 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
 #