fixed make tarball, tarball-dist, tarball-clean

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2e7b251..bcb1f41 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
 # 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.30 2002/03/25 12:52:25 swa Exp $

 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team.  http://ijbswa.sourceforge.net
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team.  http://ijbswa.sourceforge.net


@@ -371,16 +371,24 @@ win-dist:
 #############################################################################
 # Tarball distribution
 #############################################################################
 #############################################################################
 # 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:
 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

 
 #############################################################################
 #
 
 #############################################################################
 #


@@ -524,11 +532,6 @@ clobber: clean
 tags: $(SRCS) $(HDRS)
        etags $(SRCS) $(HDRS)
 
 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
 install: all
        #
        # FIXME: This is a dirty hack to have an install target


@@ -554,6 +557,9 @@ install: all
 ## end:
 
 # $Log: GNUmakefile.in,v $
 ## end:
 
 # $Log: GNUmakefile.in,v $

+# 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.29  2002/03/24 17:03:55  jongfoster
 # Name change
 #