X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=GNUmakefile.in;h=10d57c1a12ef0e0e288e173b2e6e5ff681ac6811;hb=4759fd3d2ee5758c45be960b1dadc71e2e16a555;hp=125f1176ef60a010fc67ecf3e2c59add32a80f56;hpb=124faa851169a2bee6955bfb92bbb6707d8eef67;p=privoxy.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 125f1176..10d57c1a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.74 2002/04/08 15:22:44 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.86 2002/04/15 04:30:27 hal9 Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
@@ -82,7 +82,7 @@ LN = ln
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@
@@ -123,7 +123,10 @@ CONFIG_FILES = config trust \
`find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"`
DOC_FILES = AUTHORS LICENSE README ChangeLog \
- `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` privoxy.1
+ `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \
+ `find doc/webserver/ -name "*.html"` \
+ `find doc/webserver/ -name "*.css"` \
+ privoxy.1
#############################################################################
# Filenames and libraries
@@ -260,7 +263,7 @@ dist-check:
$(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;
@@ -293,7 +296,7 @@ redhat-dist: rpm-stuff
exit 1;\
fi
- $(TAR) --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) .
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) .
$(RPM) --clean -ta $(TAR_ARCH)
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
@@ -323,7 +326,7 @@ suse-dist: rpm-stuff
exit 1;\
fi
- $(TAR) --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) .
+ $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" -czf $(TAR_ARCH) .
$(RPM) --clean -ta $(TAR_ARCH)
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
@@ -461,50 +464,35 @@ win-dist:
#############################################################################
-# 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 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
#############################################################################
#
@@ -569,13 +557,12 @@ dok-readme: doc/source/ldpOK.dsl
# 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<\/HEAD/;\
s/<\/HEAD/\n<\/HEAD/'\
- doc/webserver/index.html
+ doc/webserver/index.html && rm -f doc/source/webserver/*.bak
-# Removed dok-man 04/08/02, hal. Added authors and dok-release. And
-# dok-webserver!
+# 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
@@ -594,10 +581,10 @@ man2html:
mkdir -p doc/webserver/man-page
ifneq ($(MAN2HTML),false)
$(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html
- $(PERL) -pi -e 's///; s//man2html/' tmp.html
- $(PERL) -pi -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html
-# Get rid of spurious from converion. (How to do this with perl?)
- $(SED) -e 's///g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && rm -f tmp.html
+ $(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.*
else
$(MAKE) groff2html
endif
@@ -617,14 +604,13 @@ authors: doc/source/ldpOK.dsl
@rm -f 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/ //; s/\[ /\[/g' privoxy.1
+ perl -pi.bak -e 's/ //; 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.
@@ -635,23 +621,34 @@ man: doc/source/ldpOK.dsl
# 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///;\
+ @$(PERL) -pi.bak -e 's///;\
s///' \
doc/source/*sgml doc/source/*/*sgml
+ rm -fr doc/source/*bak doc/source/*/*bak
ifeq ($(CODE_STATUS),stable)
@$(ECHO) Setting docs to stable $(VERSION)
- @$(PERL) -pi -e 's///;\
+ @$(PERL) -pi.bak -e 's///;\
s///' \
doc/source/*sgml doc/source/*/*sgml
+ rm -fr doc/source/*bak doc/source/*/*bak
else
@$(ECHO) Setting docs to not stable $(VERSION)
- @$(PERL) -pi -e 's///;\
+ @$(PERL) -pi.bak -e 's///;\
s///' \
doc/source/*sgml doc/source/*/*sgml
+ rm -fr 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
+
#############################################################################
#
# Webserver
@@ -669,12 +666,13 @@ webserver: tidy
@$(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
@@ -683,7 +681,7 @@ web-actions: tidy
$(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xvm'
@$(ECHO) Fixing permissions
- @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/* -type f | xargs chmod 664 2>/dev/null'
+ @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/ -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'
#############################################################################
@@ -754,7 +752,9 @@ clean:
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -name TAGS -o -name tags`
tidy:
- $(RM) `find . -name "*~" -o -name "#*#"`
+ $(RM) `find . -name "*~"`
+# $(RM) `find . -name "#*#"` # what is this for??
+ $(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
@@ -795,6 +795,43 @@ install: all
## end:
# $Log: GNUmakefile.in,v $
+# 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
+#
+# Revision 1.76 2002/04/08 22:43:41 oes
+# Fix: Include dotfiles in fixing webserver permissions
+#
+# Revision 1.75 2002/04/08 22:14:59 oes
+# Silencing tar warnings in the web* targets
+#
# Revision 1.74 2002/04/08 15:22:44 hal9
# This has finishing touches for dok building. Should be ready to go.
# -The main doc build is now 'make dok', should work on Redhat too.