X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=1e697f26375b371882139cbc2fdb49512e918f84;hb=0dd6c96aa0be944d9fd7b54f25774f648026485c;hp=a215b897fdf4dbf84f713168588a3df03bd7ad9d;hpb=875bb6aa9c0a2a5986df4a0fea842612c90b0198;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index a215b897..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.20 2002/03/24 11:39:17 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 @@ -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 = 3 +RPM_PACKAGEV = @VERSION_RPM_PACKAGE@ ############################################################################# @@ -55,7 +55,7 @@ MAN_DEST = @mandir@ # Build tools ############################################################################# -PROGRAM = jbng@EXEEXT@ +PROGRAM = privoxy@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip @@ -89,7 +89,7 @@ DOSFILTER = perl -p -e 's/\n/\r\n/' # Setup for make distribution rh and suse for now ############################################################################# -TAR_ARCH = /tmp/Privoxy-$(RPM_VERSION).tar.gz +TAR_ARCH = /tmp/privoxy-$(RPM_VERSION).tar.gz RPM_BASE = @RPM_BASE@ ############################################################################# @@ -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. + +############################################################################# +# 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 \ @@ -309,7 +342,7 @@ suse-upload: # handle with care. use with root. suse-clean: - rpm -e junkbuster-suse + rpm -e junkbuster-suse || true rm -rf /etc/junkbuster rm -rf /etc/rc.d/junkbuster* rm -rf /var/run/junkbuster.pid @@ -318,7 +351,7 @@ suse-clean: rm -f /usr/sbin/junkbuster rm -f /usr/sbin/rcjunkbuster rm -f /usr/share/man/man1/junkbuster.1.gz - rpm -e privoxy-suse + rpm -e privoxy-suse || true rm -rf /etc/privoxy rm -rf /etc/rc.d/privoxy* rm -rf /var/run/privoxy.pid @@ -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 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 ############################################################################# # @@ -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` 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 +557,40 @@ 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. +# +# 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. +# +# Revision 1.21 2002/03/24 12:43:57 swa +# name change +# # Revision 1.20 2002/03/24 11:39:17 jongfoster # Renaming config files #