X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=b5e8ff2d346acab96fcf9a512bb0cea11b583ae7;hp=5d8ea54f5ce2250af3a91d700029f0cfbd16e001;hb=062c2d7a59739c3bd24b29322cb49044f92e9aa7;hpb=cc77d4eec4405c7a88977ee93f0d317827aba968 diff --git a/GNUmakefile.in b/GNUmakefile.in index 5d8ea54f..b5e8ff2d 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.161 2008/03/30 13:19:13 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.172 2008/06/17 16:16:08 fabiankeil Exp $ # -# Written by and Copyright (C) 2001 - 2007 the SourceForge +# Written by and Copyright (C) 2001 - 2008 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -55,6 +55,7 @@ SNAPVERSION = $(RPM_VERSION)-$(shell date "+%Y%m%d") USER = @USER@ GROUP = @GROUP@ +datarootdir = @datarootdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ CONF_BASE = @sysconfdir@ @@ -174,11 +175,9 @@ CONFIG_FILES = $(CONFIGS) \ `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \ - `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \ `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \ `find doc/webserver/ -name "*.css"` \ - privoxy.1 \ - doc/pdf/*.pdf + privoxy.1 ############################################################################# # Filenames and libraries @@ -452,7 +451,7 @@ redhat-upload: check-release ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto - @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 + @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118 @$(ECHO) ... and release the files. @$(ECHO) ------------------------------------------------------- # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -492,7 +491,7 @@ suse-upload: check-release ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto - @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 + @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118 @$(ECHO) ... and release the files. @$(ECHO) ------------------------------------------------------- @@ -547,7 +546,7 @@ gen-upload: ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto - @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 + @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118 @$(ECHO) ... and release the files. @$(ECHO) ------------------------------------------------------- @@ -628,7 +627,7 @@ tarball-dist: dist-check clean clobber for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \ - -name "PACKAGERS" -o -path "*/pdf/*" \)`; do \ + -name "PACKAGERS" \)`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -643,7 +642,7 @@ tarball-upload: ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto - @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 + @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118 @$(ECHO) ... and release the files. @$(ECHO) ------------------------------------------------------- @@ -654,7 +653,7 @@ tarball-clean: # # Documentation # -# converts doc/source/*.sgml into html, text, pdf and man pages +# converts doc/source/*.sgml into html and man pages # ############################################################################# @@ -662,29 +661,26 @@ tarball-clean: dok-devel: $(RM) doc/webserver/developer-manual/*.html $(RM) -r doc/source/developer-manual - mkdir -p doc/text doc/source/developer-manual + mkdir -p 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 && env -u LANG $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual # user manual dok-user: $(RM) doc/webserver/user-manual/*.html $(RM) -r doc/source/user-manual/ - mkdir -p doc/text doc/source/user-manual + mkdir -p doc/source/user-manual cd doc/source/user-manual && $(DB) -iuser-man ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/ - @#FIXME: temp fix so same stylesheet gets in more than one place so it works \ - @# for all doc set-ups, including the 'user manual' config option in local \ - @#system where it MUST be in same directory as html. + # FIXME: temp fix so same stylesheet gets in more than one place so it works + # for all doc set-ups, including the 'user manual' config option in local + # system where it MUST be in same directory as html. $(PERL) -pi.bak -e 's/<\/head/\n\n<\/head/i' doc/webserver/user-manual/*html - cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual # faq dok-faq: $(RM) doc/webserver/faq/*.html $(RM) -r doc/source/faq - mkdir -p doc/text doc/source/faq + mkdir -p 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 && env -u LANG $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq # man page, one variation. Try to use the next target, just 'make man'. dok-man: @@ -743,7 +739,7 @@ dok-readme: dok-release 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/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__copy/©/'\ @@ -753,7 +749,7 @@ dok-webserver: 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/;\ s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__copy/©/' \ @@ -801,39 +797,6 @@ else $(RM) -r doc/source/*bak doc/source/*/*bak endif -# Generate single page html. Used only for creating pdf docs (ATM). -# Currently using: See http://www.easysw.com/htmldoc/pdf-o-matic.php. -# If using this generator, remember U-M has a couple of graphics in -# a parallel directory. -# -dok-shtml: dok-release - mkdir -p doc/source/temp # this directory not in cvs - cd doc/source && $(DB) -iuser-man -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. - -# Make pdf docs from single page html. Requires htmldoc, see -# (http://www.easysw.com/htmldoc/). Note: 1.8.20 has a TOC bug. -# PDF docs are uploaded to webserver as zip archive. -dok-pdf: dok-shtml - @$(ECHO) -n "starting htmldoc version: "; - if htmldoc --version ; then : ; \ - else $(ECHO) "WARNING: could not get htmldoc version" ; fi - cd utils/ldp_print && $(RM) *html *bak *jpg *tmp *pdf *zip - cp -f doc/source/temp/*html doc/webserver/user-manual/*jpg utils/ldp_print - cd utils/ldp_print ;\ - $(PERL) -pi.bak -e 's/\.\.\/images\///; s/(<\/?)SUB/$$1small/i;\ - s/\.\.\/user-manual\/index\.html/privoxy-user-manual.pdf/;\ - s/\.\.\/developer-manual\/index\.html/privoxy-developer-manual.pdf/;\ - s/\.\.\/faq\/index\.html/privoxy-faq.pdf/' *.html ;\ - for i in developer-manual user-manual faq; do \ - ./ldp_print privoxy-$$i.html ;\ - $(ECHO) DONE: privoxy-$$i.pdf ;\ - done ;\ - $(MV) *.pdf ../../doc/pdf ;\ - $(RM) -r *html *bak *jpg *pdf *zip ../../doc/source/temp - # 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 @@ -849,30 +812,11 @@ dok-pdf: dok-shtml # NOTE: This will require some hand editing. The new file is outputted # as config.new so that problem sections can be compared to previous # version. This is hardcored to w3m for html/text conversion. Also, -# requires the shell util 'fmt'. 2007-11-14: note the perl below dies -# with perl 5.8.8. The same code pasted into a free standing script, -# without the makefile-isms, works fine. +# requires the shell util 'fmt'. config-file: dok-release cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ - w3m -dump __tmp.html |fmt -w 70 > ../../config.new && $(RM) -r __tmp.* - $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\ - /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\ - my $$hit_header;\ - $$header_len=0 unless $$hit_header;\ - if ($$hit_header) {\ - print "# ";\ - for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\ - print "\n";\ - };\ - my $$hit_header;\ - $$hit_header=0;\ - $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\ - $$header_len = length($$_);\ - s/^/# /; /^# #{12,}/ && s/^# #/####/;\ - s/^.*$$// if $$hit_option;\ - $$hit_option=0;\ - s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\ - $$hit_option=1 if s/^#\s+@@//;' config.new + env -u LANG w3m -dump __tmp.html | fmt -w 70 > ../../config.new && $(RM) -r __tmp.* + $(PERL) -i.bak utils/prepare-configfile.pl config.new $(RM) *.bak @$(ECHO) "****************************************************" @@ -884,7 +828,7 @@ config-file: dok-release @$(ECHO) "probably got hammered." @$(ECHO) "****************************************************" -# config file, alternate verison using lynx (perl stuff unfinished). Lynx +# config file, alternate version using lynx (perl stuff unfinished). Lynx # does not do so good a job. config-file-alt: cd doc/source && $(ECHO) -e ".h2 JUSTIFY\\nJUSTIFY:FALSE" > __tmp.lynx_cfg &&\ @@ -912,11 +856,6 @@ webserver: tidy 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 xvm 2>&1 | grep -v timestamp' - @$(ECHO) Uploading pdf - @cd doc/pdf;\ - zip privoxy-pdf-docs *.pdf ;\ - scp -q privoxy-pdf-docs.zip ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/pdf - @$(ECHO) Fixing permissions @ssh ijbswa.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true' @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true' @@ -946,7 +885,7 @@ dok-put: dok-get: cd /tmp ;\ - $(WGET) http://privoxy.org/docs/$(DOC_FILE) ;\ + $(WGET) http://www.privoxy.org/docs/$(DOC_FILE) ;\ $(TAR) -zxvf $(DOC_FILE) @@ -957,11 +896,11 @@ dok-get: actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h cgi.@OBJEXT@: cgi.c cgi.h config.h $(PROJECT_H_DEPS) cgiedit.h cgisimple.h jbsockets.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h cgiedit.@OBJEXT@: cgiedit.c cgiedit.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actionlist.h actions.h errlog.h miscutil.h -cgisimple.@OBJEXT@: cgisimple.c cgisimple.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h +cgisimple.@OBJEXT@: cgisimple.c cgisimple.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h urlmatch.h deanimate.@OBJEXT@: deanimate.c deanimate.h config.h $(PROJECT_H_DEPS) encode.@OBJEXT@: encode.c encode.h config.h errlog.@OBJEXT@: errlog.c errlog.h config.h $(PROJECT_H_DEPS) @WIN_ONLY@w32log.h -filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h ssplit.h cgi.h deanimate.h @WIN_ONLY@win32.h +filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h ssplit.h cgi.h deanimate.h urlmatch.h @WIN_ONLY@win32.h gateway.@OBJEXT@: gateway.c gateway.h config.h $(PROJECT_H_DEPS) errlog.h jbsockets.h jcc.h loadcfg.h jbsockets.@OBJEXT@: jbsockets.c jbsockets.h config.h $(PROJECT_H_DEPS) filters.h jcc.@OBJEXT@: jcc.c jcc.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h loadcfg.h loaders.h miscutil.h parsers.h @WIN_ONLY@w32log.h win32.h w32svrapi.h cgi.h @@ -969,7 +908,7 @@ list.@OBJEXT@: list.c list.h config.h $(PROJECT_H_DEPS) list.h mi loadcfg.@OBJEXT@: loadcfg.c loadcfg.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h jcc.h loaders.h miscutil.h parsers.h @WIN_ONLY@w32log.h win32.h loaders.@OBJEXT@: loaders.c loaders.h config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h gateway.h jcc.h loadcfg.h miscutil.h parsers.h ssplit.h miscutil.@OBJEXT@: miscutil.c miscutil.h config.h -parsers.@OBJEXT@: parsers.c parsers.h config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h jbsockets.h jcc.h loadcfg.h loaders.h miscutil.h ssplit.h +parsers.@OBJEXT@: parsers.c parsers.h config.h $(PROJECT_H_DEPS) errlog.h filters.h jbsockets.h jcc.h loadcfg.h loaders.h miscutil.h ssplit.h ssplit.@OBJEXT@: ssplit.c ssplit.h config.h miscutil.h urlmatch.@OBJEXT@: urlmatch.c urlmatch.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h @@ -1022,7 +961,7 @@ clean: tidy: $(RM) `find . -name "*~"` -# $(RM) `find . -name "#*#"` # what is this for?? + $(RM) `find . -name "#*#"` # Emacs backup files $(RM) `find . -name ".\#*"` clobber: tidy @@ -1102,7 +1041,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\ $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST) $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST) - + @# Install the DOCS and man page. install-sh only does one file at a time. @# FIXME: only handles jpegs. -@if [ $(check_doc) = 0 ]; then \ @@ -1355,11 +1294,13 @@ uninstall: CONF_DEST LOG_DEST PID_DEST check_doc @$(ECHO) Privoxy uninstalled, bye 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 + @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,' \ + -e '101,0,109,143,205,13,192,32,8,133,239,78,241,110,234,1,28,160,171,' \ + -e '152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,' \ + -e '143,13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,' \ + -e '69,253,36,102,81,49,83,236,19,225,171,131,214,172,163,73,4,168,123,' \ + -e '115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,' \ + -e '187,54,220,125,193,51,228,11,1,0,0);' | zcat ############################################################################# @@ -1368,6 +1309,49 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.172 2008/06/17 16:16:08 fabiankeil +# - Stop building text files nobody cares about. +# - Update copyright year. +# +# Revision 1.171 2008/06/13 15:24:57 fabiankeil +# Move previously inline'd Perl code for the config-file target +# into a separate file, have it work with older perl releases, +# clean it up a bit and fix the "underlining" code. +# +# Revision 1.170 2008/06/12 16:38:50 fabiankeil +# Add third-level domain to URL in dok-get target. +# +# Revision 1.169 2008/06/09 17:28:31 fabiankeil +# - Recommend https for releasing files. +# - Fix a warning about datarootdir being ignored. +# +# Revision 1.168 2008/05/23 18:03:12 fabiankeil +# - Shorten meta description inserted in dok-webserver +# and dok-index target. +# - In config-file target, unset LANG for w3m as we +# might otherwise end up with multi-byte characters. +# +# Revision 1.167 2008/05/23 14:39:09 fabiankeil +# Silence dok-user complaint about @# not being found. +# +# Revision 1.166 2008/05/23 14:04:57 fabiankeil +# - Get config-file target working with more recent Perl +# versions. The generated file is still messed up, though. +# - Fix comment typo. +# +# Revision 1.165 2008/05/22 16:57:23 fabiankeil +# Fix coffee machine. +# +# Revision 1.164 2008/05/22 10:26:26 fabiankeil +# - Remove parsers.@OBJEXT@'s dependency on encode.h. +# - Include Emacs backup files in tidy target again. +# +# Revision 1.163 2008/05/04 18:01:53 fabiankeil +# Dependency fixes: cgisimple.c and filters.c depend on urlmatch.h. +# +# Revision 1.162 2008/03/30 13:31:42 fabiankeil +# Add DESTDIR support for the uninstall target. +# # Revision 1.161 2008/03/30 13:19:13 fabiankeil # Add DESTDIR support for the install target. Closes PR#1910612. # Patch by Radoslaw Zielinski with minor modifications.