X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=35a721ffabfb3aed111b071a925c02f217da1e13;hp=bbd626e41dd7a8d05b45081d6a4b7c0c92c6951f;hb=7631398b448a08d986023beda968c33c9f015f8f;hpb=d6dac68cf467f2e9ea7f6da28f6fe1fd894e8476 diff --git a/GNUmakefile.in b/GNUmakefile.in index bbd626e4..35a721ff 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.148 2006/09/26 10:57:58 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.158 2007/12/11 21:29:25 fabiankeil Exp $ # -# Written by and Copyright (C) 2001 - 2004 the SourceForge +# Written by and Copyright (C) 2001 - 2007 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -246,7 +246,7 @@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ @STATIC_PCRE_ONLY@ -Ipcre -LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) +LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) ############################################################################# @@ -482,7 +482,7 @@ suse-dist: rpm-stuff # fi $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) . - $(RPM) --clean -ta $(TAR_ARCH) + $(RPMBUILD) --clean -ta $(TAR_ARCH) if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # anonymously ncftps the rpms to sourceforge @@ -654,7 +654,7 @@ tarball-clean: # # Documentation # -# converts doc/source/*.sgml into html, text and man pages +# converts doc/source/*.sgml into html, text, pdf and man pages # ############################################################################# @@ -664,7 +664,7 @@ dok-devel: $(RM) -r doc/source/developer-manual mkdir -p doc/text doc/source/developer-manual cd doc/source/developer-manual && $(DB) ../developer-manual.sgml && cd .. && cp developer-manual/*.html ../webserver/developer-manual/ - cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual + cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual # user manual dok-user: @@ -676,7 +676,7 @@ dok-user: @# 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 - cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual + cd doc/source && $(DB) -iuser-man -V nochunks user-manual.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual # faq dok-faq: @@ -684,7 +684,7 @@ dok-faq: $(RM) -r doc/source/faq mkdir -p doc/text doc/source/faq cd doc/source/faq && $(DB) ../faq.sgml && cd .. && cp faq/*.html ../webserver/faq/ - cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq + cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && env -u LANG $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq # man page, one variation. Try to use the next target, just 'make man'. dok-man: @@ -731,9 +731,9 @@ groff2html: # readme page and INSTALL file dok-readme: dok-release cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ - $(WDUMP) tmp.html > ../../README ;\ + env -u LANG $(WDUMP) tmp.html > ../../README ;\ $(DB)-notoc -V nochunks install.sgml > tmp.html &&\ - $(WDUMP) tmp.html > ../../INSTALL ;\ + env -u LANG $(WDUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* # index.sgml is used to create both the Home Page, and a local index @@ -776,7 +776,7 @@ redhat-readme: ## Make AUTHORS file dok-authors: - cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \ + cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && env -u LANG $(WDUMP) \ tmp.html > ../../AUTHORS && $(RM) tmp.html # Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content @@ -849,26 +849,31 @@ dok-pdf: dok-shtml # NOTE: This will require some hand editing. The new file is outputted # as config.new so that problem sections can be compared to previous # version. This is hardcored to w3m for html/text conversion. Also, -# requires the shell util 'fmt'. +# requires the shell util 'fmt'. 2007-11-14: note the perl below dies +# with perl 5.8.8. The same code pasted into a free standing script, +# without the makefile-isms, works fine. config-file: dok-release cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ w3m -dump __tmp.html |fmt -w 70 > ../../config.new && $(RM) -r __tmp.* - $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\ - /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\ - $$header_len=0 unless $$hit_header;\ - if ($$hit_header) {\ - print "# ";\ - for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\ - print "\n";\ - };\ - $$hit_header=0;\ - $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\ - $$header_len = length($$_);\ - s/^/# /; /^# #{12,}/ && s/^# #/####/;\ - s/^.*$$// if $$hit_option;\ - $$hit_option=0;\ - s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\ - $$hit_option=1 if s/^#\s+@@//;' config.new + $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\ + /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\ + my $$hit_header;\ + $$header_len=0 unless $$hit_header;\ + if ($$hit_header) {\ + print "# ";\ + for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\ + print "\n";\ + };\ + my $$hit_header;\ + $$hit_header=0;\ + $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\ + $$header_len = length($$_);\ + s/^/# /; /^# #{12,}/ && s/^# #/####/;\ + s/^.*$$// if $$hit_option;\ + $$hit_option=0;\ + s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\ + $$hit_option=1 if s/^#\s+@@//;' config.new + $(RM) *.bak @$(ECHO) "****************************************************" @$(ECHO) "The output file is config.new." @@ -950,8 +955,8 @@ dok-get: ############################################################################# actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h -cgi.@OBJEXT@: cgi.c cgi.h config.h $(PROJECT_H_DEPS) cgiedit.h cgisimple.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h -cgiedit.@OBJEXT@: cgiedit.c cgiedit.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h +cgi.@OBJEXT@: cgi.c cgi.h config.h $(PROJECT_H_DEPS) cgiedit.h cgisimple.h jbsockets.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h +cgiedit.@OBJEXT@: cgiedit.c cgiedit.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actionlist.h actions.h errlog.h miscutil.h cgisimple.@OBJEXT@: cgisimple.c cgisimple.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h deanimate.@OBJEXT@: deanimate.c deanimate.h config.h $(PROJECT_H_DEPS) encode.@OBJEXT@: encode.c encode.h config.h @@ -1000,9 +1005,13 @@ w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ic # 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 @@ -1132,8 +1141,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(CAT) config >config~ ;\ $(MV) config.base config ;\ fi - $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \ - $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.tmp + $(SED) 's+^confdir \.+confdir $(CONF_DEST)+' config | \ + $(SED) 's+^logdir \.+logdir $(LOG_DEST)+' >config.tmp -@if [ $(check_doc) = 0 ]; then \ $(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\ else \ @@ -1220,7 +1229,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ $(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \ $(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \ - $(SED) 's+%USER%+$$USER+' | \ + $(SED) 's+%USER%+$(USER)+' | \ $(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\ $(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\ $(ECHO) "Installing for Slackware." ;\ @@ -1355,6 +1364,40 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.158 2007/12/11 21:29:25 fabiankeil +# Fix dependency list for cgiedit.c. +# +# Revision 1.157 2007/12/10 02:28:02 hal9 +# Unset $LANG for text processing of docs so we get pure text. +# +# Revision 1.156 2007/11/15 03:17:43 hal9 +# Some workaround changes to the config file perl stuff and comments, which is +# broken here all by itself on perl 5.8.8. +# +# Revision 1.155 2007/09/22 16:23:25 fabiankeil +# Update copyright line. +# +# Revision 1.154 2007/02/07 11:52:40 fabiankeil +# Fix suse-dist as described in BR#1654052. +# (I didn't test it, but it's done the same +# way in redhat-dist which is known to work). +# +# Revision 1.153 2007/01/07 07:36:36 joergs +# Added AmigaOS4 support. +# +# Revision 1.152 2006/12/13 14:53:51 etresoft +# Include any existing LDFLAGS environment when linking so that a MacOS X Universal Binary can be created. +# +# Revision 1.151 2006/11/30 01:08:55 hal9 +# Fix problem with variable declarations in the Slackware section. Thanks to higuita. +# +# Revision 1.150 2006/10/25 11:55:45 fabiankeil +# Fix sed regexes for rewriting "confdir ." and "logdir .". +# Thanks to Darel Henman for reporting this. +# +# Revision 1.149 2006/10/11 01:40:28 hal9 +# Apply patch from Neil McCalden to fix syntax issue. +# # Revision 1.148 2006/09/26 10:57:58 hal9 # Including Karsten's patch to fix make create-snapshot. #