X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=GNUmakefile.in;h=76baeaaa6049776965e25a8be9b1357d792aece1;hb=c1a04f7163ac80003545edf3bb10bd65f0eecd88;hp=808fe39c964326358ad345fb98ff7f29ed0e5b9e;hpb=4e085026d30008d351868d37da769a45d5fb36e8;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 808fe39c..76baeaaa 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,9 +1,9 @@ -# Note: Makefile is built automatically from Makefile.in +# Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.233 2016/01/23 11:58:18 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.244 2016/05/03 13:20:58 fabiankeil Exp $ # -# Written by and Copyright (C) 2001-2014 members of the -# Privoxy team. http://www.privoxy.org/ +# Written by and Copyright (C) 2001-2016 members of the +# Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -162,11 +162,15 @@ 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 ############################################################################# -CONFIGS = config trust default.action match-all.action user.action default.filter user.filter +CONFIGS = config trust default.action match-all.action \ + user.action default.filter user.filter \ + regression-tests.action + # take care that no CVS .cvsignore or other crappy files # are included here # and escape every '#' in the find. doh. @@ -190,6 +194,9 @@ C_SRC = actions.c cgi.c cgiedit.c cgisimple.c deanimate.c encode.c \ C_OBJS = $(C_SRC:.c=.@OBJEXT@) 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@ + 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) @@ -221,8 +228,8 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) -OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) +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) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -323,8 +330,8 @@ dist-check: # create tar.gz from CVS: # This make-target is usually called through 'create-archive'. If you # run 'make create-snapshot' without setting SNAPVERSION, you'll get a -# tar.gz with the current date in the name and as a releasenumber in the -# spec-file. But the main usage is to run it as follows (Red Hat example): +# tar.gz with the current date in the name. +# The main usage is to run it as follows (Red Hat example): # make SNAPVERSION=1.6x create-snapshot # This creates a tar.gz. ############################################################################# @@ -360,23 +367,23 @@ gen-dist: dist-check $(STRIP_PROG) $(PROGRAM) $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) # add program - (cd .. && $(TAR) -cvhf --exclude "PACKAGERS" 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) -uvhf --exclude "PACKAGERS" 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) -uvhf --exclude "PACKAGERS" 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; # 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 @@ -385,7 +392,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, @@ -515,7 +522,10 @@ dok-webserver: $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\ s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ - s/__copy/©/'\ + s/__copy/©/;\ + s@(\1@; s@(ChameleonJohn Coupons@' \ doc/webserver/index.html && $(RM) doc/webserver/*.bak # privoxy-index.html for local documentation: @@ -580,7 +590,7 @@ generate-config-file: # # Webserver # -# moves dokumentation to webserver +# moves documentation to webserver # ############################################################################# sf-shell: