X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=ee4c0992a6c7b3afdf590c9e495a69125a3f533a;hp=9da03d9f55813fdc2bce2486c481f64cc0ff1ef4;hb=8eee84ac9966f874b14ad7bf34de3f9e9bff947b;hpb=7f6618fbbc136561473528f0f1002f3c25dd9053

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9da03d9f..ee4c0992 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: Makefile.in,v 1.40 2001/12/01 00:24:11 jongfoster Exp $
+# $Id: GNUmakefile.in,v 1.7 2002/03/05 13:43:28 morcego Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -27,7 +27,36 @@
 # or write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Log: Makefile.in,v $
+# $Log: GNUmakefile.in,v $
+# Revision 1.7  2002/03/05 13:43:28  morcego
+# Checking for text browser, so redhat-dok can work.
+#
+# Revision 1.6  2002/03/05 13:10:51  morcego
+# Changes to implement redhat-dok (Hal Burgiss)
+# Changes to make it work on other distros and out-of-the-shelf configurations
+#
+# Revision 1.5  2002/02/27 15:30:39  hal9
+# Reset $(RPM_PACKAGEV) to 1 (was 2)
+#
+# Revision 1.4  2002/01/17 21:44:04  jongfoster
+# Adding urlmatch.[ch]
+#
+# Revision 1.3  2002/01/04 15:26:08  oes
+# Added tarball-src target
+#
+# Revision 1.2  2001/12/30 14:07:31  steudten
+# - Add signal handling (unix)
+# - Add SIGHUP handler (unix)
+# - Add creation of pidfile (unix)
+# - Add action 'top' in rc file (RH)
+# - Add entry 'SIGNALS' to manpage
+# - Add exit message to logfile (unix)
+#
+# Revision 1.1  2001/12/01 11:22:57  jongfoster
+# Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of
+# make break in a more obvious way.
+# Adding .PHONY section.
+#
 # Revision 1.40  2001/12/01 00:24:11  jongfoster
 # Renaming various config files
 # Fixing CR->CRLF under Win32 (I hope)
@@ -186,7 +215,6 @@
 #
 #
 
-
 #############################################################################
 # Version number (for RPM)
 #############################################################################
@@ -194,6 +222,7 @@
 VERSION_MAJOR = @VERSION_MAJOR@
 VERSION_MINOR = @VERSION_MINOR@
 VERSION_POINT = @VERSION_POINT@
+CODE_STATUS   = @CODE_STATUS@
 VERSION       = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
 # will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile
 RPM_VERSION   = $(VERSION)
@@ -221,12 +250,15 @@ INSTALL    = cp -f
 LD         = @CC@
 RM         = rm -f
 STRIP_PROG = strip
-SED	   = sed
+SED	     = sed
 CAT        = cat
 RPM        = rpm
-MV	   = mv
+MV	        = mv
 TAR        = tar
 MAKE       = make
+LN         = ln
+WDUMP      = @WDUMP@ -dump
+DB         = jade -t sgml -ihtml -D.. -d ldp.dsl\#html
 
 # Program to do LF->CRLF
 #
@@ -242,7 +274,7 @@ DOSFILTER  = perl -p -e 's/\n/\r\n/'
 #############################################################################
 
 TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz
-RPM_BASE = /usr/src/redhat
+RPM_BASE = @RPM_BASE@
 
 #############################################################################
 # Filenames and libraries
@@ -250,7 +282,8 @@ RPM_BASE = /usr/src/redhat
 
 C_SRC  = actions.c cgi.c cgiedit.c cgisimple.c deanimate.c encode.c \
          errlog.c filters.c gateway.c jbsockets.c jcc.c killpopup.c \
-         list.c loadcfg.c loaders.c miscutil.c parsers.c ssplit.c
+         list.c loadcfg.c loaders.c miscutil.c parsers.c ssplit.c \
+         urlmatch.c
 
 C_OBJS = $(C_SRC:.c=.@OBJEXT@)
 C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h
@@ -327,7 +360,8 @@ all: $(PROGRAM)
 # Phony targets
 #############################################################################
 .PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \
-suse-upload win-dist tarball-dist dok webserver clean clobber tags install
+suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \
+install
 
 
 #############################################################################
@@ -377,6 +411,9 @@ redhat-dist:
 	$(CAT) junkbuster-rh.spec | \
 		$(SED) 's/^Version:.*/Version: $(RPM_VERSION)/g;s/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && \
 		$(MV) -f abc junkbuster-rh.spec; \
+	$(CAT) junkbuster.init | \
+		$(SED) 's#JB_PID=.*/\(.*\.pid\).*#JB_PID=@PID_FILE_PATH@/\1#g' > abc && \
+		$(MV) -f abc junkbuster.init; \
 	$(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \
 	$(RPM) --clean -ta  $(TAR_ARCH); \
 	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH)
@@ -482,6 +519,29 @@ dok:
 	cd doc/source && db2html -s ldp.dsl faq.sgml && mv faq ../webserver
 	cd doc/source && db2html -s ldp.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq
 
+redhat-dok:
+	mkdir -p doc/text doc/man doc/source/user-manual \
+          doc/source/developer-manual doc/source/faq
+##  user manual
+	rm -rf doc/webserver/user-manual
+	cd doc/source/user-manual && $(DB) ../user-manual.sgml && cd .. &&\
+          mv user-manual ../webserver
+	cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && \
+          $(WDUMP) tmp.html > ../text/user-manual.txt && rm -rf tmp.html \
+          user-manual
+##  developer manual
+	rm -rf doc/webserver/developer-manual
+	cd doc/source/developer-manual && $(DB) ../developer-manual.sgml &&\
+          cd .. && mv developer-manual ../webserver
+	cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && \
+          $(WDUMP) tmp.html > ../text/developer-manual.txt && rm -rf tmp.html \
+          developer-manual
+##  faq
+	rm -rf doc/webserver/faq
+	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
+
 #############################################################################
 #
 # Webserver
@@ -491,7 +551,7 @@ dok:
 #############################################################################
 webserver:
 	@$(ECHO) -------------------------------------------------------
-	@$(ECHO) You have run make dok before, right?
+	@$(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) -------------------------------------------------------
@@ -521,6 +581,7 @@ loaders.@OBJEXT@:   loaders.c   loaders.h   config.h $(PROJECT_H_DEPS) errlog.h
 miscutil.@OBJEXT@:  miscutil.c  miscutil.h  config.h
 parsers.@OBJEXT@:   parsers.c   parsers.h   config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h jbsockets.h jcc.h loadcfg.h loaders.h miscutil.h ssplit.h
 ssplit.@OBJEXT@:    ssplit.c    ssplit.h    config.h miscutil.h
+urlmatch.@OBJEXT@:  urlmatch.c  urlmatch.h  config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h
 
 # GNU regex
 gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h
@@ -566,11 +627,16 @@ clean:
 	$(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS)
 
 clobber: clean
-	$(RM) $(PROGRAM) *.pdb *.lib *.exp TAGS junkbuster.log config.cache
+	$(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` TAGS junkbuster.log config.cache *~ *.tar.gz
 
 tags: $(SRCS) $(HDRS)
 	etags $(SRCS) $(HDRS)
 
+tarball-src: clobber
+	$(LN) -s current ../ijb-$(VERSION)-$(CODE_STATUS)
+	$(TAR) -C.. -cvhzf ijb-$(VERSION)-$(CODE_STATUS)-src.tar.gz ijb-$(VERSION)-$(CODE_STATUS)
+	$(RM) ../ijb-$(VERSION)-$(CODE_STATUS)
+
 install: all
 	#
 	# FIXME: This is a dirty hack to have an install target