projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add TODO #156: Reject socks requests with an explicit error message
[privoxy.git]
/
GNUmakefile.in
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
5ba88eb
..
3ac4174
100644
(file)
--- a/
GNUmakefile.in
+++ b/
GNUmakefile.in
@@
-1,9
+1,9
@@
-# Note:
Makefile is built automatically from M
akefile.in
+# Note:
GNUmakefile is built automatically from GNUm
akefile.in
#
#
-# $Id: GNUmakefile.in,v 1.2
31 2015/12/27 12:50:57
fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.2
57 2017/02/20 17:28:52
fabiankeil Exp $
#
#
-# Written by and Copyright (C) 2001-201
4
members of the
-# Privoxy team. http://www.privoxy.org/
+# Written by and Copyright (C) 2001-201
7
members of the
+# Privoxy team. http
s
://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
# by and Copyright (C) 1997 Anonymous Coders and
#
# Based on the Internet Junkbuster originally written
# by and Copyright (C) 1997 Anonymous Coders and
@@
-144,7
+144,7
@@
DOC_DIR = doc/source
DOC_TMP = $(DOC_DIR)/tmp
DOC_STATUS = @DOC_STATUS@
TIDY = tidy -modify -indent -wrap 78 --tidy-mark no
DOC_TMP = $(DOC_DIR)/tmp
DOC_STATUS = @DOC_STATUS@
TIDY = tidy -modify -indent -wrap 78 --tidy-mark no
-RSYNC = rsync -av
+RSYNC = rsync -av
-c --chmod=D755,F644
# Program to do LF->CRLF
DOSFILTER = $(PERL) -p -e 's/\n/\r\n/'
# Program to do LF->CRLF
DOSFILTER = $(PERL) -p -e 's/\n/\r\n/'
@@
-162,20
+162,24
@@
SOURCE_FORGE_NAME = ''
#############################################################################
TAR_ARCH = /tmp/privoxy-$(VERSION).tar.gz
#############################################################################
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
#############################################################################
#############################################################################
# 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.
CONFIG_FILES = $(CONFIGS) \
# take care that no CVS .cvsignore or other crappy files
# 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 \
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)
#############################################################################
$(MAN_PAGE)
#############################################################################
@@
-190,6
+194,12
@@
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
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@
+
+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)
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
+231,8
@@
SOCKET_LIB = @SOCKET_LIB@
# PThreads library, if needed.
PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_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) $(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)
HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB)
@@
-258,7
+268,7
@@
all: $(PROGRAM) default.action
#############################################################################
# Phony targets
#############################################################################
#############################################################################
# Phony targets
#############################################################################
-.PHONY: all inifiles
solaris-dist
\
+.PHONY: all inifiles \
win-dist tarball-dist dok webserver clean clobber tags \
install CONF_DEST LOG_DEST \
PID_DEST check_doc install-strip uninstall GROUP_T
win-dist tarball-dist dok webserver clean clobber tags \
install CONF_DEST LOG_DEST \
PID_DEST check_doc install-strip uninstall GROUP_T
@@
-323,8
+333,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
# 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 t
he main usage is to run it as follows (Red Hat example):
+# tar.gz with the current date in the name
.
+#
T
he main usage is to run it as follows (Red Hat example):
# make SNAPVERSION=1.6x create-snapshot
# This creates a tar.gz.
#############################################################################
# make SNAPVERSION=1.6x create-snapshot
# This creates a tar.gz.
#############################################################################
@@
-358,25
+368,27
@@
gen-dist: dist-check
@$(ECHO) ""
$(MAKE) $(PROGRAM)
$(STRIP_PROG) $(PROGRAM)
@$(ECHO) ""
$(MAKE) $(PROGRAM)
$(STRIP_PROG) $(PROGRAM)
- $(LN) -s
current
../privoxy-$(VERSION)-$(CODE_STATUS)
+ $(LN) -s
`pwd`
../privoxy-$(VERSION)-$(CODE_STATUS)
# add program
# 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 \
# 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 \
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;
done;
+# add tools
+ (cd .. && $(TAR) -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/tools)
# and zip the archive
$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
# 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:
@$(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
@$(ECHO) -------------------------------------------------------
@$(ECHO) Now goto
@$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118
@@
-385,7
+397,7
@@
gen-upload:
# use with care
gen-clean:
# 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,
#############################################################################
# Tarball distribution: No CVS dirs, dotfiles, debian build dir,
@@
-393,11
+405,11
@@
gen-clean:
#############################################################################
tarball-dist: dist-check clean clobber
#############################################################################
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 \
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 ; \
files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
done && \
cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
@@
-443,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.
# 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<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html
+ $(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html && \
+ rm doc/webserver/user-manual/*html.bak
# faq
dok-faq:
# faq
dok-faq:
@@
-515,7
+528,10
@@
dok-webserver:
$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
s/\.\d\. //;\
$(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
s/\.\d\. //;\
- s/__copy/©/'\
+ s/__copy/©/;\
+ s@(<SUB)@<p style="text-align: center">\1@; s@(</SUB)@\1></p@;\
+ s@ChameleonJohn@<br><a href="http://www.chameleonjohn.com/"><img align="middle"\
+ src="images/sponsors/chameleonjohn.png" alt="ChameleonJohn Coupons"></a><br>\n@' \
doc/webserver/index.html && $(RM) doc/webserver/*.bak
# privoxy-index.html for local documentation:
doc/webserver/index.html && $(RM) doc/webserver/*.bak
# privoxy-index.html for local documentation:
@@
-580,7
+596,7
@@
generate-config-file:
#
# Webserver
#
#
# Webserver
#
-# moves do
k
umentation to webserver
+# moves do
c
umentation to webserver
#
#############################################################################
sf-shell:
#
#############################################################################
sf-shell:
@@
-610,27
+626,17
@@
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'
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
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-faq:
@$(ECHO) Updating the FAQ on the webserver ...
@$(RSYNC) doc/webserver/faq/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/faq
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-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/
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'
#############################################################################
#
#############################################################################
#
@@
-719,8
+725,8
@@
$(PROGRAM): $(OBJS) $(W32_FILES)
clean:
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
config.base config.tmp \
clean:
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
config.base config.tmp \
- `find . \( -name TAGS -o -name tags \) -a
nd -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 "*~"`
clean-editor-files:
$(RM) `find . -name "*~"`