X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=8b2fe42187f92b05acb53b8733eeddbb04933b9a;hp=9a2572d803f180a6f1a5ff4bd9a6e539e46409fb;hb=32ba28b1225c54c850c48814b018e7afcffbd0a5;hpb=0bc21816de5ca5930cb3d64fcdd09f00bc3e0029 diff --git a/GNUmakefile.in b/GNUmakefile.in index 9a2572d8..8b2fe421 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,9 +1,7 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.242 2016/04/10 08:08:40 fabiankeil Exp $ -# -# Written by and Copyright (C) 2001-2014 members of the -# Privoxy team. http://www.privoxy.org/ +# Written by and Copyright (C) 2001-2021 members of the +# Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -34,7 +32,7 @@ @SET_MAKE@ ############################################################################# -# Version number (for RPM) +# Version number ############################################################################# VERSION_MAJOR = @VERSION_MAJOR@ @@ -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/' @@ -162,6 +186,7 @@ SOURCE_FORGE_NAME = '' ############################################################################# TAR_ARCH = /tmp/privoxy-$(VERSION).tar.gz +GEN_DIST_TAR_NAME = privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS).tar ############################################################################# # We include these files in our distributions @@ -174,11 +199,11 @@ CONFIGS = config trust default.action match-all.action \ # are included here # and escape every '#' in the find. doh. CONFIG_FILES = $(CONFIGS) \ - `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` + `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS" | sort` -DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \ - `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \ - `find doc/webserver/ -name "*.css"` \ +DOC_FILES = AUTHORS LICENSE LICENSE.GPLv3 README ChangeLog INSTALL \ + `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \ + `find doc/webserver/ -name "*.css" | sort` \ $(MAN_PAGE) ############################################################################# @@ -196,6 +221,9 @@ C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h CLIENT_TAG_SRC = @FEATURE_CLIENT_TAGS_ONLY@client-tags.c CLIENT_TAG_OBJS = @FEATURE_CLIENT_TAGS_ONLY@client-tags.@OBJEXT@ +FUZZ_SRC = @FUZZ_ONLY@fuzz.c +FUZZ_OBJS = @FUZZ_ONLY@fuzz.@OBJEXT@ + W32_SRC = @WIN_ONLY@w32log.c w32taskbar.c win32.c w32svrapi.c W32_FILES = @WIN_ONLY@w32.res W32_OBJS = @WIN_ONLY@$(W32_SRC:.c=.@OBJEXT@) $(W32_FILES) @@ -203,6 +231,18 @@ 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_common.c +SSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.o) +SSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.h) project.h + +MBEDTLS_SRC = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@ssl.c +MBEDTLS_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@$(MBEDTLS_SRC:.c=.o) +MBEDTLS_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@$(MBEDTLS_SRC:.c=.h) + +OPENSSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@openssl.c +OPENSSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@$(OPENSSL_SRC:.c=.o) +OPENSSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@$(OPENSSL_SRC:.c=.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) @@ -227,9 +267,9 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) -OBJS = $(C_OBJS) $(CLIENT_TAG_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) $(MBEDTLS_SRC) $(OPENSSL_SRC) +OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(SSL_OBJS) $(MBEDTLS_OBJS) $(OPENSSL_OBJS) +HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(SSL_HDRS) $(MBEDTLS_HDRS) $(OPENSSL_HDRS) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -364,25 +404,27 @@ gen-dist: dist-check @$(ECHO) "" $(MAKE) $(PROGRAM) $(STRIP_PROG) $(PROGRAM) - $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) + $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) # add program - (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) + (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) # add config files for foo in $(CONFIG_FILES); do \ - (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ done; # add documentation for foo in $(DOC_FILES); do \ - (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ done; +# add tools + (cd .. && $(TAR) -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/tools) # and zip the archive $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) - $(GZIP_PROG) ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar + $(GZIP_PROG) ../$(GEN_DIST_TAR_NAME) @$(ECHO) Distribution with binary created. # anonymously ncftps the package to sourceforge gen-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../$(GEN_DIST_TAR_NAME).gz @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -391,7 +433,7 @@ gen-upload: # use with care gen-clean: - $(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar* + $(RM) ../$(GEN_DIST_TAR_NAME)* ############################################################################# # Tarball distribution: No CVS dirs, dotfiles, debian build dir, @@ -399,11 +441,12 @@ gen-clean: ############################################################################# tarball-dist: dist-check clean clobber - $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) + $(LN) -s `pwd` ../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" -o \ - -name "PACKAGERS" \)`; do \ + -name "PACKAGERS" -o -path "*.git/*" \ + -o -path "*/doc/webserver/feeds*" \) | sort`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -413,6 +456,28 @@ 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" \ + -o -path "*/doc/webserver/feeds*" \) | 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 @@ -449,7 +514,8 @@ dok-user: # 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 + $(PERL) -pi.bak -e 's/<\/head/\n\n<\/head/i' doc/webserver/user-manual/*html && \ + rm doc/webserver/user-manual/*html.bak # faq dok-faq: @@ -475,7 +541,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); \ @@ -506,9 +572,10 @@ 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 &&\ + $(PERL) -pi'' -e 's@doc/source/readme\.sgml@README@' ../../README; \ + $(DB_TXT)-notoc -V nochunks install.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* @@ -523,8 +590,8 @@ dok-webserver: s/\.\d\. //;\ s/__copy/©/;\ s@(\1@; s@(ChameleonJohn Coupons@' \ + s@(Privoxy is a non-caching)@Privoxy logo\n\1@; \ + s@www.lalal.ai@Vocal Remover by Lalal.ai\n@;' \ doc/webserver/index.html && $(RM) doc/webserver/*.bak # privoxy-index.html for local documentation: @@ -542,8 +609,8 @@ 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 && $(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). @@ -581,7 +648,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 @@ -619,27 +686,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' ############################################################################# # @@ -653,6 +718,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 @@ -680,9 +746,11 @@ 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 - -# GNU regex -gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.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 +ssl.@OBJEXT@: ssl.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h +openssl.@OBJEXT@: openssl.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h +ssl_common.@OBJEXT@: ssl_common.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h # PCRS pcrs.@OBJEXT@: pcrs.c pcrs.h config.h @STATIC_PCRE_ONLY@pcre/pcre.h @@ -708,19 +776,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) @@ -728,8 +784,8 @@ $(PROGRAM): $(OBJS) $(W32_FILES) clean: $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \ 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` + `find . \( -name TAGS -o -name tags \) -a -not -path "./.git/*"` \ + `find . -name "*.orig" -a -not -path "./.git/*"` clean-editor-files: $(RM) `find . -name "*~"` @@ -738,7 +794,7 @@ clean-editor-files: clobber: clean-editor-files $(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 config.new + privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl $(RM) -r autom4te.cache # @@ -822,7 +878,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T DOC=$(prefix)/doc/privoxy ;\ fi;\ $(MKDIR) $(DESTDIR)$$DOC $(DESTDIR)$$DOC/user-manual $(DESTDIR)$$DOC/faq $(DESTDIR)$$DOC/developer-manual \ - $(DESTDIR)$$DOC/man-page $(DESTDIR)$$DOC/images $(DESTDIR)$(MAN_DEST) ;\ + $(DESTDIR)$$DOC/man-page $(DESTDIR)$(MAN_DEST) ;\ if [ -d "$(DOK_WEB)" ]; then \ $(ECHO) Installing FAQ, Manual, and other docs to $(DESTDIR)$$DOC;\ for i in user-manual developer-manual faq; do \ @@ -837,6 +893,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\ $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\ $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\ + $(INSTALL) $(INSTALL_T) LICENSE.GPLv3 $(DESTDIR)$$DOC;\ $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\ $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\ @@ -937,7 +994,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ - $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ + $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \ $(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \ $(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \ $(SED) 's+%USER%+$(USER)+' | \ @@ -963,7 +1020,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T uninstall: CONF_DEST LOG_DEST PID_DEST check_doc @$(ECHO) Starting Privoxy uninstallation @# KILL privoxy if running - @# XXX: the chkconfig line may need a DESTDIR prefix. -@test -f $(DESTDIR)$(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ $(KILL) `$(CAT) $(DESTDIR)$(PID_DEST)/privoxy.pid` || : -@test -f $(DESTDIR)/var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\