X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=f5ca9da703bc001b83a55ed0e99c05113452f7db;hp=c35e2dc51b4873dda7101e7a084bdc9437e2d7dc;hb=4490d451f9b61baada414233897a83ec8d9908aa;hpb=ca3bfca1eadf00b68aad86a6fa1651f7d528ffc3 diff --git a/GNUmakefile.in b/GNUmakefile.in index c35e2dc5..f5ca9da7 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,6 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.253 2016/12/24 16:00:49 fabiankeil Exp $ -# -# Written by and Copyright (C) 2001-2016 members of the +# Written by and Copyright (C) 2001-2018 members of the # Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -44,6 +42,8 @@ CODE_STATUS = @CODE_STATUS@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) SNAPVERSION = $(VERSION)-$(shell date "+%Y%m%d") +SOURCE_DATE_EPOCH = @SOURCE_DATE_EPOCH@ +MTREE_SPEC_FILE = privoxy-$(VERSION)-$(CODE_STATUS).spec ############################################################################# # "make install" directories and variables @@ -130,11 +130,21 @@ CHMOD = chmod CHOWN = chown CHGRP = chgrp GROUPS = groups -W3M_DUMP = env -u LANG LC_ALL=C @W3M@ -dump -W3M_DUMP_UTF8 = @W3M@ -dump +W3M_DUMP = @W3M@ -I ISO-8859 -O ASCII -dump +W3M_DUMP_UTF8 = @W3M@ -I ISO-8859 -O UTF-8 -dump +# docbook output is ISO-8859 (which is a superset of ascii) JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ +NSGMLS = @NSGMLS@ DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html +DB_TXT = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#print +# -d dsssl_spec +# This specifies that dsssl_spec is the system identifier of the DSSSL specification to be used. +# ldp.dsl#html : keep '&char;' strings as is +# ldp.dsl#print : convert '&char;' strings to ISO-8859 equivalent +# NOTE: '-d ldp.dsl\#whatever' _MUST_ be last and _MUST NOT_ have +# a trailing space so that '$(DB)-notoc' or '$(DB_TXT)-notoc' +# pulls in the correct dsl stylesheet DB2HTML = @DB2HTML@ MAN2HTML = @MAN2HTML@ G2H_CMD = groff -mandoc -Thtml @@ -143,8 +153,22 @@ PERL = perl 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 -c +TIDY = tidy -latin1 -q -modify -indent -wrap 120 --tidy-mark no --preserve-entities yes \ + --mute MISSING_ATTRIBUTE --mute TRIM_EMPTY_ELEMENT +# -latin1 +# use ISO-8859-1 for both input and output +# docbook output is ISO-8859 and tidy assumes UTF-8 +# -q +# suppress nonessential output +# -modify +# modify the original input file +# --mute MISSING_ATTRIBUTE +# don't show lacks "alt" attribute +# or lacks "summary" attribute +# --mute TRIM_EMPTY_ELEMENT +# don't show trimming empty

+# +RSYNC = rsync -av -c --chmod=D755,F644 # Program to do LF->CRLF DOSFILTER = $(PERL) -p -e 's/\n/\r\n/' @@ -207,6 +231,10 @@ W32_HDRS = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h w32svrapi.h W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32 W32_INIS = @WIN_ONLY@config.txt trust.txt +SSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY@ssl.c +SSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.o) +SSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.h) project.h + PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h) @@ -231,9 +259,9 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) -OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) -HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) +SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(SSL_SRC) +OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(SSL_OBJS) +HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(SSL_HDRS) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -252,6 +280,7 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ + -Imbedtls/include \ @STATIC_PCRE_ONLY@ -Ipcre LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) @@ -419,6 +448,27 @@ tarball-dist: dist-check clean clobber $(GZIP_PROG) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar @$(ECHO) Tarball distribution created. +# Create a mtree spec file that can be used to get a reproducible tar ball +mtree-spec: + $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) + $(ECHO) "#mtree 2.0" > $(MTREE_SPEC_FILE) + 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 "*.git/*" -o -name "*.spec" \) | env -i sort`; do \ + $(ECHO) "privoxy-$(VERSION)-$(CODE_STATUS)/$$i time=$(SOURCE_DATE_EPOCH) type=file uname=privoxy gname=privoxy mode=0555"; \ + done >> $(MTREE_SPEC_FILE) + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) + +# Create a reproducible tarball. +# Requires a tar implementation with mtree support. +reproducible-tarball-dist: dist-check clean clobber mtree-spec + $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) + + $(TAR) cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar -C .. @privoxy-$(VERSION)-$(CODE_STATUS)/$(MTREE_SPEC_FILE) + $(GZIP_PROG) -n privoxy-$(VERSION)-$(CODE_STATUS)-src.tar + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) $(MTREE_SPEC_FILE) + @$(ECHO) Reproducible 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 @@ -482,7 +532,7 @@ dok-man: # target for man page generation! man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ - nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ + $(NSGMLS) ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ perl -pi.bak -e 's/ //; s/\[ /\[/g' $(MAN_PAGE) ;\ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" $(MAN_PAGE); \ perl -pi.bak -e "s/ö/\\\\[:o]/g" $(MAN_PAGE); \ @@ -513,9 +563,9 @@ groff2html: # readme page and INSTALL file dok-readme: dok-release - cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ + cd doc/source && $(DB_TXT)-notoc -V nochunks readme.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../README ;\ - $(DB)-notoc -V nochunks install.sgml > tmp.html &&\ + $(DB_TXT)-notoc -V nochunks install.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* @@ -529,10 +579,7 @@ dok-webserver: s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__copy/©/;\ - s@(\1@; s@(ChameleonJohn Coupons
\n\ -Sponsor FAQ@' \ + s@(\1@; s@( tmp.html && $(W3M_DUMP_UTF8) \ - tmp.html > ../../AUTHORS && $(RM) tmp.html + cd doc/source && $(DB_TXT) -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 # exceptions accordingly. This needs to go before any doc building (doh). @@ -589,7 +636,7 @@ config-file: dok-release generate-config-file @$(ECHO) "****************************************************" generate-config-file: - cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > ../../config.html + cd doc/source && $(DB_TXT)-notoc -iconfig-file -V nochunks config.sgml > ../../config.html $(W3M_DUMP) -cols 67 config.html > config $(PERL) -i.bak utils/prepare-configfile.pl config @@ -627,27 +674,25 @@ webserver: clean-editor-files upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ $(TAR) cf - $$upload | $(SSH) shell.sourceforge.net 'cd $(WWW_ROOT)/htdocs/; tar xvm 2>&1 | grep -v timestamp' - @$(ECHO) Fixing permissions - @$(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: @$(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' + +web-homepage: + @$(ECHO) "Updating the home page (index.html) only (be careful in case of version changes) ..." + @$(RSYNC) doc/webserver/index.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/ 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' + +web-sponsors: + @$(ECHO) "Updating the sponsor page (index.html) only ..." + @$(RSYNC) doc/webserver/sponsors/index.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/sponsors/ web-user-manual: @$(ECHO) Updating the user manual on the webserver (do not use in case of version changes) ... @$(RSYNC) doc/webserver/user-manual/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/user-manual/ - @$(ECHO) Enforcing reasonable permissions ... - @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/user-manual/ -type f | xargs chmod 664 2>/dev/null' ############################################################################# # @@ -661,6 +706,7 @@ web-user-manual: ############################################################################# dok-tidy: for html_file in `find doc/webserver -name "*.html"`; do \ + $(ECHO) "------ begin processing $$html_file" >&2 ; \ $(TIDY) $$html_file || $(TIDY) $$html_file; \ $(PERL) -i'' -e 's@^\s*
\s*$$@@; s@ +$$@@;' -n -p $$html_file; \ done @@ -688,6 +734,8 @@ miscutil.@OBJEXT@: miscutil.c miscutil.h config.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 +client-tags.@OBJEXT@: client-tags.c client-tags.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h +fuzz.@OBJEXT@: fuzz.c config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h # GNU regex gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h @@ -716,19 +764,7 @@ w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h win32.h w32svrapi.h w32.res: w32.rc w32res.h icons/radar-01.ico icons/radar-02.ico icons/radar-03.ico icons/radar-04.ico icons/radar-05.ico icons/radar-06.ico icons/radar-07.ico icons/radar-08.ico icons/idle.ico icons/privoxy.ico config.h - windres -D__MINGW32__=0.2 -O coff -i $< -o $@ - -# AmigaOS -@AMIGAOS_ONLY@OBJS += amiga.o -@AMIGAOS_ONLY@ifeq ($(shell $(CC) -dumpmachine), m68k-amigaos) -@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -m68020 -noixemul -fbaserel -msmall-code -@AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel -@AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o -@AMIGAOS_ONLY@else -@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -Wextra -D__USE_INLINE__ -D__NO_INTUITION_RJ_MACROS -@AMIGAOS_ONLY@endif -@AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h - + windres -F pe-i386 -D__MINGW32__=0.2 -O coff -i $< -o $@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)