X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=9c5b0a0fcb6379858c1643f2f657b07cfd52002a;hp=76baeaaa6049776965e25a8be9b1357d792aece1;hb=7200b36362d29ad2961b1d89321df46263d0f3e5;hpb=c1a04f7163ac80003545edf3bb10bd65f0eecd88 diff --git a/GNUmakefile.in b/GNUmakefile.in index 76baeaaa..9c5b0a0f 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.244 2016/05/03 13:20:58 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.254 2017/01/12 14:19:02 fabiankeil Exp $ # -# Written by and Copyright (C) 2001-2016 members of the +# Written by and Copyright (C) 2001-2017 members of the # Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -175,11 +175,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"` \ + `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \ + `find doc/webserver/ -name "*.css" | sort` \ $(MAN_PAGE) ############################################################################# @@ -197,6 +197,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) @@ -228,8 +231,8 @@ 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) +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) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -365,7 +368,7 @@ 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 $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) # add config files @@ -376,6 +379,8 @@ gen-dist: dist-check for foo in $(DOC_FILES); do \ (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) ../$(GEN_DIST_TAR_NAME) @@ -400,11 +405,11 @@ 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/*" \) | sort`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -450,7 +455,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: @@ -525,7 +531,8 @@ dok-webserver: s/__copy/©/;\ s@(\1@; s@(ChameleonJohn Coupons@' \ + src="images/sponsors/chameleonjohn.png" alt="ChameleonJohn Coupons">
\n\ +Sponsor FAQ@' \ doc/webserver/index.html && $(RM) doc/webserver/*.bak # privoxy-index.html for local documentation: @@ -729,8 +736,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 -name rc.privoxy.orig -a -not -path "./.git/*"` clean-editor-files: $(RM) `find . -name "*~"`