X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=8416ca7279972a1042e3b07d618853a1ee9ce38c;hp=10d57c1a12ef0e0e288e173b2e6e5ff681ac6811;hb=165f415203922006a6e6dcc7ae41d8c994a2b501;hpb=d0ce47124ab2a24290e2318f5571f0ab4fb8f81c
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 10d57c1a..8416ca72 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.86 2002/04/15 04:30:27 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.109 2002/05/28 09:16:15 oes Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
@@ -42,20 +42,26 @@ VERSION_MINOR = @VERSION_MINOR@
VERSION_POINT = @VERSION_POINT@
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 = @VERSION_RPM_PACKAGE@
+#############################################################################
+# Source directories
+#############################################################################
+DIR_PRIVOXY_ROOT := .
+DIR_PRIVOXY_SRC := $(DIR_PRIVOXY_ROOT)/src
+DIR_PRIVOXY_SRC_PCRE := $(DIR_PRIVOXY_ROOT)/pcre
+DIR_PRIVOXY_OBJ := $(DIR_PRIVOXY_ROOT)/obj
+
#############################################################################
# Directories for "make install"
#############################################################################
-DEST = @prefix@
-CONFDEST = @prefix@@sysconfdir@
-SBIN_DEST = @prefix@@sbindir@
-MAN_DEST = @prefix@@mandir@
-DOK_WEB_USEM=doc/webserver/user-manual
+DEST = @prefix@
+CONFDEST = @prefix@@sysconfdir@
+SBIN_DEST = @prefix@@sbindir@
+MAN_DEST = @prefix@@mandir@
+DOK_WEB_USEM = doc/webserver/user-manual
#############################################################################
# Build tools
@@ -65,7 +71,6 @@ PROGRAM = privoxy@EXEEXT@
CC = @CC@
ECHO = echo
GZIP_PROG = gzip
-#INSTALL = cp -f
INSTALL = @INSTALL@
INSTALL_P = -m 0750 -g @GROUP@ -o @USER@ -b
INSTALL_T = -m 0640 -g @GROUP@ -o @USER@ -b
@@ -82,13 +87,17 @@ LN = ln
WDUMP = @WDUMP@ -dump
JADECAT = @JADECAT@
JADEBIN = @JADEBIN@
-DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldpOK.dsl\#html
-DB2HTML = @DB2HTML@
-DKPREFIX = @DKPREFIX@
+# Note: Please make sure that -d ldp.dsl\#html stays the last option to
+# $(JADEBIN), because for some targets "-notoc" will be appended
+# to it (--> "ldp.dsl\#html-notoc").
+DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html
MAN2HTML = @MAN2HTML@
G2H_CMD = groff -mandoc -Thtml
TARGET_OS = @host@
PERL = perl
+DOC_DIR = doc/source
+DOC_TMP = $(DOC_DIR)/tmp
+
#User Group paras
USER = @USER@
@@ -96,7 +105,7 @@ GROUP = @GROUP@
# Program to do LF->CRLF
#
-# The sed version should be the most portable, but it doesn't for for me,
+# The sed version should be the most portable, but it doesn't work for me,
# the other two do. FIXME.
# - Jon
#DOSFILTER = $(SED) -e $$'s,$$,\r,'
@@ -132,38 +141,54 @@ DOC_FILES = AUTHORS LICENSE README ChangeLog \
# Filenames and libraries
#############################################################################
-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 \
- urlmatch.c
-
-C_OBJS = $(C_SRC:.c=.@OBJEXT@)
+C_SRC = \
+ $(DIR_PRIVOXY_SRC)/actions.c \
+ $(DIR_PRIVOXY_SRC)/cgi.c \
+ $(DIR_PRIVOXY_SRC)/cgiedit.c \
+ $(DIR_PRIVOXY_SRC)/cgisimple.c \
+ $(DIR_PRIVOXY_SRC)/deanimate.c \
+ $(DIR_PRIVOXY_SRC)/encode.c \
+ $(DIR_PRIVOXY_SRC)/errlog.c \
+ $(DIR_PRIVOXY_SRC)/filters.c \
+ $(DIR_PRIVOXY_SRC)/gateway.c \
+ $(DIR_PRIVOXY_SRC)/jbsockets.c \
+ $(DIR_PRIVOXY_SRC)/jcc.c \
+ $(DIR_PRIVOXY_SRC)/killpopup.c \
+ $(DIR_PRIVOXY_SRC)/list.c \
+ $(DIR_PRIVOXY_SRC)/loadcfg.c \
+ $(DIR_PRIVOXY_SRC)/loaders.c \
+ $(DIR_PRIVOXY_SRC)/miscutil.c \
+ $(DIR_PRIVOXY_SRC)/parsers.c \
+ $(DIR_PRIVOXY_SRC)/ssplit.c \
+ $(DIR_PRIVOXY_SRC)/urlmatch.c
+
+C_OBJS = $(C_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h
-W32_SRC = @WIN_ONLY@w32log.c w32taskbar.c win32.c
-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_SRC = @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.c $(DIR_PRIVOXY_SRC)/w32taskbar.c $(DIR_PRIVOXY_SRC)/win32.c
+W32_FILES = @WIN_ONLY@$(DIR_PRIVOXY_OBJ)/w32res.res
+W32_OBJS = @WIN_ONLY@$(W32_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) $(W32_FILES)
+W32_HDRS = @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/w32taskbar.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC)/w32res.h
W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32
W32_INIS = @WIN_ONLY@config.txt trust.txt
-PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c
-PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@)
+PCRS_SRC = @STATIC_PCRS_ONLY@$(DIR_PRIVOXY_SRC)/pcrs.c
+PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h)
-PCRE_SRC = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/pcre.c
-PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:.c=.@OBJEXT@)
-PCRE_HDRS = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h pcre/pcre.h
+PCRE_SRC = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC_PCRE)/maketables.c $(DIR_PRIVOXY_SRC_PCRE)/study.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.c
+PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@)
+PCRE_HDRS = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h
# No REGEX (maybe because dynamically linked pcreposix):
REGEX_SRC =
-@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
+@STATIC_PCRE_ONLY@REGEX_SRC = $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c
-REGEX_OBJS = $(REGEX_SRC:.c=.@OBJEXT@)
+REGEX_OBJS = $(REGEX_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=%.@OBJEXT@)
REGEX_HDRS = $(REGEX_SRC:.c=.h)
# Dependencies introduced by #include "project.h".
-PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h
+PROJECT_H_DEPS = $(DIR_PRIVOXY_SRC)/project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/pcre.h
# Socket libraries for platforms that need them explicitly defined
SOCKET_LIB = @SOCKET_LIB@
@@ -210,15 +235,21 @@ all: $(PROGRAM)
#############################################################################
.PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \
suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
-install
+install conectiva-spec conectiva-dist conectiva-upload debian-dist \
+debian-upload ensure-wdump ensure-jadebin ensure-dkprefix
#############################################################################
-# Define this explicitly because Solaris is broken!
+# Compile command
#############################################################################
-%.o: %.c
+$(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC)/%.c $(DIR_PRIVOXY_OBJ)
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+$(DIR_PRIVOXY_OBJ)/%.o: $(DIR_PRIVOXY_SRC_PCRE)/%.c $(DIR_PRIVOXY_OBJ)
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+$(DIR_PRIVOXY_OBJ):
+ mkdir obj
#############################################################################
# Win32 config files
@@ -282,26 +313,59 @@ rpm-stuff: dist-check clean clobber
fi; \
done; \
+check-release:
+ @if [ "$(RPM_PACKAGEV)" = "" ]; then \
+ echo ; \
+ echo " ERROR: NO RPM_PACKAGEV VALUE"; \
+ echo " No value given for RPM_PACKAGEV. Please use:"; \
+ echo " make dist-upload RPM_PACKAGEV=release"; \
+ echo " where \"release\" is the release number you want to and"; \
+ echo " where \"dist\" is the name of the distro (redhat or suse)"; \
+ echo ; \
+ echo " Ex: make redhat-upload RPM_PACKAGEV=1"; \
+ echo ""; \
+ echo "ATTENTION: If your distribution use a specific tag on the"; \
+ echo " release field (like \"cl\" for Conectiva, and"; \
+ echo " \"mdk\" for Mandrake), DO NOT put it on the value"; \
+ echo " given to RPM_PACKAGEV. It will be added automaticaly."; \
+ echo " Do it like you would do for a redhat package,"; \
+ echo " (i.e. just the number)."; \
+ echo ; \
+ exit 1; \
+ fi
+
+
+#############################################################################
+# Create Conectiva specfile from RedHat specfile
+#############################################################################
+conectiva-spec:
+ $(RM) privoxy-cl.spec
+ chmod a+x genclspec.sh
+ ./genclspec.sh
+
+#############################################################################
+# Conectiva distribution for x86
+#############################################################################
+conectiva-dist: rpm-stuff conectiva-spec
+
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-rh.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
+ $(RPM) --clean -ta $(TAR_ARCH)
+ if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+
+conectiva-upload: check-release
+ make redhat-upload RPM_PACKAGEV=$(RPM_PACKAGEV)cl
+
#############################################################################
# redhat distribution alpha and x86
#############################################################################
redhat-dist: rpm-stuff
- 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 ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) .
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -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:
+redhat-upload: check-release
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/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
@@ -316,22 +380,22 @@ redhat-upload:
# suse distribution. works fine. no need to be root.
#############################################################################
suse-dist: rpm-stuff
- 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 ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) .
+# 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 ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -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:
+suse-upload: check-release
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 $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm
@@ -343,24 +407,24 @@ suse-upload:
# handle with care. use with root.
suse-clean:
- 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
+ $(RPM) -e junkbuster-suse || true
+ $(RM) -r /etc/junkbuster
+ $(RM) -r /etc/rc.d/junkbuster*
+ $(RM) -r /var/run/junkbuster.pid
+ $(RM) -r /var/log/junkbuster
+ $(RM) /etc/init.d/junkbuster
+ $(RM) /usr/sbin/junkbuster
+ $(RM) /usr/sbin/rcjunkbuster
+ $(RM) /usr/share/man/man1/junkbuster.1.gz
+ $(RPM) -e privoxy-suse || true
+ $(RM) -r /etc/privoxy
+ $(RM) -r /etc/rc.d/privoxy*
+ $(RM) -r /var/run/privoxy.pid
+ $(RM) -r /var/log/privoxy
+ $(RM) /etc/init.d/privoxy
+ $(RM) /usr/sbin/privoxy
+ $(RM) /usr/sbin/rcprivoxy
+ $(RM) /usr/share/man/man1/privoxy.1.gz
#############################################################################
# generic distribution
@@ -373,14 +437,14 @@ gen-dist: dist-check
$(STRIP_PROG) $(PROGRAM)
$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
# add program
- (cd .. && $(TAR) -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
+ (cd .. && $(TAR) -cvhf --exclude "PACKAGERS" privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
# add config files
for foo in $(CONFIG_FILES); do \
- (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+ (cd .. && $(TAR) -uvhf --exclude "PACKAGERS" privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
done;
# add documentation
for foo in $(DOC_FILES); do \
- (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
+ (cd .. && $(TAR) -uvhf --exclude "PACKAGERS" privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
done;
# and zip the archive
$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
@@ -424,9 +488,16 @@ hpux-upload:
# debian distribution
#############################################################################
debian-dist:
- @$(ECHO) coming soon.
+ @$(ECHO) Creating Debian package. Will exist in parent directory.
+ dpkg-buildpackage -rfakeroot -us -uc
debian-upload:
- @$(ECHO) coming soon.
+ ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy_$(shell dpkg-parsechangelog | grep "Version" | sed "s/Version: //")_$(shell dpkg --print-architecture).deb
+ @$(ECHO) -------------------------------------------------------
+ @$(ECHO) Now goto
+ @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+ @$(ECHO) ... and release the files.
+ @$(ECHO) -------------------------------------------------------
+
#############################################################################
# macosx distribution
@@ -460,7 +531,10 @@ freebsd-clean: gen-clean
# Windows distribution
#############################################################################
win-dist:
- $(ECHO) Not implemented.
+ @$(ECHO) RTFM. You shouldn't run configure before making
+ @$(ECHO) the Windows release, so you need to start again from
+ @$(ECHO) a clean CVS export.
+ @false
#############################################################################
@@ -472,10 +546,10 @@ tarball-dist: dist-check clean clobber
$(LN) -s current ../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" \)`; do \
+ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o -name "PACKAGERS" \)`; do \
files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
done && \
- cd .. && $(TAR) cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
+ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
# and zip the archive
$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
@@ -502,45 +576,58 @@ tarball-clean:
#
#############################################################################
-# our style file
-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
+# 3 checks to make sure docs will be generated
+ensure-wdump:
+ifeq (@WDUMP@,false)
+ @$(ECHO)
+ @$(ECHO) "Cannot build docs; one of w3m, links, or lynx must be installed."
+ @$(ECHO) "You should install the appropriate package and rerun ./configure"
+ @exit 1
+endif
-# Otherwise we get plain groff conversion.
-groff2html:
- $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html
+ensure-jadebin:
+ifeq (@JADEBIN@,false)
+ @$(ECHO)
+ @$(ECHO) "Cannot build docs; one of openjade or jade must be installed"
+ @$(ECHO) "You should install the appropriate package and rerun ./configure"
+ @exit 1
+endif
+
+ensure-dkprefix:
+ifeq (@DKPREFIX@,false)
+ @$(ECHO)
+ @$(ECHO) "Cannot build docs; cannot find docbook-dsssl stylesheets"
+ @$(ECHO) "You should install the appropriate package and rerun ./configure"
+ @exit 1
+endif
# developer manual
-dok-devel: doc/source/ldpOK.dsl
- rm -f doc/webserver/developer-manual/*.html
- rm -rf doc/source/developer-manual
+dok-devel: ensure-dkprefix ensure-jadebin ensure-wdump
+ $(RM) doc/webserver/developer-manual/*.html
+ $(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 -rf tmp.html 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
# user manual
-dok-user: doc/source/ldpOK.dsl
- rm -f doc/webserver/user-manual/*.html
- rm -rf doc/source/user-manual/
+dok-user: ensure-dkprefix ensure-jadebin ensure-wdump
+ $(RM) doc/webserver/user-manual/*.html
+ $(RM) -r doc/source/user-manual/
mkdir -p doc/text doc/source/user-manual
cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. && cp user-manual/*.html ../webserver/user-manual/
- cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual
+ cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual
# faq
-dok-faq: doc/source/ldpOK.dsl
- rm -f doc/webserver/faq/*.html
- rm -rf doc/source/faq
+dok-faq: ensure-dkprefix ensure-jadebin ensure-wdump
+ $(RM) doc/webserver/faq/*.html
+ $(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 -rf tmp.html faq
+ cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) tmp.html > ../text/faq.txt && $(RM) -r tmp.html faq
# man page
-dok-man: doc/source/ldpOK.dsl
- rm -f doc/man/* doc/webserver/man-page/*.html
+dok-man:
+ $(RM) doc/man/* doc/webserver/man-page/*.html
ifneq ($(MAN2HTML),false)
$(ECHO) "Privoxy Man pageNAME
" > doc/webserver/man-page/privoxy-man-page.html
man ./privoxy.1 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html
@@ -550,30 +637,39 @@ else
endif
# readme page
-dok-readme: doc/source/ldpOK.dsl
- cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html &&\
- $(WDUMP) tmp.html > ../../README && rm -rf tmp.html
-
-# webserver files
-dok-webserver: doc/source/ldpOK.dsl
- cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html
- $(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\
+dok-readme: ensure-dkprefix ensure-jadebin ensure-wdump
+ cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
+ $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
+
+# index.sgml is used to create both the Home Page, and a local index
+# for documentation, etc.
+#
+# index.html for webserver:
+dok-webserver:
+ cd doc/source/webserver && $(DB)-notoc -ip-homepage -V nochunks index.sgml > ../../webserver/index.html
+ $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
s/<\/HEAD/\n<\/HEAD/;\
- s/<\/HEAD/\n<\/HEAD/'\
- doc/webserver/index.html && rm -f doc/source/webserver/*.bak
+ s/<\/HEAD/\n<\/HEAD/;\
+ s/\.\d\. //'\
+ doc/webserver/index.html && $(RM) doc/webserver/*.bak
+
+# privoxy-index.html for local documentation:
+dok-index:
+ cd doc/source/webserver && $(DB)-notoc -ip-index -V nochunks index.sgml > ../../webserver/privoxy-index.html
+ $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\
+ s/<\/HEAD/\n<\/HEAD/;\
+ s/<\/HEAD/\n<\/HEAD/;\
+ s/\.\d\. //'\
+ doc/webserver/privoxy-index.html && $(RM) doc/webserver/*.bak
# Main documentation target.
-dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver authors
-# kludge to force recreation on next run. Rodgrigo?
- @rm -f doc/source/ldpOK.dsl
+dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors dok-index
@$(ECHO) Documentation created.
#
# an alternative to the above dok. disabled man page creation for the moment
#
-redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver authors
-# kludge to force recreation on next run. Rodgrigo?
- @rm -f doc/source/ldpOK.dsl
+redhat-dok: dok-release dok-devel dok-user dok-faq redhat-readme dok-webserver dok-authors
@$(ECHO) Documentation created.
# For those with man2html ala RH7's.
@@ -584,30 +680,30 @@ ifneq ($(MAN2HTML),false)
$(PERL) -pi.bak -e 's///; s//man2html/' tmp.html
$(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html
# Get rid of spurious from conversion. (How to do this with perl?)
- $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.*
+ $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.*
else
$(MAKE) groff2html
endif
+# Otherwise we get plain groff conversion.
+groff2html:
+ $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html
+
## Make README
-redhat-readme: doc/source/ldpOK.dsl
+redhat-readme: ensure-dkprefix ensure-jadebin ensure-wdump
cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \
- tmp.html > ../../README && rm -rf tmp.html
- # kludge to force recreation on next run. Rodgrigo?
- @rm -f doc/source/ldpOK.dsl
+ tmp.html > ../../README && $(RM) -r tmp.html
## Make AUTHORS file
-authors: doc/source/ldpOK.dsl
+dok-authors: ensure-dkprefix ensure-jadebin ensure-wdump
cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
- tmp.html > ../../AUTHORS && rm -f tmp.html
- # kludge to force recreation on next run. Rodgrigo?
- @rm -f doc/source/ldpOK.dsl
+ tmp.html > ../../AUTHORS && $(RM) tmp.html
# make a man page, and then (lousy) HTML version.
# Requires docbook2man (short perl script), see comments
# in privoxy-man-page.sgml. This target is not invoked from other dok targets.
# It is built separately due to dependencies on perl scripts.
-man: doc/source/ldpOK.dsl
+man:
mkdir -p doc/source/man
cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\
perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1
@@ -616,8 +712,6 @@ man: doc/source/ldpOK.dsl
# This html is not used. See make man2html.
mv -f doc/source/man/privoxy.1 privoxy.1
$(MAKE) man2html
- # kludge to force recreation on next run. Rodgrigo?
- @rm -fr doc/source/ldpOK.dsl doc/source/man
# Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content
# exceptions accordingly. This needs to go before any doc building (doh).
@@ -626,28 +720,48 @@ dok-release:
@$(PERL) -pi.bak -e 's///;\
s///' \
doc/source/*sgml doc/source/*/*sgml
- rm -fr doc/source/*bak doc/source/*/*bak
+ $(RM) -r doc/source/*bak doc/source/*/*bak
ifeq ($(CODE_STATUS),stable)
@$(ECHO) Setting docs to stable $(VERSION)
@$(PERL) -pi.bak -e 's///;\
s///' \
doc/source/*sgml doc/source/*/*sgml
- rm -fr doc/source/*bak doc/source/*/*bak
+ $(RM) -r doc/source/*bak doc/source/*/*bak
else
@$(ECHO) Setting docs to not stable $(VERSION)
@$(PERL) -pi.bak -e 's///;\
s///' \
doc/source/*sgml doc/source/*/*sgml
- rm -fr doc/source/*bak doc/source/*/*bak
+ $(RM) -r doc/source/*bak doc/source/*/*bak
endif
-dok-pdf: doc/source/ldpOK.dsl dok-release
- cp doc/source/*.sgml doc/pdf
- cp doc/source/*.dsl doc/pdf
- cd doc/pdf && db2pdf --pdf -s ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf
- cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf
- cd doc/pdf && db2pdf --pdf -s ldpOK.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf
- rm -f doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux
+dok-pdf: dok-release
+ $(RM) doc/pdf/*.pdf
+ cp -f doc/source/*.sgml doc/pdf
+ cp -f doc/source/*.dsl doc/pdf
+ cd doc/pdf && db2pdf --pdf -s ldp.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldp.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldp.dsl faq.sgml && mv faq.pdf privoxy-faq.pdf > /dev/null 2>&1
+ $(RM) doc/pdf/*.sgml doc/pdf/*.dsl doc/pdf/*.out doc/pdf/*.tex doc/pdf/*.log doc/pdf/*.aux
+
+# the layout and style with db2pdf sucks, here is an alternative
+dok-pdf2: dok-release
+ mkdir -p doc/source/temp # this directory not in cvs
+ cd doc/source && $(DB) -V nochunks user-manual.sgml > temp/privoxy-user-manual.html
+ cd doc/source && $(DB) -V nochunks developer-manual.sgml > temp/privoxy-developer-manual.html
+ cd doc/source && $(DB) -V nochunks faq.sgml > temp/privoxy-faq.html
+# one could use html2ps and ps2pdf. well, that does not work. htmlps produces incorrect output.
+
+# Create release announcement in text and html, with short and long versions.
+# This is a standalone target, and must be invoked directly.
+announce: dok-release
+ mkdir -p $(DOC_TMP)
+ cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
+ mv -f index.html announce.html && $(WDUMP) announce.html > announce.txt
+ cd $(DOC_TMP) && $(DB) announce.sgml &&\
+ mv -f index.html announce-mini.html && $(WDUMP) announce-mini.html > announce-mini.txt &&\
+ mv -f *html *txt ../../..
+ rm -fr $(DOC_TMP)
#############################################################################
#
@@ -688,61 +802,70 @@ web-actions: tidy
# Source file dependencies
#############################################################################
-actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.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
-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
-errlog.@OBJEXT@: errlog.c errlog.h config.h $(PROJECT_H_DEPS) @WIN_ONLY@w32log.h
-filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h ssplit.h cgi.h deanimate.h @WIN_ONLY@win32.h
-gateway.@OBJEXT@: gateway.c gateway.h config.h $(PROJECT_H_DEPS) errlog.h jbsockets.h jcc.h loadcfg.h
-jbsockets.@OBJEXT@: jbsockets.c jbsockets.h config.h $(PROJECT_H_DEPS) filters.h
-jcc.@OBJEXT@: jcc.c jcc.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h killpopup.h loadcfg.h loaders.h miscutil.h parsers.h @WIN_ONLY@w32log.h win32.h cgi.h
-killpopup.@OBJEXT@: killpopup.c killpopup.h config.h $(PROJECT_H_DEPS) jcc.h loadcfg.h
-list.@OBJEXT@: list.c list.h config.h $(PROJECT_H_DEPS) list.h miscutil.h
-loadcfg.@OBJEXT@: loadcfg.c loadcfg.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h jcc.h killpopup.h loaders.h miscutil.h parsers.h @WIN_ONLY@w32log.h win32.h
-loaders.@OBJEXT@: loaders.c loaders.h config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h gateway.h jcc.h loadcfg.h miscutil.h parsers.h ssplit.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
+$(DIR_PRIVOXY_OBJ)/actions.@OBJEXT@: $(DIR_PRIVOXY_SRC)/actions.c $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/actionlist.h
+$(DIR_PRIVOXY_OBJ)/cgi.@OBJEXT@: $(DIR_PRIVOXY_SRC)/cgi.c $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/cgiedit.h $(DIR_PRIVOXY_SRC)/cgisimple.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h
+$(DIR_PRIVOXY_OBJ)/cgiedit.@OBJEXT@: $(DIR_PRIVOXY_SRC)/cgiedit.c $(DIR_PRIVOXY_SRC)/cgiedit.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h
+$(DIR_PRIVOXY_OBJ)/cgisimple.@OBJEXT@: $(DIR_PRIVOXY_SRC)/cgisimple.c $(DIR_PRIVOXY_SRC)/cgisimple.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/pcrs.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/actions.h $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h
+$(DIR_PRIVOXY_OBJ)/deanimate.@OBJEXT@: $(DIR_PRIVOXY_SRC)/deanimate.c $(DIR_PRIVOXY_SRC)/deanimate.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS)
+$(DIR_PRIVOXY_OBJ)/encode.@OBJEXT@: $(DIR_PRIVOXY_SRC)/encode.c $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/config.h
+$(DIR_PRIVOXY_OBJ)/errlog.@OBJEXT@: $(DIR_PRIVOXY_SRC)/errlog.c $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h
+$(DIR_PRIVOXY_OBJ)/filters.@OBJEXT@: $(DIR_PRIVOXY_SRC)/filters.c $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/parsers.h $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/cgi.h $(DIR_PRIVOXY_SRC)/deanimate.h @WIN_ONLY@$(DIR_PRIVOXY_SRC)/win32.h
+$(DIR_PRIVOXY_OBJ)/gateway.@OBJEXT@: $(DIR_PRIVOXY_SRC)/gateway.c $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h
+$(DIR_PRIVOXY_OBJ)/jbsockets.@OBJEXT@: $(DIR_PRIVOXY_SRC)/jbsockets.c $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/filters.h
+$(DIR_PRIVOXY_OBJ)/jcc.@OBJEXT@: $(DIR_PRIVOXY_SRC)/jcc.c $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/killpopup.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/parsers.h @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.h $(DIR_PRIVOXY_SRC)/cgi.h
+$(DIR_PRIVOXY_OBJ)/killpopup.@OBJEXT@: $(DIR_PRIVOXY_SRC)/killpopup.c $(DIR_PRIVOXY_SRC)/killpopup.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h
+$(DIR_PRIVOXY_OBJ)/list.@OBJEXT@: $(DIR_PRIVOXY_SRC)/list.c $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/list.h $(DIR_PRIVOXY_SRC)/miscutil.h
+$(DIR_PRIVOXY_OBJ)/loadcfg.@OBJEXT@: $(DIR_PRIVOXY_SRC)/loadcfg.c $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/killpopup.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/parsers.h @WIN_ONLY@$(DIR_PRIVOXY_SRC)/w32log.h $(DIR_PRIVOXY_SRC)/win32.h
+$(DIR_PRIVOXY_OBJ)/loaders.@OBJEXT@: $(DIR_PRIVOXY_SRC)/loaders.c $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/gateway.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/parsers.h $(DIR_PRIVOXY_SRC)/ssplit.h
+$(DIR_PRIVOXY_OBJ)/miscutil.@OBJEXT@: $(DIR_PRIVOXY_SRC)/miscutil.c $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/config.h
+$(DIR_PRIVOXY_OBJ)/parsers.@OBJEXT@: $(DIR_PRIVOXY_SRC)/parsers.c $(DIR_PRIVOXY_SRC)/parsers.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/encode.h $(DIR_PRIVOXY_SRC)/filters.h $(DIR_PRIVOXY_SRC)/jbsockets.h $(DIR_PRIVOXY_SRC)/jcc.h $(DIR_PRIVOXY_SRC)/loadcfg.h $(DIR_PRIVOXY_SRC)/loaders.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/ssplit.h
+$(DIR_PRIVOXY_OBJ)/ssplit.@OBJEXT@: $(DIR_PRIVOXY_SRC)/ssplit.c $(DIR_PRIVOXY_SRC)/ssplit.h $(DIR_PRIVOXY_SRC)/config.h $(DIR_PRIVOXY_SRC)/miscutil.h
+$(DIR_PRIVOXY_OBJ)/urlmatch.@OBJEXT@: $(DIR_PRIVOXY_SRC)/urlmatch.c $(DIR_PRIVOXY_SRC)/urlmatch.h $(DIR_PRIVOXY_SRC)/config.h $(PROJECT_H_DEPS) $(DIR_PRIVOXY_SRC)/errlog.h $(DIR_PRIVOXY_SRC)/miscutil.h $(DIR_PRIVOXY_SRC)/ssplit.h
# PCRS
-pcrs.@OBJEXT@: pcrs.c pcre/pcre.h pcrs.h
+$(DIR_PRIVOXY_OBJ)/pcrs.@OBJEXT@: $(DIR_PRIVOXY_SRC)/pcrs.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC)/pcrs.h
# PCRE
-pcre/get.@OBJEXT@: pcre/get.c pcre/config.h pcre/internal.h pcre/pcre.h
-pcre/maketables.@OBJEXT@: pcre/maketables.c pcre/config.h pcre/internal.h pcre/pcre.h
-pcre/pcre.@OBJEXT@: pcre/pcre.c pcre/config.h pcre/internal.h pcre/pcre.h pcre/chartables.c
-pcre/pcreposix.@OBJEXT@: pcre/pcreposix.c pcre/config.h pcre/internal.h pcre/pcre.h pcre/pcreposix.h
-pcre/study.@OBJEXT@: pcre/study.c pcre/config.h pcre/internal.h pcre/pcre.h
+$(DIR_PRIVOXY_OBJ)/get.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h
+$(DIR_PRIVOXY_OBJ)/maketables.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/maketables.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h
+$(DIR_PRIVOXY_OBJ)/pcre.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/pcre.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c
+$(DIR_PRIVOXY_OBJ)/pcreposix.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h
+$(DIR_PRIVOXY_OBJ)/study.@OBJEXT@: $(DIR_PRIVOXY_SRC_PCRE)/study.c $(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h
# An auxiliary program makes the PCRE default character table source
-pcre/chartables.c: pcre/dftables@EXEEXT@
- pcre/dftables@EXEEXT@ >pcre/chartables.c
+$(DIR_PRIVOXY_SRC_PCRE)/chartables.c: $(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@
+ $(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@ >$(DIR_PRIVOXY_SRC_PCRE)/chartables.c
-pcre/dftables@EXEEXT@: pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal.h pcre/config.h
- $(CC) -o pcre/dftables@EXEEXT@ $(CFLAGS) pcre/dftables.c
+$(DIR_PRIVOXY_OBJ)/dftables@EXEEXT@: $(DIR_PRIVOXY_SRC_PCRE)/dftables.c $(DIR_PRIVOXY_SRC_PCRE)/maketables.c $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/config.h
+ $(CC) -o $(DIR_PRIVOXY_SRC_PCRE)/dftables@EXEEXT@ $(CFLAGS) $(DIR_PRIVOXY_SRC_PCRE)/dftables.c
# Win32
-w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h
-w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h
-win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h win32.h
-
-w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ico icons/ico00004.ico icons/ico00005.ico icons/ico00006.ico icons/ico00007.ico icons/ico00008.ico icons/idle.ico icons/privoxy.ico config.h
+$(DIR_PRIVOXY_OBJ)/w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h
+$(DIR_PRIVOXY_OBJ)/w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h
+$(DIR_PRIVOXY_OBJ)/win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.h pcrs.h project.h w32log.h win32.h
+
+$(DIR_PRIVOXY_OBJ)/w32res.res: $(DIR_PRIVOXY_SRC)/w32res.rc \
+ $(DIR_PRIVOXY_SRC)/w32res.h \
+ $(DIR_PRIVOXY_SRC)/config.h \
+ $(DIR_PRIVOXY_SRC)/icons/ico00001.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00002.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00003.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00004.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00005.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00006.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00007.ico \
+ $(DIR_PRIVOXY_SRC)/icons/ico00008.ico \
+ $(DIR_PRIVOXY_SRC)/icons/idle.ico \
+ $(DIR_PRIVOXY_SRC)/icons/privoxy.ico
windres -D__MINGW32__=0.2 -O coff -i $< -o $@
# AmigaOS
-@AMIGAOS_ONLY@OBJS += amiga.o
+@AMIGAOS_ONLY@OBJS += $(DIR_PRIVOXY_OBJ)/amiga.@OBJEXT@
@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@amiga.o: amiga.c amiga.h config.h
+$(DIR_PRIVOXY_OBJ)/amiga.@OBJEXT@: $(DIR_PRIVOXY_SRC)/amiga.c $(DIR_PRIVOXY_SRC)/amiga.h $(DIR_PRIVOXY_SRC)/config.h
$(PROGRAM): $(OBJS) $(W32_FILES)
@@ -757,7 +880,9 @@ tidy:
$(RM) `find . -name ".\#*"`
clobber: tidy
- $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar
+ $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
+ privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl
+
#
# FIXME: What is all this?
#
@@ -787,6 +912,12 @@ install: all
# FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz
$(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy
+coffee:
+ @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\
+ 239,78,241,110,234,1,28,160,171,152,208,53,26,117,247,22,165,73,137,125,9,1,62,126,2,128,169,5,243,143,\
+ 13,139,49,164,65,100,149,152,102,73,141,88,73,178,116,205,100,69,253,36,102,81,49,83,236,19,225,171,131,\
+ 214,172,163,73,4,168,123,115,71,126,247,122,94,128,178,227,95,154,12,86,215,122,197,249,146,187,54,220,125,\
+ 193,51,228,11,1,0,0);'|zcat
#############################################################################
@@ -795,6 +926,92 @@ install: all
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.109 2002/05/28 09:16:15 oes
+# Added comment for -notoc kludge
+#
+# Revision 1.108 2002/05/28 03:56:08 hal9
+# make dok-index target for privoxy-index.html. Fix *bak dead soldiers in
+# doc/webserver.
+#
+# Revision 1.107 2002/05/27 23:26:33 mal0rd
+# Made doc-generation configuration automatic.
+# References to DB2HTML were removed, not used.
+# --with-docbook now only needed if in odd path.
+#
+# Revision 1.106 2002/05/26 04:55:11 mal0rd
+# Added debian-dist and debian-upload targets. Also documented usage.
+#
+# Revision 1.105 2002/05/25 22:48:19 hal9
+# Add -notoc to README build (per oes's dsl magic).
+#
+# Revision 1.104 2002/05/24 00:03:49 oes
+# Use p_doc.css for the Homepage for consistency
+#
+# Revision 1.103 2002/05/23 23:19:00 oes
+# Use dsl without TOC for the homepage
+#
+# Revision 1.102 2002/05/16 01:20:17 hal9
+# make announce target added.
+#
+# Revision 1.101 2002/05/15 12:28:46 oes
+# Trying to keep Hal happy :)
+#
+# Revision 1.100 2002/05/08 13:48:18 hal9
+# Ooops, that trashed JB v2.0.2 comment. Fixed.
+#
+# Revision 1.99 2002/05/08 13:42:07 hal9
+# This fixes the numbering problem on index.html in contact info section (.1.). Using
+# perl, since its way too convoluted to try to fix proper with docbook.
+#
+# Revision 1.98 2002/05/03 14:33:06 oes
+# Replaced ldp(OK).dsl handling with generation via autoconf; handle all file exeptions to src tarball via find
+#
+# Revision 1.97 2002/04/27 20:27:43 swa
+# no longer needed due to new
+# PACKAGE_VERSION process
+#
+# Revision 1.96 2002/04/27 17:44:32 morcego
+# - Correcting typo in my name (Rodrigo, not Rodgrigo) :-)
+# - Using the RM macro everywhere rm is called (either we use, or don't)
+# - Same for RPM
+#
+# Revision 1.95 2002/04/27 15:37:25 swa
+# replacing directory in document creation process
+# no longer necessary.
+#
+# Revision 1.94 2002/04/27 08:23:29 swa
+# pdf process reviewed and cleaned up
+#
+# Revision 1.93 2002/04/27 04:55:53 morcego
+# privoxy-cl.spec now gets removed by clobber target
+#
+# Revision 1.92 2002/04/27 04:53:40 morcego
+# Adding --exclude "PACKAGERS" to every tar command that applies (not for
+# webserver target)
+#
+# Revision 1.91 2002/04/27 04:44:51 morcego
+# GNUmakefile.in: The tarball created on redhat-dist and suse-dist now ignore
+# the PACKAGERS file, as well privoxy-cl.spec (in case it was created)
+# GNUmakefile.in: New targets -> conectiva-spec, conectiva-dist and
+# conectiva-upload
+# genclspec.sh : New file to generate, from privoxy-rh.spec, a specfile
+# for Conectiva Linux
+#
+# Revision 1.90 2002/04/26 17:46:53 swa
+# be consistent
+#
+# Revision 1.89 2002/04/26 17:20:54 swa
+# just produce single html files to proces them later with Destiller or somesuch. looks prettier.
+#
+# Revision 1.88 2002/04/25 19:13:57 morcego
+# Removed RPM release number declaration on configure.in
+# Changed makefile to use given value for RPM_PACKAGEV when on uploading
+# targets (will produce an error, explaining who to do it, if no value
+# if provided).
+#
+# Revision 1.87 2002/04/23 14:10:59 swa
+# now create pdf documents
+#
# Revision 1.86 2002/04/15 04:30:27 hal9
# Missed two -pi.bak's on perl/cygwin problem.
#