X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=d1e85ad1ef0e690da28c186d688050ea10476bfe;hp=d7a095d8fa274bfac00463f5bf31353887fb5634;hb=adae677532e819b10e9e63e7dd12b092eb8d8ece;hpb=fb42e7db1228ade6d4d25a0af403383c54199898 diff --git a/GNUmakefile.in b/GNUmakefile.in index d7a095d8..d1e85ad1 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,9 +1,9 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.3 2002/01/04 14:45:48 oes Exp $ +# $Id: GNUmakefile.in,v 1.24 2002/03/24 14:19:55 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# IJBSWA team. http://ijbswa.sourceforge.net +# Privoxy team. http://ijbswa.sourceforge.net # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -27,177 +27,6 @@ # or write to the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# $Log: GNUmakefile.in,v $ -# Revision 1.2 2001/12/30 14:07:31 steudten -# - Add signal handling (unix) -# - Add SIGHUP handler (unix) -# - Add creation of pidfile (unix) -# - Add action 'top' in rc file (RH) -# - Add entry 'SIGNALS' to manpage -# - Add exit message to logfile (unix) -# -# Revision 1.1 2001/12/01 11:22:57 jongfoster -# Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of -# make break in a more obvious way. -# Adding .PHONY section. -# -# Revision 1.40 2001/12/01 00:24:11 jongfoster -# Renaming various config files -# Fixing CR->CRLF under Win32 (I hope) -# -# Revision 1.39 2001/11/06 12:07:30 steudten -# Add --clean for building rpm in target redhat-dist. -# -# Revision 1.38 2001/11/05 21:35:23 steudten -# Complete rewrite for the 'redhat-dist' target. -# Checks for writeable RPM build directories for calling user. -# So you must not be root, just set the modes to 1777 to -# build a RH package. -# Fix the upload-target to be arch independant. -# Add target for 'solaris-dist' - coming soon. -# -# Revision 1.37 2001/11/01 00:52:04 hal9 -# Redhat-upload stuff per Stefan. -# -# Revision 1.36 2001/10/31 19:26:13 swa -# automate process of uploading new releases -# to sf. -# -# Revision 1.35 2001/10/15 22:14:59 joergs -# Removed -O2 and -Wall from AmigaOS-only CFLAGS since they are now in -# the general CFLAGS already. -# -# Revision 1.34 2001/10/15 18:28:06 steudten -# remove config.cache for target clobber. -# Cleanup make dist for RH and S.u.S.E. -# -# Revision 1.33 2001/10/10 12:43:33 oes -# Added ugly hack to make install target work at least for some setups. -# -# Revision 1.32 2001/10/09 22:38:19 jongfoster -# Correcting actionsfile filename for Win32 INI build -# -# Revision 1.31 2001/09/23 10:13:48 swa -# upload process established. run make webserver and -# the documentation is moved to the webserver. documents -# are now linked correctly. -# -# Revision 1.30 2001/09/19 17:55:49 oes -# Fixed CFLAGS -# -# Revision 1.29 2001/09/16 17:34:27 jongfoster -# Removing showargs.[ch], adding cgi(simple|edit).[ch] -# Replacing $(OBJEXT) with @OBJEXT@ - this seems to be a common source -# of build problems. -# -# Revision 1.28 2001/09/13 15:19:08 swa -# we want text files as well. -# -# Revision 1.27 2001/09/13 13:11:37 steudten -# -# Replace DEBUG_CFLAGS with OTHER_CFLAGS -# -# Revision 1.26 2001/09/12 23:44:54 david__schmidt -# Mac OSX (Darwin) support added. -# -# Revision 1.25 2001/09/12 22:55:45 joergs -# AmigaOS support added. -# -# Revision 1.24 2001/09/12 17:28:59 david__schmidt -# -# OS/2 port: update autoconf'd support for the platform. -# -# Revision 1.23 2001/09/12 16:28:42 swa -# added "make dok" section to generate html pages from -# the sgml source documents. note that the we do not want -# generated stuff in cvs. -# -# Revision 1.22 2001/09/10 16:31:23 swa -# buildroot definition in the specfile fucks up the build -# process under suse. hence I moved it to the "rpm -ta" -# command -# -# Revision 1.21 2001/09/10 11:12:49 oes -# Turning on -Wall -# -# Revision 1.20 2001/08/02 22:04:29 jongfoster -# Removing some remaining references to obsolete w32rulesdlg.[ch] -# -# Revision 1.19 2001/07/30 22:14:03 jongfoster -# Removing obsolete w32rulesdlg.c and w32rulesdlg.h -# -# Revision 1.18 2001/07/29 17:09:17 jongfoster -# Major changes to build system in order to fix these bugs: -# - pthreads under Linux was broken - changed -lpthread to -pthread -# - Compiling in MinGW32 mode under CygWin now correctly detects -# which shared libraries are available -# - Solaris support (?) (Not tested under Solaris yet) -# -# Revision 1.17 2001/07/28 16:44:54 oes -# Fixed sed LF->CRLF conversion and removed deprecated files -# -# Revision 1.16 2001/07/15 19:45:33 jongfoster -# Added support for linking with POSIX threads library -# -# Revision 1.15 2001/07/13 13:48:07 oes -# - Moved STATIC #define for pcre to (ac)config.h -# - Made -Ipcre depandant on static pcre compilation to -# avoid version conflicts -# - Included compilation and depandancies for new deanimate.c -# - Made changes to the pcre/pcreposix/pcrs build process -# as required by the new library autodetection in -# configure.in -# -# Revision 1.14 2001/07/01 16:27:44 oes -# Fixed misplaced dependancy -# -# Revision 1.13 2001/06/29 13:18:36 oes -# - added depandancy of filters.o on cgi.h -# -# Revision 1.12 2001/06/12 17:15:56 swa -# fixes, because a clean build on rh6.1 was impossible. -# GZIP confuses make, %configure confuses rpm, etc. -# -# Revision 1.11 2001/06/11 11:26:35 sarantis -# RPM version should be the same as ijbswa version. The rpm release is -# specified in the specfile. -# -# Revision 1.10 2001/06/07 17:27:45 swa -# added suse build section -# -# Revision 1.9 2001/06/04 18:31:58 swa -# files are now prefixed with either `confdir' or `logdir'. -# `make redhat-dist' replaces both entries confdir and logdir -# with redhat values -# -# Revision 1.8 2001/06/04 10:44:57 swa -# `make redhatr-dist' now works. Except for the paths -# in the config file. -# -# Revision 1.7 2001/06/03 17:09:09 swa -# swa for oes: reversed my earlier change -# -# Revision 1.6 2001/06/03 17:07:27 swa -# swa for oes -# -# Revision 1.5 2001/06/03 13:57:26 swa -# compile cgi.c (for andreas' GUI) -# -# Revision 1.4 2001/05/31 21:18:45 jongfoster -# Added files actions.[ch], actionlist.h, list.[ch] to Makefile -# -# Revision 1.3 2001/05/29 20:02:48 joergs -# Changes for AmigaOS added. -# -# Revision 1.2 2001/05/17 22:23:23 oes -# - Added auto-generation of CRLFs for Win32 config files -# - Added comment-prefix to all Win32-only options in the config file -# and provided auto stripping of this prefix for the Win32 platform by make -# -# Revision 1.1.1.1 2001/05/15 13:59:00 oes -# Initial import of version 2.9.3 source tree -# -# ############################################################################# # Version number (for RPM) @@ -210,14 +39,14 @@ CODE_STATUS = @CODE_STATUS@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) # will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile RPM_VERSION = $(VERSION) -RPM_PACKAGEV = 2 +RPM_PACKAGEV = @VERSION_RPM_PACKAGE@ ############################################################################# # Directories for "make install" ############################################################################# -DEST = @sysconfdir@/junkbuster +DEST = @sysconfdir@/privoxy SBIN_DEST = @sbindir@ MAN_DEST = @mandir@ @@ -226,7 +55,7 @@ MAN_DEST = @mandir@ # Build tools ############################################################################# -PROGRAM = junkbuster@EXEEXT@ +PROGRAM = privoxy@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip @@ -234,13 +63,18 @@ INSTALL = cp -f LD = @CC@ RM = rm -f STRIP_PROG = strip -SED = sed +SED = sed CAT = cat RPM = rpm -MV = mv +MV = mv TAR = tar MAKE = make LN = ln +WDUMP = @WDUMP@ -dump +JADEBIN = @JADEBIN@ +DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html +DB2HTML = @DB2HTML@ +DKPREFIX = @DKPREFIX@ # Program to do LF->CRLF # @@ -255,8 +89,8 @@ DOSFILTER = perl -p -e 's/\n/\r\n/' # Setup for make distribution rh and suse for now ############################################################################# -TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz -RPM_BASE = /usr/src/redhat +TAR_ARCH = /tmp/privoxy-$(RPM_VERSION).tar.gz +RPM_BASE = @RPM_BASE@ ############################################################################# # Filenames and libraries @@ -264,7 +98,8 @@ RPM_BASE = /usr/src/redhat C_SRC = actions.c cgi.c cgiedit.c cgisimple.c deanimate.c encode.c \ errlog.c filters.c gateway.c jbsockets.c jcc.c killpopup.c \ - list.c loadcfg.c loaders.c miscutil.c parsers.c ssplit.c + list.c loadcfg.c loaders.c miscutil.c parsers.c ssplit.c \ + urlmatch.c C_OBJS = $(C_SRC:.c=.@OBJEXT@) C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h @@ -274,7 +109,7 @@ W32_FILES = @WIN_ONLY@w32.res W32_OBJS = @WIN_ONLY@$(W32_SRC:.c=.@OBJEXT@) $(W32_FILES) W32_HDRS = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32 -W32_INIS = @WIN_ONLY@config.txt trust.txt re_filterfile.txt +W32_INIS = @WIN_ONLY@config.txt trust.txt PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) @@ -341,7 +176,8 @@ all: $(PROGRAM) # Phony targets ############################################################################# .PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \ -suse-upload win-dist tarball-dist dok webserver clean clobber tags install +suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \ +install ############################################################################# @@ -360,13 +196,14 @@ inifiles: $(W32_INIS) config.txt: config $(SED) -e 's!\trustfile trust!trustfile trust.txt!' \ -e 's!\jarfile jarfile!jarfile jar.log!' \ - -e 's!\logfile logfile!logfile junkbuster.log!' \ - -e 's!\re_filterfile re_filterfile!re_filterfile re_filterfile.txt!' \ + -e 's!\logfile logfile!logfile privoxy.log!' \ -e 's!#Win32-only: !!' \ < $< | \ $(DOSFILTER) > $@ - # LF to CRLF in ijb.action - $(DOSFILTER) ijb.action.txt && mv ijb.action.txt ijb.action + # LF to CRLF in default.action + $(DOSFILTER) default.action.txt && mv default.action.txt default.action + # LF to CRLF in default.filter + $(DOSFILTER) default.filter.txt && mv default.filter.txt default.filter trust.txt: trust $(DOSFILTER) < $< > $@ @@ -380,31 +217,39 @@ re_filterfile.txt: re_filterfile ############################################################################# redhat-dist: - @for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ + for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ if [ ! -w $(RPM_BASE)/$$dir ]; then \ $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \ - exit; \ + $(ECHO) "Or add a suitable path to .rpmmacros like."; \ + $(ECHO) "%_topdir /home/foo/rpm-build"; \ + exit 1; \ fi; \ - done ; \ - $(MAKE) clobber; \ - [ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH); \ - $(CAT) junkbuster-rh.spec | \ - $(SED) 's/^Version:.*/Version: $(RPM_VERSION)/g;s/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && \ - $(MV) -f abc junkbuster-rh.spec; \ - $(CAT) junkbuster.init | \ - $(SED) 's#JB_PID=.*/\(.*\.pid\).*#JB_PID=@PID_FILE_PATH@/\1#g' > abc && \ - $(MV) -f abc junkbuster.init; \ - $(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \ - $(RPM) --clean -ta $(TAR_ARCH); \ - [ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH) + done; \ + + $(MAKE) clobber + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi + + TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ + if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ + -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ + privoxy-rh.spec > $$TMPFILE ; then \ + $(MV) -f $$TMPFILE privoxy-rh.spec; \ + else \ + $(ECHO) "Could not set version info in specfile."; \ + exit 1;\ + fi + + $(TAR) --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) . + $(RPM) --clean -ta $(TAR_ARCH) + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # # anonymously ncftps the rpms to sourceforge # redhat-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/junkbuster-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm # better should use `arch` here instead of ix86 to support other platforms too - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/junkbuster-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -423,26 +268,39 @@ solaris-dist: ############################################################################# suse-dist: - @make clobber -# verify that i'm root needs to be done - rm -f ../ijbswa.tar.gz -# verify all version strings, FLAGS, etc. in the spec file - cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && mv -f abc junkbuster-suse.spec - tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz . -# verify all files in their correct location needs to be done -# never use buildroot to define the location inside the spec -# file or suse will fuck up the build process. - cd .. && rpm -ta --buildroot /tmp/xxx ijbswa.tar.gz - chmod a+r /usr/src/packages/SRPMS/* - chmod a+r /usr/src/packages/RPMS/i386/* + for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ + if [ ! -w $(RPM_BASE)/$$dir ]; then \ + $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \ + $(ECHO) "Or add a suitable path to .rpmmacros like."; \ + $(ECHO) "%_topdir /home/foo/rpm-build"; \ + exit 1; \ + fi; \ + done; \ + + $(MAKE) clobber + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi + + TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ + if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ + -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ + privoxy-suse.spec > $$TMPFILE ; then \ + $(MV) -f $$TMPFILE privoxy-suse.spec; \ + else \ + $(ECHO) "Could not set version info in specfile."; \ + exit 1;\ + fi + + $(TAR) --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) . + $(RPM) --clean -ta $(TAR_ARCH) + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # # anonymously ncftps the rpms to sourceforge # suse-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming /usr/src/packages/SRPMS/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm # better should use `arch` here instead of ix86 to support other platforms too - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming /usr/src/packages/RPMS/*/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -451,13 +309,24 @@ suse-upload: # handle with care. use with root. suse-clean: - rpm -e junkbuster-suse + rpm -e junkbuster-suse || true rm -rf /etc/junkbuster + rm -rf /etc/rc.d/junkbuster* + rm -rf /var/run/junkbuster.pid rm -rf /var/log/junkbuster rm -f /etc/init.d/junkbuster rm -f /usr/sbin/junkbuster rm -f /usr/sbin/rcjunkbuster rm -f /usr/share/man/man1/junkbuster.1.gz + rpm -e privoxy-suse || true + rm -rf /etc/privoxy + rm -rf /etc/rc.d/privoxy* + rm -rf /var/run/privoxy.pid + rm -rf /var/log/privoxy + rm -f /etc/init.d/privoxy + rm -f /usr/sbin/privoxy + rm -f /usr/sbin/rcprivoxy + rm -f /usr/share/man/man1/privoxy.1.gz ############################################################################# # Windows distribution @@ -473,8 +342,8 @@ tarball-dist: @make clean make $(PROGRAM) # remove all objects and create the tarball with the binary - cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../ijb-distribution-$(VERSION).tar.gz ijb/ - chmod a+r ../../ijb-distribution-$(VERSION).tar.gz + cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../privoxy-distribution-$(VERSION).tar.gz ijb/ + chmod a+r ../../privoxy-distribution-$(VERSION).tar.gz @$(ECHO) Tarball with binary created. ############################################################################# @@ -484,20 +353,50 @@ tarball-dist: # converts doc/source/*.sgml into html, text and man pages # ############################################################################# -dok: +dok: doc/source/ldpOK.dsl mkdir -p doc/text doc/man # user manual rm -rf doc/webserver/user-manual - cd doc/source && db2html -s ldp.dsl user-manual.sgml && mv user-manual ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual + cd doc/source && $(DB2HTML) -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver + cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual ## developer manual rm -rf doc/webserver/developer-manual - cd doc/source && db2html -s ldp.dsl developer-manual.sgml && mv developer-manual ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual + cd doc/source && $(DB2HTML) -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver + cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual ## faq rm -rf doc/webserver/faq - cd doc/source && db2html -s ldp.dsl faq.sgml && mv faq ../webserver - cd doc/source && db2html -s ldp.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq + cd doc/source && $(DB2HTML) -s ldpOK.dsl faq.sgml && mv faq ../webserver + cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq + +redhat-dok: doc/source/ldpOK.dsl + mkdir -p doc/text doc/man doc/source/user-manual \ + doc/source/developer-manual doc/source/faq +## user manual + rm -rf doc/webserver/user-manual + cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. &&\ + mv user-manual ../webserver + cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && \ + $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html \ + user-manual +## developer manual + rm -rf doc/webserver/developer-manual + cd doc/source/developer-manual && $(DB) ../developer-manual.sgml &&\ + cd .. && mv developer-manual ../webserver + cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && \ + $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html \ + developer-manual +## faq + rm -rf doc/webserver/faq + cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver + cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \ + tmp.html > ../text/faq.txt && rm -rf tmp.html faq + +doc/source/ldpOK.dsl: + if [ "$(DKPREFIX)" != "none" ]; then \ + sed -e "s@/usr/share/sgml/docbook/dsssl-stylesheets@$(DKPREFIX)@g" doc/source/ldp.dsl > doc/source/ldpOK.dsl; \ + else \ + cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \ + fi ############################################################################# # @@ -508,7 +407,7 @@ dok: ############################################################################# webserver: @$(ECHO) ------------------------------------------------------- - @$(ECHO) You have run make dok before, right? + @$(ECHO) You have run make dok/redhat-dok before, right? @$(ECHO) Note that this command scps all stuff to the webserver, @$(ECHO) it will not remove obsolete documents. @$(ECHO) ------------------------------------------------------- @@ -538,6 +437,7 @@ loaders.@OBJEXT@: loaders.c loaders.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.@OBJEXT@: miscutil.c miscutil.h config.h parsers.@OBJEXT@: parsers.c parsers.h config.h $(PROJECT_H_DEPS) errlog.h encode.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 @@ -583,15 +483,15 @@ clean: $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) clobber: clean - $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` TAGS junkbuster.log config.cache *~ *.tar.gz + $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) tarball-src: clobber - $(LN) -s current ../ijb-$(VERSION)-$(CODE_STATUS) - $(TAR) -C.. -cvhzf ijb-$(VERSION)-$(CODE_STATUS)-src.tar.gz ijb-$(VERSION)-$(CODE_STATUS) - $(RM) ../ijb-$(VERSION)-$(CODE_STATUS) + $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) + $(TAR) -C.. -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS) + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) install: all # @@ -605,10 +505,10 @@ install: all mkdir -p $(DEST)/templates cp -r doc/webserver/user-manual $(DEST) cp -r templates $(DEST) - $(INSTALL) config ijb.action re_filterfile trust $(DEST) - # FIXME $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly - # FIXME: Need new manual! $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz - $(INSTALL) junkbuster.init /etc/init.d/junkbuster + $(INSTALL) config default.action default.filter trust $(DEST) + # FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly + # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz + $(INSTALL) privoxy.init /etc/init.d/privoxy ############################################################################# @@ -616,3 +516,291 @@ install: all ## Local Variables: ## tab-width: 3 ## end: + +# $Log: GNUmakefile.in,v $ +# Revision 1.24 2002/03/24 14:19:55 swa +# set rpm package release in configure.in. nowhere else. +# +# Revision 1.23 2002/03/24 13:06:49 swa +# suse-clean now runs fine +# +# Revision 1.22 2002/03/24 12:56:21 swa +# name change related issues. +# +# Revision 1.21 2002/03/24 12:43:57 swa +# name change +# +# Revision 1.20 2002/03/24 11:39:17 jongfoster +# Renaming config files +# +# Revision 1.19 2002/03/22 20:53:03 morcego +# - Ongoing process to change name to JunkbusterNG +# - configure/configure.in: no change needed +# - GNUmakefile.in: +# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz +# - PROGRAM = jbng@EXEEXT@ +# - rh-spec now references as junkbusterng-rh.spec +# - redhat-upload: references changed to junkbusterng-* (package names) +# - tarball-dist: references changed to JunkbusterNG-distribution-* +# - tarball-src: now JunkbusterNG-* +# - install: initscript now junkbusterng.init and junkbusterng (when +# installed) +# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec +# - junkbusterng.spec: +# - References to the expression ijb where changed where possible +# - New package name: junkbusterng (all in lower case, acording to +# the LSB recomendation) +# - Version changed to: 2.9.13 +# - Release: 1 +# - Added: junkbuster to obsoletes and conflicts (Not sure this is +# right. If it obsoletes, why conflict ? Have to check it later) +# - Summary changed: Stefan, please check and aprove it +# - Changes description to use the new name +# - Sed string was NOT changed. Have to wait to the manpage to +# change first +# - Keeping the user junkbuster for now. It will require some aditional +# changes on the script (scheduled for the next specfile release) +# - Added post entry to move the old logfile to the new log directory +# - Removing "chkconfig --add" entry (not good to have it automaticaly +# added to the startup list). +# - Added preun section to stop the service with the old name, as well +# as remove it from the startup list +# - Removed the chkconfig --del entry from the conditional block on +# the preun scriptlet (now handled on the %files section) +# - junkbuster.init: renamed to junkbusterng.init +# - junkbusterng.init: +# - Changed JB_BIN to jbng +# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to +# be used where necessary (config dir) +# +# Aditional notes: +# - The config directory is /etc/junkbuster yet. Have to change it on the +# specfile, after it is changes on the code +# - The only files that got renamed on the cvs tree were the rh specfile and +# the init file. Some file references got changes on the makefile and on the +# rh-spec (as listed above) +# +# Revision 1.18 2002/03/21 23:00:00 swa +# want to autogenerate stuff. +# +# Revision 1.17 2002/03/19 19:30:04 morcego +# - Fixing stylesheet checking on configure. If it is found, no further checks +# should be done +# +# - configure will now check for db2html or docbook2html (should work now +# on SuSe without the docbktls package) +# +# Revision 1.16 2002/03/14 22:32:32 hal9 +# Bumped the RPM version. +# +# Revision 1.15 2002/03/08 20:00:28 swa +# some leftovers. +# +# Revision 1.14 2002/03/07 18:25:56 swa +# synced redhat and suse build process +# +# Revision 1.13 2002/03/07 17:17:56 oes +# (Hopefully) fixed for older make versions +# +# Revision 1.12 2002/03/07 15:28:27 swa +# more informative +# +# Revision 1.11 2002/03/06 14:33:18 sarantis +# Use proper temp file, not "abc". +# +# Revision 1.10 2002/03/06 14:19:35 sarantis +# Cleanup PID_FILE_PATH from redhat-dist target +# +# Revision 1.9 2002/03/05 17:31:11 morcego +# Search for docbook.dsl. Should solve portability problems for SuSe. +# +# Revision 1.8 2002/03/05 14:07:42 morcego +# configure now detects rpm topdir, and change GNUmakefile acordingly +# (based on sugestion by Sarantis Paskalis) +# +# Revision 1.7 2002/03/05 13:43:28 morcego +# Checking for text browser, so redhat-dok can work. +# +# Revision 1.6 2002/03/05 13:10:51 morcego +# Changes to implement redhat-dok (Hal Burgiss) +# Changes to make it work on other distros and out-of-the-shelf configurations +# +# Revision 1.5 2002/02/27 15:30:39 hal9 +# Reset $(RPM_PACKAGEV) to 1 (was 2) +# +# Revision 1.4 2002/01/17 21:44:04 jongfoster +# Adding urlmatch.[ch] +# +# Revision 1.3 2002/01/04 15:26:08 oes +# Added tarball-src target +# +# Revision 1.2 2001/12/30 14:07:31 steudten +# - Add signal handling (unix) +# - Add SIGHUP handler (unix) +# - Add creation of pidfile (unix) +# - Add action 'top' in rc file (RH) +# - Add entry 'SIGNALS' to manpage +# - Add exit message to logfile (unix) +# +# Revision 1.1 2001/12/01 11:22:57 jongfoster +# Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of +# make break in a more obvious way. +# Adding .PHONY section. +# +# Revision 1.40 2001/12/01 00:24:11 jongfoster +# Renaming various config files +# Fixing CR->CRLF under Win32 (I hope) +# +# Revision 1.39 2001/11/06 12:07:30 steudten +# Add --clean for building rpm in target redhat-dist. +# +# Revision 1.38 2001/11/05 21:35:23 steudten +# Complete rewrite for the 'redhat-dist' target. +# Checks for writeable RPM build directories for calling user. +# So you must not be root, just set the modes to 1777 to +# build a RH package. +# Fix the upload-target to be arch independant. +# Add target for 'solaris-dist' - coming soon. +# +# Revision 1.37 2001/11/01 00:52:04 hal9 +# Redhat-upload stuff per Stefan. +# +# Revision 1.36 2001/10/31 19:26:13 swa +# automate process of uploading new releases +# to sf. +# +# Revision 1.35 2001/10/15 22:14:59 joergs +# Removed -O2 and -Wall from AmigaOS-only CFLAGS since they are now in +# the general CFLAGS already. +# +# Revision 1.34 2001/10/15 18:28:06 steudten +# remove config.cache for target clobber. +# Cleanup make dist for RH and S.u.S.E. +# +# Revision 1.33 2001/10/10 12:43:33 oes +# Added ugly hack to make install target work at least for some setups. +# +# Revision 1.32 2001/10/09 22:38:19 jongfoster +# Correcting actionsfile filename for Win32 INI build +# +# Revision 1.31 2001/09/23 10:13:48 swa +# upload process established. run make webserver and +# the documentation is moved to the webserver. documents +# are now linked correctly. +# +# Revision 1.30 2001/09/19 17:55:49 oes +# Fixed CFLAGS +# +# Revision 1.29 2001/09/16 17:34:27 jongfoster +# Removing showargs.[ch], adding cgi(simple|edit).[ch] +# Replacing $(OBJEXT) with @OBJEXT@ - this seems to be a common source +# of build problems. +# +# Revision 1.28 2001/09/13 15:19:08 swa +# we want text files as well. +# +# Revision 1.27 2001/09/13 13:11:37 steudten +# +# Replace DEBUG_CFLAGS with OTHER_CFLAGS +# +# Revision 1.26 2001/09/12 23:44:54 david__schmidt +# Mac OSX (Darwin) support added. +# +# Revision 1.25 2001/09/12 22:55:45 joergs +# AmigaOS support added. +# +# Revision 1.24 2001/09/12 17:28:59 david__schmidt +# +# OS/2 port: update autoconf'd support for the platform. +# +# Revision 1.23 2001/09/12 16:28:42 swa +# added "make dok" section to generate html pages from +# the sgml source documents. note that the we do not want +# generated stuff in cvs. +# +# Revision 1.22 2001/09/10 16:31:23 swa +# buildroot definition in the specfile fucks up the build +# process under suse. hence I moved it to the "rpm -ta" +# command +# +# Revision 1.21 2001/09/10 11:12:49 oes +# Turning on -Wall +# +# Revision 1.20 2001/08/02 22:04:29 jongfoster +# Removing some remaining references to obsolete w32rulesdlg.[ch] +# +# Revision 1.19 2001/07/30 22:14:03 jongfoster +# Removing obsolete w32rulesdlg.c and w32rulesdlg.h +# +# Revision 1.18 2001/07/29 17:09:17 jongfoster +# Major changes to build system in order to fix these bugs: +# - pthreads under Linux was broken - changed -lpthread to -pthread +# - Compiling in MinGW32 mode under CygWin now correctly detects +# which shared libraries are available +# - Solaris support (?) (Not tested under Solaris yet) +# +# Revision 1.17 2001/07/28 16:44:54 oes +# Fixed sed LF->CRLF conversion and removed deprecated files +# +# Revision 1.16 2001/07/15 19:45:33 jongfoster +# Added support for linking with POSIX threads library +# +# Revision 1.15 2001/07/13 13:48:07 oes +# - Moved STATIC #define for pcre to (ac)config.h +# - Made -Ipcre depandant on static pcre compilation to +# avoid version conflicts +# - Included compilation and depandancies for new deanimate.c +# - Made changes to the pcre/pcreposix/pcrs build process +# as required by the new library autodetection in +# configure.in +# +# Revision 1.14 2001/07/01 16:27:44 oes +# Fixed misplaced dependancy +# +# Revision 1.13 2001/06/29 13:18:36 oes +# - added depandancy of filters.o on cgi.h +# +# Revision 1.12 2001/06/12 17:15:56 swa +# fixes, because a clean build on rh6.1 was impossible. +# GZIP confuses make, %configure confuses rpm, etc. +# +# Revision 1.11 2001/06/11 11:26:35 sarantis +# RPM version should be the same as ijbswa version. The rpm release is +# specified in the specfile. +# +# Revision 1.10 2001/06/07 17:27:45 swa +# added suse build section +# +# Revision 1.9 2001/06/04 18:31:58 swa +# files are now prefixed with either `confdir' or `logdir'. +# `make redhat-dist' replaces both entries confdir and logdir +# with redhat values +# +# Revision 1.8 2001/06/04 10:44:57 swa +# `make redhatr-dist' now works. Except for the paths +# in the config file. +# +# Revision 1.7 2001/06/03 17:09:09 swa +# swa for oes: reversed my earlier change +# +# Revision 1.6 2001/06/03 17:07:27 swa +# swa for oes +# +# Revision 1.5 2001/06/03 13:57:26 swa +# compile cgi.c (for andreas' GUI) +# +# Revision 1.4 2001/05/31 21:18:45 jongfoster +# Added files actions.[ch], actionlist.h, list.[ch] to Makefile +# +# Revision 1.3 2001/05/29 20:02:48 joergs +# Changes for AmigaOS added. +# +# Revision 1.2 2001/05/17 22:23:23 oes +# - Added auto-generation of CRLFs for Win32 config files +# - Added comment-prefix to all Win32-only options in the config file +# and provided auto stripping of this prefix for the Win32 platform by make +# +# Revision 1.1.1.1 2001/05/15 13:59:00 oes +# Initial import of version 2.9.3 source tree +# +#