# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.77 2002/04/09 13:28:53 swa Exp $
+# $Id: GNUmakefile.in,v 1.96 2002/04/27 17:44:32 morcego Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
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@
#############################################################################
WDUMP = @WDUMP@ -dump
JADECAT = @JADECAT@
JADEBIN = @JADEBIN@
-DB = $(JADEBIN) $(JADECAT) -t sgml -ihtml -D.. -d ldpOK.dsl\#html
+DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldpOK.dsl\#html
DB2HTML = @DB2HTML@
DKPREFIX = @DKPREFIX@
MAN2HTML = @MAN2HTML@
#############################################################################
.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
#############################################################################
$(ECHO) "*** ***"; \
$(ECHO) "***************************************************"; \
$(ECHO) "Type \"yes i am sure\" if you are sure that you"; \
- $(ECHO) -n "want to continue: "; \
+ $(ECHO) -n "really want to proceed: "; \
read answer; \
if [ "$$answer" != "yes i am sure" ]; then exit 1; fi \
fi;
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
# 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
# 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
$(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)
#############################################################################
-# Tarball distribution. Only source files. No binaries.
+# Tarball distribution: No CVS dirs, dotfiles, debian build dir,
+# (FIXME:) only parts of the static / generated docs mix in doc/webserver
#############################################################################
-MISC_FILES = install-sh config.sub configure.in GNUmakefile.in config.h.in config.guess privoxy*
-
-tarball-dist: dist-check
+tarball-dist: dist-check clean clobber
$(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
-# add source files
- for foo in `find . -name "*.c"`; do \
- (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
- done;
-# add header files
- for foo in `find . -name "*.h"`; do \
- (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
- done;
-# 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;) \
- done;
-# add misc files
- for foo in $(MISC_FILES); do \
- (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
- done;
-# add documentation
- for foo in $(DOC_FILES); do \
- (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
- done;
+
+ for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
+ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" \)`; do \
+ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
+ done && \
+ cd .. && $(TAR) -cvhf --exclude "PACKAGERS" privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
+
# and zip the archive
- $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
+ $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
$(GZIP_PROG) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar
@$(ECHO) Tarball distribution created.
# anonymously ncftps the tarball to sourceforge
tarball-upload:
- ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
+ ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
@$(ECHO) -------------------------------------------------------
@$(ECHO) Now goto
@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
@$(ECHO) ... and release the files.
@$(ECHO) -------------------------------------------------------
-# handle with care
tarball-clean:
- $(RM) privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
+ $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz
#############################################################################
#
#
#############################################################################
+# now works for swa
# 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
+# 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
+ cp doc/source/ldp.dsl doc/source/ldpOK.dsl;
# Otherwise we get plain groff conversion.
groff2html:
# developer manual
dok-devel: doc/source/ldpOK.dsl
- rm -f doc/webserver/developer-manual/*.html
- rm -rf doc/source/developer-manual
+ $(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/
+ $(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
+ $(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
+ $(RM) doc/man/* doc/webserver/man-page/*.html
ifneq ($(MAN2HTML),false)
$(ECHO) "<html><head><title>Privoxy Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html
man ./privoxy.1 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html
# 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
+ $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html
# webserver files
dok-webserver: doc/source/ldpOK.dsl
cd doc/source/webserver && $(DB) -V nochunks index.sgml > ../../webserver/index.html
- $(PERL) -pi -e 's/..\/p_doc.css/p_web.css/;\
+ $(PERL) -pi.bak -e 's/..\/p_doc.css/p_web.css/;\
s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps consumers reduce unwanted junk email and protect their privacy from direct marketing companies.\"><\/HEAD/;\
s/<\/HEAD/\n<meta name="MSSmartTagsPreventParsing" content="TRUE"><\/HEAD/'\
- doc/webserver/index.html
+ doc/webserver/index.html && $(RM) doc/source/webserver/*.bak
-# Removed dok-man 04/08/02, hal. Added authors and dok-release. And
-# dok-webserver!
-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
+# Main documentation target.
+dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors
+# kludge to force recreation on next run. Rodrigo? -swa
+# I see no need for it, but no problem either. Let it stay. -morcego
+ @$(RM) doc/source/ldpOK.dsl
@$(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
+# kludge to force recreation on next run. Rodrigo? -swa
+# I see no need for it, but no problem either. Let it stay. -morcego
+ @$(RM) doc/source/ldpOK.dsl
@$(ECHO) Documentation created.
# For those with man2html ala RH7's.
mkdir -p doc/webserver/man-page
ifneq ($(MAN2HTML),false)
$(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html
- $(PERL) -pi -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
- $(PERL) -pi -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/HEAD>/' tmp.html
-# Get rid of spurious \a from converion. (How to do this with perl?)
- $(SED) -e 's/\a//g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.html
+ $(PERL) -pi.bak -e 's/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
+ $(PERL) -pi.bak -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/HEAD>/' tmp.html
+# Get rid of spurious \a from conversion. (How to do this with perl?)
+ $(SED) -e 's/\a//g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.*
else
$(MAKE) groff2html
endif
## Make README
redhat-readme: doc/source/ldpOK.dsl
cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \
- tmp.html > ../../README && rm -rf tmp.html
+ tmp.html > ../../README && $(RM) -r tmp.html
# kludge to force recreation on next run. Rodgrigo?
- @rm -f doc/source/ldpOK.dsl
+ @$(RM) doc/source/ldpOK.dsl
## Make AUTHORS file
-authors: doc/source/ldpOK.dsl
+dok-authors: doc/source/ldpOK.dsl
cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \
- tmp.html > ../../AUTHORS && rm -f tmp.html
+ tmp.html > ../../AUTHORS && $(RM) tmp.html
# kludge to force recreation on next run. Rodgrigo?
- @rm -f doc/source/ldpOK.dsl
+ @$(RM) doc/source/ldpOK.dsl
# make a man page, and then (lousy) HTML version.
-# Requires docbook2man (short perl script), see CVS
-# http://sources.redhat.com/docbook-tools/. Also requires openjade and SGMLSpm
-# perl module. This target is not invoked from other dok targets. It is
-# built separately due to dependencies on perl scripts.
+# 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
mkdir -p doc/source/man
cd doc/source/man && docbook2man ../privoxy-man-page.sgml &&\
- perl -pi -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.1
+ perl -pi.bak -e 's/ <URL:.*>//; s/\[ /\[/g' privoxy.1
cd doc/source/man && $(DB) ../privoxy-man-page.sgml &&\
mv -f index.html privoxy-man-page.html
# 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
+ @$(RM) -r 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).
-make dok-release:
+dok-release:
@$(ECHO) Setting doc version and status to $(VERSION), $(CODE_STATUS)
- @$(PERL) -pi -e 's/<!entity +p-version.*>/<!entity p-version "$(VERSION)">/;\
+ @$(PERL) -pi.bak -e 's/<!entity +p-version.*>/<!entity p-version "$(VERSION)">/;\
s/<!entity +p-status.*>/<!entity p-status "$(CODE_STATUS)">/' \
doc/source/*sgml doc/source/*/*sgml
+ $(RM) -r doc/source/*bak doc/source/*/*bak
ifeq ($(CODE_STATUS),stable)
@$(ECHO) Setting docs to stable $(VERSION)
- @$(PERL) -pi -e 's/<!entity +% +p-stable.*>/<!entity % p-stable "INCLUDE">/;\
+ @$(PERL) -pi.bak -e 's/<!entity +% +p-stable.*>/<!entity % p-stable "INCLUDE">/;\
s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "IGNORE">/' \
doc/source/*sgml doc/source/*/*sgml
+ $(RM) -r doc/source/*bak doc/source/*/*bak
else
@$(ECHO) Setting docs to not stable $(VERSION)
- @$(PERL) -pi -e 's/<!entity +% +p-stable.*>/<!entity % p-stable "IGNORE">/;\
+ @$(PERL) -pi.bak -e 's/<!entity +% +p-stable.*>/<!entity % p-stable "IGNORE">/;\
s/<!entity +% +p-not-stable.*>/<!entity % p-not-stable "INCLUDE">/' \
doc/source/*sgml doc/source/*/*sgml
+ $(RM) -r doc/source/*bak doc/source/*/*bak
endif
+dok-pdf: doc/source/ldpOK.dsl 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 ldpOK.dsl user-manual.sgml && mv user-manual.pdf privoxy-user-manual.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldpOK.dsl developer-manual.sgml && mv developer-manual.pdf privoxy-developer-manual.pdf > /dev/null 2>&1
+ cd doc/pdf && db2pdf --pdf -s ldpOK.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
+ # kludge to force recreation on next run. Rodgrigo?
+ @$(RM) doc/source/ldpOK.dsl
+
+# the layout and style with db2pdf sucks, here is an alternative
+dok-pdf2: doc/source/ldpOK.dsl 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.
+ # kludge to force recreation on next run. Rodgrigo?
+ @$(RM) doc/source/ldpOK.dsl
+
#############################################################################
#
# Webserver
@$(ECHO) Uploading
@cd doc/webserver; \
upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
- $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm'
+ $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xvm 2>&1 | grep -v timestamp'
@$(ECHO) Fixing permissions
- @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type d | xargs chmod 775 2>/dev/null'
- @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null'
- @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null'
+ @ssh ijbswa.sourceforge.net 'chmod -R 775 /home/groups/i/ij/ijbswa/htdocs 2>/dev/null; true'
+ @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/ -type f | xargs chmod 664 2>/dev/null; true'
+ @ssh ijbswa.sourceforge.net 'chmod 666 /home/groups/i/ij/ijbswa/htdocs/actions/results/actions-feedback.txt 2>/dev/null; true'
+
web-actions: tidy
@$(ECHO) Uploading
$(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/ldpOK.dsl
+
#
# FIXME: What is all this?
#
## end:
# $Log: GNUmakefile.in,v $
+# 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.
+#
+# Revision 1.85 2002/04/14 01:05:34 hal9
+# Revert dok-webserver change for SF logo.
+#
+# Revision 1.84 2002/04/13 22:43:25 hal9
+# -Fix dok-webserver for SF logo (more perl).
+# -Change all perl -pi to perl -pi.bak for Cygwin problem.
+#
+# Revision 1.83 2002/04/12 09:39:25 oes
+# Excluding yet more files from tarball; making dist warning yet more scary
+#
+# Revision 1.82 2002/04/11 21:07:11 oes
+# Excluding more files from tarball build
+#
+# Revision 1.81 2002/04/11 14:40:27 oes
+# Fixed typo -- Thanks, Moritz!
+#
+# Revision 1.80 2002/04/11 12:50:00 oes
+# Fixed tarball-dist target
+#
+# Revision 1.79 2002/04/11 06:49:28 oes
+# webserver target: silenced timestamp warnings resulting from uploading westwards, made permissions fixing independant of screwed local dir permissions, suppress (false alarm) make error if not owner of feedback log
+#
+# Revision 1.78 2002/04/09 13:37:11 sarantis
+# fix tar options typo
+#
# Revision 1.77 2002/04/09 13:28:53 swa
# build suse and gen-dist with html docs
#