X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=a122acd20893ced731253f00903fe65f12df5c82;hb=20d427754b5e0fc53a0b89e41a096c0695e0d8bc;hp=7fdd4975cfa5f4af6f7d02ff211250de2f1fbdad;hpb=5ef1357ffc5df4c7cd8e2ca8fd3f06571d2953cb;p=privoxy.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7fdd4975..a122acd2 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,9 +1,9 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.22 2002/03/24 12:56:21 swa Exp $
+# $Id: GNUmakefile.in,v 1.33 2002/03/27 03:05:35 hal9 Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
-# Privoxy team. http://ijbswa.sourceforge.net
+# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
# by and Copyright (C) 1997 Anonymous Coders and
@@ -39,7 +39,7 @@ 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 = 1
+RPM_PACKAGEV = @VERSION_RPM_PACKAGE@
#############################################################################
@@ -75,6 +75,7 @@ JADEBIN = @JADEBIN@
DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html
DB2HTML = @DB2HTML@
DKPREFIX = @DKPREFIX@
+MAN2HTML = @MAN2HTML@
# Program to do LF->CRLF
#
@@ -262,11 +263,44 @@ redhat-upload:
#############################################################################
solaris-dist:
@$(ECHO) coming soon.
+solaris-upload:
+ @$(ECHO) coming soon.
+
+#############################################################################
+# hpux distribution
+#############################################################################
+hpux-dist:
+ @$(ECHO) coming soon.
+hpux-upload:
+ @$(ECHO) coming soon.
+
+#############################################################################
+# debian distribution
+#############################################################################
+debian-dist:
+ @$(ECHO) coming soon.
+debian-upload:
+ @$(ECHO) coming soon.
+
+#############################################################################
+# macosx distribution
+#############################################################################
+macosx-dist:
+ @$(ECHO) coming soon.
+macosx-upload:
+ @$(ECHO) coming soon.
#############################################################################
-# suse distribution (need to be root to build)
+# amiga distribution
#############################################################################
+amiga-dist:
+ @$(ECHO) coming soon.
+amiga-upload:
+ @$(ECHO) coming soon.
+#############################################################################
+# suse distribution. works fine. no need to be root.
+#############################################################################
suse-dist:
for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
if [ ! -w $(RPM_BASE)/$$dir ]; then \
@@ -338,13 +372,24 @@ win-dist:
#############################################################################
# Tarball distribution
#############################################################################
-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 ../privoxy-distribution-$(VERSION).tar.gz ijb/
- chmod a+r ../../privoxy-distribution-$(VERSION).tar.gz
- @$(ECHO) Tarball with binary created.
+tarball-dist: clobber
+ $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
+ $(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS)
+ $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
+ @$(ECHO) Tarball (with any binary) 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
+ @$(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
#############################################################################
#
@@ -353,7 +398,7 @@ tarball-dist:
# converts doc/source/*.sgml into html, text and man pages
#
#############################################################################
-dok: doc/source/ldpOK.dsl
+dok: doc/source/ldpOK.dsl man2html-swa
mkdir -p doc/text doc/man
# user manual
rm -rf doc/webserver/user-manual
@@ -368,7 +413,16 @@ dok: doc/source/ldpOK.dsl
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
+man2html-swa:
+ if [ "$(MAN2HTML)" != "false" ]; then \
+ mkdir -p doc/webserver/man-page; \
+ $(ECHO) "Privoxy|Doc/Man pageNAME
" > doc/webserver/man-page/privoxy-man-page.html; \
+ man ./privoxy.1 | $(MAN2HTML) -bare \
+ >> doc/webserver/man-page/privoxy-man-page.html; \
+ $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html; \
+ fi
+
+redhat-dok: doc/source/ldpOK.dsl man2html
mkdir -p doc/text doc/man doc/source/user-manual \
doc/source/developer-manual doc/source/faq
## user manual
@@ -398,6 +452,11 @@ doc/source/ldpOK.dsl:
cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \
fi
+man2html:
+ if [ "$(MAN2HTML)" != "false" ]; then \
+ $(MAN2HTML) privoxy.1 |grep -v "^Content-type" > doc/webserver/man-page/privoxy-man-page.html; \
+ fi
+
#############################################################################
#
# Webserver
@@ -465,7 +524,7 @@ w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre
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/junkbust.ico config.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
windres -D__MINGW32__=0.2 -O coff -i $< -o $@
# AmigaOS
@@ -480,19 +539,14 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
$(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
clean:
- $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS)
+ $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster
clobber: clean
- $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` TAGS junkbuster.log privoxy.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 configure
tags: $(SRCS) $(HDRS)
etags $(SRCS) $(HDRS)
-tarball-src: clobber
- $(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
#
# FIXME: This is a dirty hack to have an install target
@@ -518,6 +572,40 @@ install: all
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.33 2002/03/27 03:05:35 hal9
+# Added man2html target for docs (redhat-dok only for now)
+#
+# Revision 1.32 2002/03/26 22:29:54 swa
+# we have a new homepage!
+#
+# Revision 1.31 2002/03/26 14:00:18 swa
+# fixed make tarball, tarball-dist, tarball-clean
+#
+# Revision 1.30 2002/03/25 12:52:25 swa
+# new targets
+#
+# Revision 1.29 2002/03/24 17:03:55 jongfoster
+# Name change
+#
+# Revision 1.28 2002/03/24 16:19:48 swa
+# configure needs to be generated.
+#
+# Revision 1.27 2002/03/24 16:13:57 swa
+# generated files are a nono in cvs
+#
+# Revision 1.26 2002/03/24 15:36:02 swa
+# did not build.
+#
+# Revision 1.25 2002/03/24 14:31:08 swa
+# remove more crappy files. set RPM
+# release version correctly.
+#
+# 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.
#