X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=cc732f6a13d1f52d3c9065d368eb785c667e4335;hb=3080bba2a782061801d0454422a31d8a05ccf58d;hp=37c869435b52972aab37e994a26477e88d21f04c;hpb=c9bedeeb530fb2011569a42752b40f4742754520;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 37c86943..cc732f6a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.55 2002/04/03 19:54:29 swa Exp $
+# $Id: GNUmakefile.in,v 1.69 2002/04/07 08:10:47 swa Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -80,13 +80,15 @@ MV	   = mv
 TAR        = tar
 LN         = ln
 WDUMP      = @WDUMP@ -dump
+JADECAT    = @JADECAT@
 JADEBIN    = @JADEBIN@
-DB         = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html
+DB         = $(JADEBIN) $(JADECAT) -t sgml -ihtml -D.. -d ldpOK.dsl\#html
 DB2HTML    = @DB2HTML@
 DKPREFIX   = @DKPREFIX@
 MAN2HTML   = @MAN2HTML@
 G2H_CMD    = groff -mandoc -Thtml
 TARGET_OS  = @host@
+PERL       = perl
 
 #User Group paras
 USER       = @USER@
@@ -99,7 +101,7 @@ GROUP	   = @GROUP@
 #   - Jon
 #DOSFILTER  = $(SED) -e $$'s,$$,\r,'
 #DOSFILTER  = gawk -v ORS='\r\n' '{print $0;}'
-DOSFILTER  = perl -p -e 's/\n/\r\n/'
+DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
 
 #############################################################################
 # Setup for make distribution rh and suse for now 
@@ -150,10 +152,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    =
-# 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)
@@ -437,30 +438,36 @@ win-dist:
 #############################################################################
 # Tarball distribution. Only source files. No binaries.
 #############################################################################
-tarball-dist: clean clobber
+
+MISC_FILES = install-sh config.sub configure.in GNUmakefile.in config.h.in config.guess privoxy*
+
+tarball-dist:
 	$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
 # 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;) \
+	for foo in `find . -name "*.c"`; do \
+		(cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
 	done; 
 # add header files
-	for foo in `find . -name ".*\.h"`; do \
+	for foo in `find . -name "*.h"`; do \
+		(cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+	done; 
+# add config files
+	for foo in $(CONFIG_FILES); 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;) \
+	for foo in $(MISC_FILES); do \
+		(cd .. && $(TAR) -uvhf privoxy-$(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;) \
+		(cd .. && $(TAR) -uvhf privoxy-$(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
+	$(GZIP_PROG) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar
 	@$(ECHO) Tarball distribution created.
 
-
 # anonymously ncftps the tarball to sourceforge
 tarball-upload:
 	ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
@@ -492,84 +499,122 @@ doc/source/ldpOK.dsl:
 
 # Otherwise we get plain groff conversion.
 groff2html:
-	$(G2H_CMD) ./privoxy.1 > doc/webserver/man-page/privoxy-man-page.html
+	$(G2H_CMD) ./privoxy.1 | $(SED) -e 's@</head>@<link REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></head>@' > doc/webserver/man-page/privoxy-man-page.html
 
-##  developer manual
+# developer manual
 dok-devel: doc/source/ldpOK.dsl
-	mkdir -p doc/text
-	rm -rf doc/webserver/developer-manual
-	cd doc/source && $(DB2HTML) -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver
-	cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual
+	rm -f doc/webserver/developer-manual/*.html
+	rm -rf doc/source/developer-manual
+	mkdir -p doc/text doc/source/developer-manual
+	cd doc/source/developer-manual && $(DB) ../developer-manual.sgml && cd .. && cp developer-manual/*.html ../webserver/developer-manual/
+	cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual
 
-##  user manual
+# user manual
 dok-user: doc/source/ldpOK.dsl
-	mkdir -p doc/text
-	rm -rf doc/webserver/user-manual
-	cd doc/source && $(DB2HTML) -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver
-	cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual
+	rm -f doc/webserver/user-manual/*.html
+	rm -rf doc/source/user-manual/
+	mkdir -p doc/text doc/source/user-manual
+	cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
+	cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual
 
-##  faq
+# faq
 dok-faq: doc/source/ldpOK.dsl
-	mkdir -p doc/text
-	rm -rf doc/webserver/faq
-	cd doc/source && $(DB2HTML) -s ldpOK.dsl faq.sgml && mv faq ../webserver
-	cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq
+	rm -f doc/webserver/faq/*.html
+	rm -rf doc/source/faq
+	mkdir -p doc/text doc/source/faq
+	cd doc/source/faq && $(DB) ../faq.sgml && cd .. && cp faq/*.html ../webserver/faq/
+	cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) tmp.html > ../text/faq.txt && rm -rf tmp.html faq
 
-## man page
+# man page
 dok-man: doc/source/ldpOK.dsl
-	mkdir -p doc/man
-	mkdir -p doc/webserver/man-page
-	if [ "$(MAN2HTML)" != "false" ]; then \
-		$(ECHO) "<html><head><title>Privoxy|Doc/Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html; \
-		man ./privoxy.1 | $(MAN2HTML) -bare \
-		 >> doc/webserver/man-page/privoxy-man-page.html; \
-		$(ECHO) "</body></html>" >> doc/webserver/man-page/privoxy-man-page.html; \
-     else \
-          $(MAKE) groff2html; \
-	fi
-
-dok: dok-devel dok-user dok-faq dok-man
-## kludge to force recreation on next run. Rodgrigo?
+	rm -f doc/man/* doc/webserver/man-page/*.html
+ifneq ($(MAN2HTML),false)
+	$(ECHO) "<html><head><title>Privoxy Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html
+	man ./privoxy.1 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html
+	$(ECHO) "</body></html>" >> doc/webserver/man-page/privoxy-man-page.html
+else
+	$(MAKE) groff2html
+endif
+
+# readme page
+dok-readme: doc/source/ldpOK.dsl
+	cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\
+	$(WDUMP) tmp.html > ../../README && rm -rf tmp.html
+
+# webserver files
+dok-webserver: doc/source/ldpOK.dsl
+	cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html
+
+dok: dok-devel dok-user dok-faq dok-man dok-readme dok-webserver
+# kludge to force recreation on next run. Rodgrigo?
 	@rm -f doc/source/ldpOK.dsl
 	@$(ECHO) Documentation created.
 
 #
-# an alternative to the above dok
-#
-redhat-dok: doc/source/ldpOK.dsl man2html
-	mkdir -p doc/text doc/man doc/source/user-manual \
-          doc/source/developer-manual doc/source/faq
-##  user manual
-	rm -rf doc/webserver/user-manual
-	cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. &&\
-          mv user-manual ../webserver
-	cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && \
-          $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html \
-          user-manual
-##  developer manual
-	rm -rf doc/webserver/developer-manual
-	cd doc/source/developer-manual && $(DB) ../developer-manual.sgml &&\
-          cd .. && mv developer-manual ../webserver
-	cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && \
-          $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html \
-          developer-manual
-##  faq
-	rm -rf doc/webserver/faq
-	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
+# an alternative to the above dok. disabled man page creation for the moment
+#
+redhat-dok: dok-devel dok-user dok-faq redhat-readme dok-webserver
 # kludge to force recreation on next run. Rodgrigo?
 	@rm -f doc/source/ldpOK.dsl
+	@$(ECHO) Documentation created.
 
 # For those with man2html ala RH7's.
 man2html:
 	mkdir -p doc/webserver/man-page
-	if [ "$(MAN2HTML)" != "false" ]; then \
-		$(MAN2HTML) privoxy.1 |grep -v "^Content-type" > doc/webserver/man-page/privoxy-man-page.html; \
-           perl -pi -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' doc/webserver/man-page/privoxy-man-page.html; \
-     else \
-          $(MAKE) groff2html; \
-	fi
+ifneq ($(MAN2HTML),false)
+	$(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html
+	$(PERL) -pi -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
+	$(PERL) -pi -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/HEAD>/' tmp.html
+# Get rid of spurious  from converion. (How to do this with perl?)
+	$(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.html
+else
+	$(MAKE) groff2html
+endif
+
+## 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
+
+#### WIP targets HB ##################
+## Make AUTHORS file
+authors: doc/source/ldpOK.dsl
+	cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
+	  tmp.html > ../../AUTHORS && rm -f tmp.html
+	# kludge to force recreation on next run. Rodgrigo?
+	@rm -f doc/source/ldpOK.dsl
+
+# make a man page, and then (lousy) HTML version.
+man: doc/source/ldpOK.dsl
+	mkdir -p doc/source/man
+	cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\
+	$(PERL) -pi -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.1
+	cd doc/source/man && $(DB) ../privoxy-man-page.sgml &&\
+	mv -f index.html privoxy-man-page.html
+	# kludge to force recreation on next run. Rodgrigo?
+	@rm -f doc/source/ldpOK.dsl
+
+# Set doc entities for VERSION and CODE_STATUS. Toggle content 
+# exceptions accordingly. When 'make dok' gets stable, this 
+# needs to go before any doc building (doh).
+make dok-release:
+	@$(ECHO) Setting doc version and status to $(VERSION), $(CODE_STATUS)
+	@$(PERL) -pi -e 's/<!entity +p-version.*>/<!entity p-version "$(VERSION)">/;\
+     s/<!entity +p-status.*>/<!entity p-status "$(CODE_STATUS)">/' \
+     doc/source/*sgml
+ifeq ($(CODE_STATUS),stable)
+	@$(ECHO) Setting docs to stable $(VERSION)
+	@$(PERL) -pi -e 's/<!entity +% +p-stable.*>/<!entity % p-stable "INCLUDE">/;\
+     s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "IGNORE">/' \
+     doc/source/*sgml
+else
+	@$(ECHO) Setting docs to not stable $(VERSION)
+	@$(PERL) -pi -e 's/<!entity +% +p-stable.*>/<!entity % p-stable "IGNORE">/;\
+     s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "INCLUDE">/' \
+     doc/source/*sgml
+endif
 
 #############################################################################
 #
@@ -578,21 +623,30 @@ man2html:
 # moves dokumentation to webserver
 #
 #############################################################################
-webserver:
+webserver: tidy
 	@$(ECHO) -------------------------------------------------------
 	@$(ECHO) You have run make dok/redhat-dok before, right?
 	@$(ECHO) Note that this command scps all stuff to the webserver,
 	@$(ECHO) it will not remove obsolete documents.
 	@$(ECHO) -------------------------------------------------------
-	cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
-	@$(ECHO) Fixing permissions
-	@ssh ijbswa.sourceforge.net chmod -R g+rw /home/groups/i/ij/ijbswa/htdocs/ 2> /dev/null
 
-webquick:
-	cd doc/webserver/actions && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/actions
+	@$(ECHO) Uploading 
+	@cd doc/webserver; \
+          upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
+          $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xv'
+
 	@$(ECHO) Fixing permissions
-	@ssh ijbswa.sourceforge.net chmod -R g+rw /home/groups/i/ij/ijbswa/htdocs/actions 2> /dev/null
+	@ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/* -type d | xargs chmod 775 2>/dev/null'
+	@ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/* -type f | xargs chmod 664 2>/dev/null'
 
+web-actions: tidy
+	@$(ECHO) Uploading 
+	@cd doc/webserver/actions; \
+          upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
+          $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xv'
+
+	@$(ECHO) Fixing permissions
+	@ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/* -type f | xargs chmod 664 2>/dev/null'	
 
 #############################################################################
 # Source file dependencies
@@ -659,10 +713,13 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 	$(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
 
 clean:
-	$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -iname TAGS`
+	$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -name TAGS -o -name tags` 
+
+tidy:
+	$(RM) `find . -name "*~" -o -name "#*#"`
 
-clobber:
-	$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *~ *.tar.gz *.tar \#*\#
+clobber: tidy
+	$(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? 
 #
@@ -700,6 +757,68 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# Revision 1.69  2002/04/07 08:10:47  swa
+# create some of the webserver docs
+# automatically (in particular if
+# those docs recycle other documentation
+# fragments). Now committed webserver's
+# index file.
+#
+# Revision 1.68  2002/04/07 07:58:11  swa
+# create some of the webserver docs
+# automatically (in particular if
+# those docs recycle other documentation
+# fragments)
+#
+# Revision 1.67  2002/04/07 05:31:42  hal9
+# Add 'dok-release' target:
+# -Set doc entities to VERSION and CODE_STATUS during make.
+# -Set doc conditional content flags (stable vs non-stable).
+# A separate target for the time being but needs to be incorporated into
+# dok build at some point.
+# -Filter out a spurious ^G from new man page > html converion in man2html.
+#
+# Revision 1.66  2002/04/06 20:28:21  jongfoster
+# Prettifying groff2html.
+# Using GNU Make's conditional makefile feature rather than shell "if"s.
+# (The shell "if"s were hiding errors)
+# "perl" -> "$(PERL)"
+# Spaces->tabs in a couple of places.
+#
+# Revision 1.65  2002/04/06 05:16:39  hal9
+# -Add 'authors' and 'man' targets for AUTHORS and man-page (WIP).
+# -Both of these will soon be generated files.
+#
+# Revision 1.64  2002/04/04 22:14:51  oes
+# No longer rely on find honoring -iname
+#
+# Revision 1.63  2002/04/04 21:06:22  swa
+# cosmetics.
+#
+# Revision 1.62  2002/04/04 20:49:50  swa
+# attempt to consolidate the
+# different dokbook versions.
+#
+# Revision 1.61  2002/04/04 19:18:21  swa
+# readme was leftover directory. use w3m instead
+# of lynx to be consistent among developers. use
+# consistent target naming.
+#
+# Revision 1.60  2002/04/04 12:25:41  oes
+# Tidy webserver upload w/o *~ files, CVS dirs and logfiles and with proper dir and file permissions
+#
+# Revision 1.59  2002/04/04 08:32:45  swa
+# wrong name for tarball-dist target. further fixed content of tarball dist
+#
+# Revision 1.58  2002/04/04 06:32:58  hal9
+# New dok targets for make readme.
+#
+# 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
 #