X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=1e697f26375b371882139cbc2fdb49512e918f84;hb=fa2f0adbc60adbb4733d47efadbab3058432fa49;hp=c3c74c67b1ee06f9c48fab3b99c687d8daff2964;hpb=748426a4caffa25e94f84757bbdeaf0a52f791fe;p=privoxy.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c3c74c67..1e697f26 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,9 +1,9 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.25 2002/03/24 14:31:08 swa Exp $
+# $Id: GNUmakefile.in,v 1.31 2002/03/26 14:00:18 swa 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 
@@ -262,11 +262,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. 
 
 #############################################################################
-# suse distribution (need to be root to build)
+# debian distribution
 #############################################################################
+debian-dist:
+	@$(ECHO) coming soon. 
+debian-upload:
+	@$(ECHO) coming soon. 
 
+#############################################################################
+# macosx distribution
+#############################################################################
+macosx-dist:
+	@$(ECHO) coming soon. 
+macosx-upload:
+	@$(ECHO) coming soon. 
+
+#############################################################################
+# 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 +371,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 current/
-	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
 
 #############################################################################
 #
@@ -465,7 +509,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 +524,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` `find . -name TAGS` config.status config.h.in config.log 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 +557,24 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
+# 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.