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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2e7b2512..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.29 2002/03/24 17:03:55 jongfoster 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 
@@ -371,16 +371,24 @@ win-dist:
 #############################################################################
 # Tarball distribution
 #############################################################################
-tarball-dist:
-	@make clean
-	make $(PROGRAM) 
-#	remove all objects and create the tarball with the binary
-	cd .. && $(RM) current/a.out current/core current/*.@OBJEXT@ && tar --exclude "current/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:
-	@$(ECHO) coming soon. 
+	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
 
 #############################################################################
 #
@@ -516,7 +524,7 @@ $(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 configure
@@ -524,11 +532,6 @@ clobber: clean
 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
@@ -554,6 +557,12 @@ 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
 #