X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=cac549dd70a2311aeb2869ef9f40855a1bc082cc;hb=8e56b1709a45113278fa43360303ebde92548a68;hp=a87b71ef14735f0e64219bc9c2d7ca18cc88fab3;hpb=42df281ce29eeeb7497af17e20ee22bd7b5c2e17;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index a87b71ef..cac549dd 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.218 2013/01/25 14:17:35 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.227 2014/10/21 15:31:05 fabiankeil Exp $ # -# Written by and Copyright (C) 2001-2013 members of the +# Written by and Copyright (C) 2001-2014 members of the # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -113,7 +113,7 @@ GZIP_PROG = gzip #ID = id -u ID = id LD = @CC@ -RM = rm +RM = rm -f CP = cp -f RMDIR = rmdir MKDIR = ./mkinstalldirs @@ -144,14 +144,9 @@ DOC_DIR = doc/source DOC_TMP = $(DOC_DIR)/tmp DOC_STATUS = @DOC_STATUS@ TIDY = tidy -modify -indent -wrap 78 --tidy-mark no +RSYNC = rsync -av # 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 +154,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. @@ -573,12 +570,9 @@ dok-release: # 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 &&\ - $(W3M_DUMP) -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 +582,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 +603,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: @@ -629,31 +634,17 @@ webserver: clean-editor-files @$(SSH) shell.sourceforge.net 'chmod -R 775 $(WWW_ROOT)/htdocs 2>/dev/null; true' @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/ -type f | xargs chmod 664 2>/dev/null; true' -web-actions: clean-editor-files - @$(ECHO) Uploading - @cd doc/webserver/actions; \ - upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ - $(TAR) cf - $$upload | $(SSH) ijbswa.sourceforge.net 'cd $(WWW_ROOT)/htdocs/actions; tar xvm' +web-actions: + @$(ECHO) Updating the actions on the webserver ... + @$(RSYNC) doc/webserver/actions/*.php shell.sourceforge.net:$(WWW_ROOT)/htdocs/actions + @$(ECHO) Enforcing reasonable permissions ... + @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null' - @$(ECHO) Fixing permissions - @$(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) +web-faq: + @$(ECHO) Updating the FAQ on the webserver ... + @$(RSYNC) doc/webserver/faq/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/faq + @$(ECHO) Enforcing reasonable permissions ... + @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/faq/ -type f | xargs chmod 664 2>/dev/null' ############################################################################# # @@ -676,7 +667,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