X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=cd894d57efd5b71da1179e87609dc9d07fedfb7b;hb=b0e91b7f23e5d799d0215b683d3d5312330b6a37;hp=6cb5ee2fa1a172172d18a3db0942926171756ec3;hpb=da9ced27f576ba491a8a9ac784b939321711670b;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 6cb5ee2f..cd894d57 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.50 2002/04/02 03:46:24 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.59 2002/04/04 08:32:45 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -150,12 +150,9 @@ PCRE_SRC = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/ PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:.c=.@OBJEXT@) PCRE_HDRS = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h pcre/pcre.h -# No REGEX (Either because dynamically linked pcreposix, or no regex at all): +# No REGEX (maybe because dynamically linked pcreposix): REGEX_SRC = -# GNU REGEX: -@GNU_REGEX_ONLY@REGEX_SRC = gnu_regex.c -# PCRE REGEX: -@PCRE_REGEX_ONLY@@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c +@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c REGEX_OBJS = $(REGEX_SRC:.c=.@OBJEXT@) REGEX_HDRS = $(REGEX_SRC:.c=.h) @@ -245,7 +242,7 @@ re_filterfile.txt: re_filterfile ############################################################################# # RPM specifice stuff (SuSE or Redhat, ..) ############################################################################# -rpm-stuff: +rpm-stuff: clean clobber for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ if [ ! -w $(RPM_BASE)/$$dir ]; then \ $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \ @@ -255,9 +252,6 @@ rpm-stuff: fi; \ done; \ - $(MAKE) clobber - if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi - ############################################################################# # redhat distribution alpha and x86 ############################################################################# @@ -377,7 +371,7 @@ gen-clean: $(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar* ############################################################################# -# solaris distribution +# solaris distribution. verified on SF machines by swa. ############################################################################# solaris-dist: gen-dist @$(ECHO) Done. @@ -421,12 +415,16 @@ amiga-upload: @$(ECHO) coming soon. ############################################################################# -# freebsd distribution +# freebsd distribution. verified on SF machines by swa. ############################################################################# -freebsd-dist: - @$(ECHO) coming soon. -freebsd-upload: - @$(ECHO) coming soon. +freebsd-dist: gen-dist + @$(ECHO) Done. +# anonymously ncftps the package to sourceforge +freebsd-upload: gen-upload + @$(ECHO) Done. +# use with care +freebsd-clean: gen-clean + @$(ECHO) Done. ############################################################################# # Windows distribution @@ -436,14 +434,38 @@ win-dist: ############################################################################# -# Tarball distribution +# Tarball distribution. Only source files. No binaries. ############################################################################# -tarball-dist: clobber + +MISC_FILES = install-sh config.sub configure.in GNUmakefile.in config.h.in config.guess privoxy* + +tarball-dist: $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) - cd .. && find privoxy-$(VERSION)-$(CODE_STATUS) -# cd .. && $(TAR) --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 without any binary created. +# add source files + for foo in `find . -name "*.c"`; do \ + (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + done; +# add header files + for foo in `find . -name "*.h"`; do \ + (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + done; +# add config files + for foo in $(CONFIG_FILES); do \ + (cd .. && $(TAR) -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + done; +# add misc files + for foo in $(MISC_FILES); do \ + (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + done; +# add documentation + for foo in $(DOC_FILES); do \ + (cd .. && $(TAR) -uvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + done; +# and zip the archive + $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) + $(GZIP_PROG) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar + @$(ECHO) Tarball distribution created. + # anonymously ncftps the tarball to sourceforge tarball-upload: @@ -496,8 +518,6 @@ dok-user: doc/source/ldpOK.dsl dok-faq: doc/source/ldpOK.dsl mkdir -p doc/text rm -rf doc/webserver/faq -# Turn off section numbering for FAQ - sed 's/(define %section-autolabel% #t)/(define %section-autolabel% #f)/' doc/source/ldpOK.dsl > tmp.dsl && mv -f tmp.dsl 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 @@ -514,7 +534,13 @@ dok-man: doc/source/ldpOK.dsl $(MAKE) groff2html; \ fi -dok: dok-devel dok-user dok-faq dok-man +readme: doc/source/ldpOK.dsl + cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks readme.sgml > tmp.html &&\ + lynx -dump tmp.html > ../../README && rm -rf tmp.html + # kludge to force recreation on next run. Rodgrigo? + @rm -f doc/source/ldpOK.dsl + +dok: dok-devel dok-user dok-faq dok-man readme ## kludge to force recreation on next run. Rodgrigo? @rm -f doc/source/ldpOK.dsl @$(ECHO) Documentation created. @@ -541,11 +567,11 @@ redhat-dok: doc/source/ldpOK.dsl man2html developer-manual ## faq rm -rf doc/webserver/faq -# Turn off section numbering for FAQ - sed 's/(define %section-autolabel% #t)/(define %section-autolabel% #f)/' doc/source/ldpOK.dsl > tmp.dsl && mv -f tmp.dsl doc/source/ldpOK.dsl cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \ tmp.html > ../text/faq.txt && rm -rf tmp.html faq +## readme + $(MAKE) redhat-readme # kludge to force recreation on next run. Rodgrigo? @rm -f doc/source/ldpOK.dsl @@ -559,6 +585,13 @@ man2html: $(MAKE) groff2html; \ fi +## Make README +redhat-readme: doc/source/ldpOK.dsl + cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \ + tmp.html > ../../README && rm -rf tmp.html + # kludge to force recreation on next run. Rodgrigo? + @rm -f doc/source/ldpOK.dsl + ############################################################################# # # Webserver @@ -566,21 +599,30 @@ man2html: # moves dokumentation to webserver # ############################################################################# -webserver: +webserver: tidy @$(ECHO) ------------------------------------------------------- @$(ECHO) You have run make dok/redhat-dok before, right? @$(ECHO) Note that this command scps all stuff to the webserver, @$(ECHO) it will not remove obsolete documents. @$(ECHO) ------------------------------------------------------- - cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - @$(ECHO) Fixing permissions - @ssh ijbswa.sourceforge.net chmod -R g+rw /home/groups/i/ij/ijbswa/htdocs/ 2> /dev/null -webquick: - cd doc/webserver/actions && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/actions + @$(ECHO) Uploading + @cd doc/webserver; \ + upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ + $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/; tar xv' + @$(ECHO) Fixing permissions - @ssh ijbswa.sourceforge.net chmod -R g+rw /home/groups/i/ij/ijbswa/htdocs/actions 2> /dev/null + @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/* -type d | xargs chmod 775 2>/dev/null' + @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/* -type f | xargs chmod 664 2>/dev/null' + +web-actions: tidy + @$(ECHO) Uploading + @cd doc/webserver/actions; \ + upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ + $(TAR) c $$upload | ssh ijbswa.sourceforge.net 'cd /home/groups/i/ij/ijbswa/htdocs/actions; tar xv' + @$(ECHO) Fixing permissions + @ssh ijbswa.sourceforge.net 'find /home/groups/i/ij/ijbswa/htdocs/actions/* -type f | xargs chmod 664 2>/dev/null' ############################################################################# # Source file dependencies @@ -647,10 +689,19 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster config.log + $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) `find . -iname TAGS` + +tidy: + $(RM) `find . -name "*~" -o -name "#*#"` + +clobber: tidy + $(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile privoxy.log core *.tar.gz *.tar +# +# FIXME: What is all this? +# + $(RM) cscope.* *.pdb *.lib *.exp -clobber: clean - $(RM) 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 +distclean: clobber tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) @@ -682,6 +733,33 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.59 2002/04/04 08:32:45 swa +# wrong name for tarball-dist target. further fixed content of tarball dist +# +# Revision 1.58 2002/04/04 06:32:58 hal9 +# New dok targets for make readme. +# +# Revision 1.57 2002/04/04 00:36:36 gliptak +# always use pcre for matching +# +# Revision 1.56 2002/04/03 22:28:03 gliptak +# Removed references to gnu_regex +# +# Revision 1.55 2002/04/03 19:54:29 swa +# freebsd tested to work. attempt to move tarball dist target forward +# +# Revision 1.54 2002/04/03 14:54:07 oes +# Standard clean and clobber semantics II +# +# Revision 1.53 2002/04/03 14:19:16 oes +# Standard clean and clobber semantics +# +# Revision 1.52 2002/04/03 02:56:18 hal9 +# Revert previous FAQ numbering kludge. +# +# Revision 1.51 2002/04/02 13:03:56 oes +# Added fix for webserver permissions +# # Revision 1.50 2002/04/02 03:46:24 hal9 # Rewrite ldpOK.dsl so that sections are NOT numbered on FAQ, in an effort # to make the Table of Contents not so 'busy' looking. SuSE needs testing :)