X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=b57d5a469a0105ebe0fc5854a461ff80c62fcb99;hp=e4e10888e560ccf769d374f0ec9ce1520ad1333e;hb=9c1c1c5cbe6cf0b6daab91b22ede3a499b498518;hpb=2af6f0359aa4252bd1dfefe69091d8ce69161854 diff --git a/GNUmakefile.in b/GNUmakefile.in index e4e10888..b57d5a46 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.95 2002/04/27 15:37:25 swa Exp $ +# $Id: GNUmakefile.in,v 1.108 2002/05/28 03:56:08 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -80,13 +80,17 @@ LN = ln WDUMP = @WDUMP@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ -DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldpOK.dsl\#html -DB2HTML = @DB2HTML@ -DKPREFIX = @DKPREFIX@ +# Note: Please make sure that -d ldp.dsl\#html stays the last option to +# $(JADEBIN), because for some targets "-notoc" will be appended +# to it (--> "ldp.dsl\#html-notoc"). +DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html MAN2HTML = @MAN2HTML@ G2H_CMD = groff -mandoc -Thtml TARGET_OS = @host@ PERL = perl +DOC_DIR = doc/source +DOC_TMP = $(DOC_DIR)/tmp + #User Group paras USER = @USER@ @@ -94,7 +98,7 @@ GROUP = @GROUP@ # Program to do LF->CRLF # -# The sed version should be the most portable, but it doesn't for for me, +# The sed version should be the most portable, but it doesn't work for me, # the other two do. FIXME. # - Jon #DOSFILTER = $(SED) -e $$'s,$$,\r,' @@ -208,7 +212,8 @@ all: $(PROGRAM) ############################################################################# .PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \ suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \ -install conectiva-spec conectiva-dist conectiva-upload +install conectiva-spec conectiva-dist conectiva-upload debian-dist \ +debian-upload ensure-wdump ensure-jadebin ensure-dkprefix ############################################################################# @@ -347,15 +352,15 @@ redhat-upload: check-release # suse distribution. works fine. no need to be root. ############################################################################# suse-dist: rpm-stuff - TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ - if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ - -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ - privoxy-suse.spec > $$TMPFILE ; then \ - $(MV) -f $$TMPFILE privoxy-suse.spec; \ - else \ - $(ECHO) "Could not set version info in specfile."; \ - exit 1;\ - fi +# TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ +# if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ +# -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ +# privoxy-suse.spec > $$TMPFILE ; then \ +# $(MV) -f $$TMPFILE privoxy-suse.spec; \ +# else \ +# $(ECHO) "Could not set version info in specfile."; \ +# exit 1;\ +# fi $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) . $(RPM) --clean -ta $(TAR_ARCH) @@ -455,9 +460,16 @@ hpux-upload: # debian distribution ############################################################################# debian-dist: - @$(ECHO) coming soon. + @$(ECHO) Creating Debian package. Will exist in parent directory. + dpkg-buildpackage -rfakeroot -us -uc debian-upload: - @$(ECHO) coming soon. + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy_$(shell dpkg-parsechangelog | grep "Version" | sed "s/Version: //")_$(shell dpkg --print-architecture).deb + @$(ECHO) ------------------------------------------------------- + @$(ECHO) Now goto + @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 + @$(ECHO) ... and release the files. + @$(ECHO) ------------------------------------------------------- + ############################################################################# # macosx distribution @@ -503,10 +515,10 @@ tarball-dist: dist-check clean clobber $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ - -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" \)`; do \ + -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o -name "PACKAGERS" \)`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ - cd .. && $(TAR) -cvhf --exclude "PACKAGERS" privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ + cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ # and zip the archive $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) @@ -533,22 +545,33 @@ tarball-clean: # ############################################################################# -# now works for swa -# our style file -doc/source/ldpOK.dsl: -# if [ "$(DKPREFIX)" != "none" ]; then \ -# sed -e "s@/usr/share/sgml/docbook/dsssl-stylesheets@$(DKPREFIX)@g" doc/source/ldp.dsl > doc/source/ldpOK.dsl; \ -# else \ -# cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \ -# fi - cp doc/source/ldp.dsl doc/source/ldpOK.dsl; +# 3 checks to make sure docs will be generated +ensure-wdump: +ifeq (@WDUMP@,false) + @$(ECHO) + @$(ECHO) "Cannot build docs; one of w3m, links, or lynx must be installed." + @$(ECHO) "You should install the appropriate package and rerun ./configure" + @exit 1 +endif -# Otherwise we get plain groff conversion. -groff2html: - $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html +ensure-jadebin: +ifeq (@JADEBIN@,false) + @$(ECHO) + @$(ECHO) "Cannot build docs; one of openjade or jade must be installed" + @$(ECHO) "You should install the appropriate package and rerun ./configure" + @exit 1 +endif + +ensure-dkprefix: +ifeq (@DKPREFIX@,false) + @$(ECHO) + @$(ECHO) "Cannot build docs; cannot find docbook-dsssl stylesheets" + @$(ECHO) "You should install the appropriate package and rerun ./configure" + @exit 1 +endif # developer manual -dok-devel: doc/source/ldpOK.dsl +dok-devel: ensure-dkprefix ensure-jadebin ensure-wdump $(RM) doc/webserver/developer-manual/*.html $(RM) -r doc/source/developer-manual mkdir -p doc/text doc/source/developer-manual @@ -556,7 +579,7 @@ dok-devel: doc/source/ldpOK.dsl cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual # user manual -dok-user: doc/source/ldpOK.dsl +dok-user: ensure-dkprefix ensure-jadebin ensure-wdump $(RM) doc/webserver/user-manual/*.html $(RM) -r doc/source/user-manual/ mkdir -p doc/text doc/source/user-manual @@ -564,7 +587,7 @@ dok-user: doc/source/ldpOK.dsl cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual # faq -dok-faq: doc/source/ldpOK.dsl +dok-faq: ensure-dkprefix ensure-jadebin ensure-wdump $(RM) doc/webserver/faq/*.html $(RM) -r doc/source/faq mkdir -p doc/text doc/source/faq @@ -572,7 +595,7 @@ dok-faq: doc/source/ldpOK.dsl cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq # man page -dok-man: doc/source/ldpOK.dsl +dok-man: $(RM) doc/man/* doc/webserver/man-page/*.html ifneq ($(MAN2HTML),false) $(ECHO) "Privoxy Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html @@ -583,32 +606,39 @@ else endif # readme page -dok-readme: doc/source/ldpOK.dsl - cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\ +dok-readme: ensure-dkprefix ensure-jadebin ensure-wdump + cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html -# webserver files -dok-webserver: doc/source/ldpOK.dsl - cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html - $(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\ +# index.sgml is used to create both the Home Page, and a local index +# for documentation, etc. +# +# index.html for webserver: +dok-webserver: + cd doc/source/webserver && $(DB)-notoc -ip-homepage -V nochunks index.sgml > ../../webserver/index.html + $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\ + s/<\/HEAD/\n<\/HEAD/;\ + s/<\/HEAD/\n<\/HEAD/;\ + s/\.\d\. //'\ + doc/webserver/index.html && $(RM) doc/webserver/*.bak + +# privoxy-index.html for local documentation: +dok-index: + cd doc/source/webserver && $(DB)-notoc -ip-index -V nochunks index.sgml > ../../webserver/privoxy-index.html + $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\ s/<\/HEAD/\n<\/HEAD/;\ - s/<\/HEAD/\n<\/HEAD/'\ - doc/webserver/index.html && $(RM) doc/source/webserver/*.bak + s/<\/HEAD/\n<\/HEAD/;\ + s/\.\d\. //'\ + doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak # Main documentation target. -dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors -# kludge to force recreation on next run. Rodrigo? -swa -# I see no need for it, but no problem either. Let it stay. -morcego - @$(RM) doc/source/ldpOK.dsl +dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors dok-index @$(ECHO) Documentation created. # # an alternative to the above dok. disabled man page creation for the moment # redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver dok-authors -# kludge to force recreation on next run. Rodrigo? -swa -# I see no need for it, but no problem either. Let it stay. -morcego - @$(RM) doc/source/ldpOK.dsl @$(ECHO) Documentation created. # For those with man2html ala RH7's. @@ -624,25 +654,25 @@ else $(MAKE) groff2html endif +# Otherwise we get plain groff conversion. +groff2html: + $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html + ## Make README -redhat-readme: doc/source/ldpOK.dsl +redhat-readme: ensure-dkprefix ensure-jadebin ensure-wdump cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \ tmp.html > ../../README && $(RM) -r tmp.html - # kludge to force recreation on next run. Rodgrigo? - @$(RM) doc/source/ldpOK.dsl ## Make AUTHORS file -dok-authors: doc/source/ldpOK.dsl +dok-authors: ensure-dkprefix ensure-jadebin ensure-wdump cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \ tmp.html > ../../AUTHORS && $(RM) tmp.html - # kludge to force recreation on next run. Rodgrigo? - @$(RM) doc/source/ldpOK.dsl # make a man page, and then (lousy) HTML version. # Requires docbook2man (short perl script), see comments # in privoxy-man-page.sgml. This target is not invoked from other dok targets. # It is built separately due to dependencies on perl scripts. -man: doc/source/ldpOK.dsl +man: mkdir -p doc/source/man cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\ perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1 @@ -651,8 +681,6 @@ man: doc/source/ldpOK.dsl # This html is not used. See make man2html. mv -f doc/source/man/privoxy.1 privoxy.1 $(MAKE) man2html - # kludge to force recreation on next run. Rodgrigo? - @$(RM) -r doc/source/ldpOK.dsl doc/source/man # Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content # exceptions accordingly. This needs to go before any doc building (doh). @@ -676,26 +704,33 @@ else $(RM) -r doc/source/*bak doc/source/*/*bak endif -dok-pdf: doc/source/ldpOK.dsl dok-release +dok-pdf: dok-release $(RM) doc/pdf/*.pdf cp -f doc/source/*.sgml doc/pdf cp -f doc/source/*.dsl doc/pdf - cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1 - cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1 - cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1 + cd doc/pdf && db2pdf --pdf -s ldp.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1 + cd doc/pdf && db2pdf --pdf -s ldp.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1 + cd doc/pdf && db2pdf --pdf -s ldp.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1 $(RM) doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux - # kludge to force recreation on next run. Rodgrigo? - @$(RM) doc/source/ldpOK.dsl # the layout and style with db2pdf sucks, here is an alternative -dok-pdf2: doc/source/ldpOK.dsl dok-release +dok-pdf2: dok-release mkdir -p doc/source/temp # this directory not in cvs cd doc/source && $(DB) -V nochunks user-manual.sgml > temp/privoxy-user-manual.html cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html # one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output. - # kludge to force recreation on next run. Rodgrigo? - @$(RM) doc/source/ldpOK.dsl + +# Create release announcement in text and html, with short and long versions. +# This is a standalone target, and must be invoked directly. +announce: dok-release + mkdir -p $(DOC_TMP) + cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\ + mv -f index.html announce.html && $(WDUMP) announce.html > announce.txt + cd $(DOC_TMP) && $(DB) announce.sgml &&\ + mv -f index.html announce-mini.html && $(WDUMP) announce-mini.html > announce-mini.txt &&\ + mv -f *html *txt ../../.. + rm -fr $(DOC_TMP) ############################################################################# # @@ -805,7 +840,8 @@ tidy: $(RM) `find . -name ".\#*"` clobber: tidy - $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldpOK.dsl + $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \ + privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl # # FIXME: What is all this? @@ -836,6 +872,12 @@ install: all # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy +coffee: + @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\ + 239,78,241,110,234,1,28,160,171,152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,143,\ + 13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,69,253,36,102,81,49,83,236,19,225,171,131,\ + 214,172,163,73,4,168,123,115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,187,54,220,125,\ + 193,51,228,11,1,0,0);'|zcat ############################################################################# @@ -844,6 +886,52 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.108 2002/05/28 03:56:08 hal9 +# make dok-index target for privoxy-index.html. Fix *bak dead soldiers in +# doc/webserver. +# +# Revision 1.107 2002/05/27 23:26:33 mal0rd +# Made doc-generation configuration automatic. +# References to DB2HTML were removed, not used. +# --with-docbook now only needed if in odd path. +# +# Revision 1.106 2002/05/26 04:55:11 mal0rd +# Added debian-dist and debian-upload targets. Also documented usage. +# +# Revision 1.105 2002/05/25 22:48:19 hal9 +# Add -notoc to README build (per oes's dsl magic). +# +# Revision 1.104 2002/05/24 00:03:49 oes +# Use p_doc.css for the Homepage for consistency +# +# Revision 1.103 2002/05/23 23:19:00 oes +# Use dsl without TOC for the homepage +# +# Revision 1.102 2002/05/16 01:20:17 hal9 +# make announce target added. +# +# Revision 1.101 2002/05/15 12:28:46 oes +# Trying to keep Hal happy :) +# +# Revision 1.100 2002/05/08 13:48:18 hal9 +# Ooops, that trashed JB v2.0.2 comment. Fixed. +# +# Revision 1.99 2002/05/08 13:42:07 hal9 +# This fixes the numbering problem on index.html in contact info section (.1.). Using +# perl, since its way too convoluted to try to fix proper with docbook. +# +# Revision 1.98 2002/05/03 14:33:06 oes +# Replaced ldp(OK).dsl handling with generation via autoconf; handle all file exeptions to src tarball via find +# +# Revision 1.97 2002/04/27 20:27:43 swa +# no longer needed due to new +# PACKAGE_VERSION process +# +# Revision 1.96 2002/04/27 17:44:32 morcego +# - Correcting typo in my name (Rodrigo, not Rodgrigo) :-) +# - Using the RM macro everywhere rm is called (either we use, or don't) +# - Same for RPM +# # Revision 1.95 2002/04/27 15:37:25 swa # replacing directory in document creation process # no longer necessary.