X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=772609fdf771a82589c1cc4705f931441a19be6f;hp=097f25e930721e5e91814fb12cc24e4b97769b65;hb=db286eee13c2afa9f761b9c5796292bae9432e26;hpb=02381bd37513d2f1b79799528fcdf5fb1cd434f8 diff --git a/GNUmakefile.in b/GNUmakefile.in index 097f25e9..772609fd 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.214 2013/01/09 15:08:51 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.224 2014/10/21 15:29:34 fabiankeil Exp $ # # Written by and Copyright (C) 2001-2013 members of the # Privoxy team. http://www.privoxy.org/ @@ -130,8 +130,8 @@ CHMOD = chmod CHOWN = chown CHGRP = chgrp GROUPS = groups -WDUMP = env -u LANG LC_ALL=C @WDUMP@ -dump -WDUMP_UTF8 = @WDUMP@ -dump +W3M_DUMP = env -u LANG LC_ALL=C @W3M@ -dump +W3M_DUMP_UTF8 = @W3M@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html @@ -146,12 +146,6 @@ DOC_STATUS = @DOC_STATUS@ TIDY = tidy -modify -indent -wrap 78 --tidy-mark no # Program to do LF->CRLF -# -# The sed version should be the most portable, but it doesn't for for me, -# the other two do. FIXME. -# - Jon -#DOSFILTER = $(SED) -e $$'s,$$,\r,' -#DOSFILTER = gawk -v ORS='\r\n' '{print $0;}' DOSFILTER = $(PERL) -p -e 's/\n/\r\n/' CVSROOT = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa #TMPDIR := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX) @@ -159,6 +153,8 @@ CVSROOT = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa # change this to "ssh -l sf-username" SSH = ssh WWW_ROOT = /home/project-web/ijbswa +# SourceForge login name used by the 'sf-shell' target (optional) +SOURCE_FORGE_NAME = '' ############################################################################# # Setup for make distribution for now. @@ -504,9 +500,9 @@ groff2html: # readme page and INSTALL file dok-readme: dok-release cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ - $(WDUMP) tmp.html > ../../README ;\ + $(W3M_DUMP) tmp.html > ../../README ;\ $(DB)-notoc -V nochunks install.sgml > tmp.html &&\ - $(WDUMP) tmp.html > ../../INSTALL ;\ + $(W3M_DUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* # index.sgml is used to create both the Home Page, and a local index @@ -536,7 +532,7 @@ dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors ## Make AUTHORS file dok-authors: - cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP_UTF8) \ + cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(W3M_DUMP_UTF8) \ tmp.html > ../../AUTHORS && $(RM) tmp.html # Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content @@ -565,20 +561,17 @@ dok-release: # 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 +# mv -f index.html announce.html && $(W3M_DUMP) 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 index.html announce-mini.html && $(W3M_DUMP) announce-mini.html > announce-mini.txt &&\ # mv -f *html *txt ../../.. # rm -fr $(DOC_TMP) # The main Privoxy config file, generated from sgml sources. # NOTE: This will require some hand editing. -config-file: dok-release - cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ - $(WDUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.* - $(PERL) -i.bak utils/prepare-configfile.pl config +config-file: dok-release generate-config-file - $(RM) *.bak + $(RM) config.bak config.html @$(ECHO) "****************************************************" @$(ECHO) "The config file has been optimistically updated" @$(ECHO) "Now -- you may need to hand edit the results!" @@ -588,6 +581,11 @@ config-file: dok-release @$(ECHO) "might have gotten hammered." @$(ECHO) "****************************************************" +generate-config-file: + cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > ../../config.html + $(W3M_DUMP) -cols 67 config.html > config + $(PERL) -i.bak utils/prepare-configfile.pl config + # config file, alternate version using lynx (perl stuff unfinished). Lynx # does not do so good a job. config-file-alt: @@ -604,6 +602,12 @@ config-file-alt: # moves dokumentation to webserver # ############################################################################# +sf-shell: + @sf_name=$(SOURCE_FORGE_NAME); \ + [ -n "$${sf_name}" ] || read -p "Enter SourceForge username: " sf_name || exit 1; \ + echo "Opening shell for $${sf_name} ..."; \ + ssh -t $${sf_name},ijbswa@shell.sourceforge.net create + webserver: clean-editor-files @$(ECHO) ------------------------------------------------------- @$(ECHO) You will need to "create" a SF shell first: @@ -639,22 +643,6 @@ web-actions: clean-editor-files @$(SSH) ijbswa.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null' @$(SSH) ijbswa.sourceforge.net 'chmod 666 $(WWW_ROOT)/htdocs/actions/results/actions-feedback.txt 2>/dev/null' -## -dok-put: - tar --exclude ".cvsignore" --exclude "CVS" --exclude "source" --exclude ".htaccess" \ - --exclude "obsolete" --exclude "actions" --exclude "*.zip" --exclude "robots.txt"\ - doc/* INSTALL LICENSE AUTHORS README \ - -czf $(DOC_FILE) ;\ - $(ECHO) "Uploading doc package ..." ;\ - scp $(DOC_FILE) ijbswa.sourceforge.net:$(WWW_ROOT)/htdocs/docs/ - @$(SSH) ijbswa.sourceforge.net 'chmod 775 $(WWW_ROOT)/htdocs/docs/*gz 2>/dev/null; true' - $(RM) $(DOC_FILE) - -dok-get: - cd /tmp ;\ - $(WGET) http://www.privoxy.org/docs/$(DOC_FILE) ;\ - $(TAR) -zxvf $(DOC_FILE) - ############################################################################# # # Try to clean up the generated HTML files. @@ -676,7 +664,7 @@ dok-tidy: # Source file dependencies ############################################################################# -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 +actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h filters.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 urlmatch.h @@ -741,7 +729,9 @@ $(PROGRAM): $(OBJS) $(W32_FILES) clean: $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \ - `find . -name TAGS -o -name tags | $(GREP) -v .git` config.base config.tmp + config.base config.tmp \ + `find . \( -name TAGS -o -name tags \) -and -not -path "./.git/refs/tags"` \ + `find . -name "*.orig" -a -not -name rc.privoxy.orig` clean-editor-files: $(RM) `find . -name "*~"`