X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile.in;h=6dd9a26e1698679dbabfc29e129d9ab761116750;hp=8c670b886f93ee4415ce695543377019392d6e69;hb=6fad7c1b3c2a9c9d76ad6112f28b0f1db4844952;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/Makefile.in b/Makefile.in index 8c670b88..6dd9a26e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.2 2001/05/13 22:04:51 administrator Exp $ +# $Id: Makefile.in,v 1.15 2001/07/13 13:48:07 oes Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,15 +28,74 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.15 2001/07/13 13:48:07 oes +# - Moved STATIC #define for pcre to (ac)config.h +# - Made -Ipcre depandant on static pcre compilation to +# avoid version conflicts +# - Included compilation and depandancies for new deanimate.c +# - Made changes to the pcre/pcreposix/pcrs build process +# as required by the new library autodetection in +# configure.in +# +# Revision 1.14 2001/07/01 16:27:44 oes +# Fixed misplaced dependancy +# +# Revision 1.13 2001/06/29 13:18:36 oes +# - added depandancy of filters.o on cgi.h +# +# Revision 1.12 2001/06/12 17:15:56 swa +# fixes, because a clean build on rh6.1 was impossible. +# GZIP confuses make, %configure confuses rpm, etc. +# +# Revision 1.11 2001/06/11 11:26:35 sarantis +# RPM version should be the same as ijbswa version. The rpm release is +# specified in the specfile. +# +# Revision 1.10 2001/06/07 17:27:45 swa +# added suse build section +# +# Revision 1.9 2001/06/04 18:31:58 swa +# files are now prefixed with either `confdir' or `logdir'. +# `make redhat-dist' replaces both entries confdir and logdir +# with redhat values +# +# Revision 1.8 2001/06/04 10:44:57 swa +# `make redhatr-dist' now works. Except for the paths +# in the config file. +# +# Revision 1.7 2001/06/03 17:09:09 swa +# swa for oes: reversed my earlier change +# +# Revision 1.6 2001/06/03 17:07:27 swa +# swa for oes +# +# Revision 1.5 2001/06/03 13:57:26 swa +# compile cgi.c (for andreas' GUI) +# +# Revision 1.4 2001/05/31 21:18:45 jongfoster +# Added files actions.[ch], actionlist.h, list.[ch] to Makefile +# +# Revision 1.3 2001/05/29 20:02:48 joergs +# Changes for AmigaOS added. +# +# Revision 1.2 2001/05/17 22:23:23 oes +# - Added auto-generation of CRLFs for Win32 config files +# - Added comment-prefix to all Win32-only options in the config file +# and provided auto stripping of this prefix for the Win32 platform by make +# +# Revision 1.1.1.1 2001/05/15 13:59:00 oes +# Initial import of version 2.9.3 source tree +# # - # define version (will be wired into the rpm.) VERSION_MAJOR = @VERSION_MAJOR@ VERSION_MINOR = @VERSION_MINOR@ VERSION_POINT = @VERSION_POINT@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) +# will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile RPM_VERSION = $(VERSION) +RPM_PACKAGEV = 1 # The version is currently specified in config.h, which is # written by "configure". @@ -55,10 +114,6 @@ MAN_DEST = @mandir@ # The flag "-mwindows -mno-cygwin" will cause Cygwin to use MingW32 for Win32 install. CYGWIN_FLAGS = @CYGWIN_FLAGS@ -# Need to define this in order to link PCRE statically under Win32 -# Also define under UNIX to use system PCRE headers. -PCRE_WIN_FLAGS = @STATIC_PCRE_ONLY@-DSTATIC - # Either/Or of these next two lines #DEBUG_CFLAGS = -g DEBUG_CFLAGS = -O3 @@ -71,24 +126,24 @@ SOLARIS_FLAGS = @SOLARIS_ONLY@-D__EXTENSIONS__=1 # Do we need -DHAVE_STRING ??? CFLAGS = @CFLAGS@ @CPPFLAGS@ \ -D__MT__=1 -D__STDC__=1 $(SOLARIS_FLAGS) -DHAVE_STRING $(DEBUG_CFLAGS) \ - -Ipcre $(CYGWIN_FLAGS) $(PCRE_WIN_FLAGS) + $(CYGWIN_FLAGS) $(PCRE_WIN_FLAGS) @STATIC_PCRE_ONLY@ -Ipcre PROGRAM = junkbuster@EXEEXT@ CC = gcc ECHO = echo -GZIP = gzip +GZIP_PROG = gzip INSTALL = cp -f LD = gcc OBJEXT = @OBJEXT@ RM = rm -f -STRIP = strip +STRIP_PROG = strip -C_SRC = encode.c errlog.c filters.c gateway.c jbsockets.c jcc.c \ - killpopup.c loadcfg.c loaders.c miscutil.c parsers.c \ - showargs.c ssplit.c +C_SRC = actions.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 showargs.c ssplit.c cgi.c deanimate.c C_OBJS = $(C_SRC:.c=.$(OBJEXT)) -C_HDRS = $(C_SRC:.c=.h) project.h +C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h W32_SRC = @WIN_ONLY@w32log.c w32rulesdlg.c w32taskbar.c win32.c W32_FILES = @WIN_ONLY@w32.res @@ -98,21 +153,20 @@ W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32 W32_INIS = @WIN_ONLY@junkbstr.txt saclfile.txt sblock.txt scookie.txt \ @WIN_ONLY@sforward.txt simage.txt spopup.txt strust.txt sregexp.txt -PCRS_SRC = @PCRS_ONLY@pcrs.c -PCRS_OBJS = $(PCRS_SRC:.c=.$(OBJEXT)) -PCRS_HDRS = $(PCRS_SRC:.c=.h) +PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c +PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.$(OBJEXT)) +PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h) PCRE_SRC = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/pcre.c 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 -PCRE_LIB = @LIBRARY_PCRE_ONLY@-lpcre -# No REGEX: -@NO_REGEX_ONLY@REGEX_SRC = -# Without PCRE: +# No REGEX (Either because dynamically linked pcreposix, or no regex at all): +REGEX_SRC = +# GNU REGEX: @GNU_REGEX_ONLY@REGEX_SRC = gnu_regex.c -# With PCRE: -@PCRE_REGEX_ONLY@REGEX_SRC = @STATIC_PCRE_ONLY@pcre/pcreposix.c +# PCRE REGEX: +@PCRE_REGEX_ONLY@@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c REGEX_OBJS = $(REGEX_SRC:.c=.$(OBJEXT)) REGEX_HDRS = $(REGEX_SRC:.c=.h) @@ -124,7 +178,10 @@ PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcr # FIXME: This is always commented out SOCKET_LIB = @SOLARIS_ONLY@-lsocket -lnsl -LIBS = $(PCRE_LIB) $(W32_LIB) $(SOCKET_LIB) +# PThreads library, if needed. +PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ + +LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) @@ -137,15 +194,13 @@ HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) # ------------------------------------------------------------------------- LDFLAGS = $(DEBUG_CFLAGS) $(CYGWIN_FLAGS) - all: $(PROGRAM) - SUFFIX = .txt:o .SUFFIXES : .txt %.txt: - sed -e 's/$$//' < $< > $@ + sed -e 's/$$/& /' < $< > $@ inifiles: $(W32_INIS) @@ -160,7 +215,8 @@ junkbstr.txt: config -e 's!\(/var/log/junkbuster\|.\)/junkbuster\.log!junkbstr.log!' \ -e 's!\(/etc/junkbuster\|.\)/imagelist!simage.txt!' \ -e 's!\(/etc/junkbuster\|.\)/re_filterfile!sregexp.txt!' \ - -e 's!$$!!' \ + -e 's!$$!& !' \ + -e 's!#Win32-only: !!' \ < $< > $@ saclfile.txt: aclfile @@ -174,17 +230,30 @@ sregexp.txt: re_filterfile # ------------------------------------------------------------------------- -# +# redhat distribution # ------------------------------------------------------------------------- -rpm-dist: - @make clean +redhat-dist: + @make clobber # verify that i'm root needs to be done - cd .. && tar --exclude "ijb/CVS" -cvzf ijb.tar.gz ijb/ + rm -f ../ijbswa.tar.gz # verify all version strings, FLAGS, etc. in the spec file - cat ../../SPECS/junkbuster.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(VERSION_POINT)/g' > /tmp/abc && cp -f /tmp/abc ../../SPECS/junkbuster.spec - cd ../../ && rpm -ba SPECS/junkbuster.spec - chmod -R a+r ../../RPMS - chmod -R a+r ../../SRPMS + cat junkbuster-rh.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-rh.spec + tar --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf ../ijbswa.tar.gz . +# verify all files in their correct location needs to be done + cd .. && rpm -ta ijbswa.tar.gz + +# ------------------------------------------------------------------------- +# suse distribution +# ------------------------------------------------------------------------- +suse-dist: + @make clobber +# verify that i'm root needs to be done + rm -f ../ijbswa.tar.gz +# verify all version strings, FLAGS, etc. in the spec file + cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-suse.spec + tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz . +# verify all files in their correct location needs to be done + cd .. && rpm -ta ijbswa.tar.gz # ------------------------------------------------------------------------- # @@ -207,19 +276,23 @@ tarball-dist: # # ------------------------------------------------------------------------- +actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h encode.@OBJEXT@: encode.c encode.h config.h errlog.@OBJEXT@: errlog.c errlog.h config.h $(PROJECT_H_DEPS) @WIN_ONLY@w32log.h -filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h showargs.h ssplit.h @WIN_ONLY@win32.h +filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h showargs.h ssplit.h cgi.h deanimate.h @WIN_ONLY@win32.h gateway.@OBJEXT@: gateway.c gateway.h config.h $(PROJECT_H_DEPS) errlog.h jbsockets.h jcc.h loadcfg.h jbsockets.@OBJEXT@: jbsockets.c jbsockets.h config.h $(PROJECT_H_DEPS) filters.h -jcc.@OBJEXT@: jcc.c jcc.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h killpopup.h loadcfg.h loaders.h miscutil.h parsers.h showargs.h @WIN_ONLY@w32log.h win32.h +jcc.@OBJEXT@: jcc.c jcc.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h killpopup.h loadcfg.h loaders.h miscutil.h parsers.h showargs.h @WIN_ONLY@w32log.h win32.h cgi.h killpopup.@OBJEXT@: killpopup.c killpopup.h config.h $(PROJECT_H_DEPS) jcc.h loadcfg.h +list.@OBJEXT@: list.c list.h config.h $(PROJECT_H_DEPS) list.h miscutil.h loadcfg.@OBJEXT@: loadcfg.c loadcfg.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h jcc.h killpopup.h loaders.h miscutil.h parsers.h showargs.h @WIN_ONLY@w32log.h win32.h loaders.@OBJEXT@: loaders.c loaders.h config.h $(PROJECT_H_DEPS) errlog.h encode.h filters.h gateway.h jcc.h loadcfg.h miscutil.h parsers.h ssplit.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 showargs.h ssplit.h showargs.@OBJEXT@: showargs.c showargs.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jcc.h loadcfg.h miscutil.h parsers.h ssplit.@OBJEXT@: ssplit.c ssplit.h config.h miscutil.h +cgi.@OBJEXT@: cgi.c cgi.h config.h $(PROJECT_H_DEPS) list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h +deanimate.@OBJEXT@: deanimate.c deanimate.h config.h $(PROJECT_H_DEPS) # GNU regex gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h @@ -251,6 +324,15 @@ win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcre/pcre.h pcre/pcreposix.h pc w32.res: w32.rc w32res.h icons/denyrule.ico 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/icon1.ico icons/idle.ico icons/junkbust.ico config.h windres -D__MINGW32__=0.2 -O coff -i $< -o $@ +## AmigaOS, GCC 2.95.1 (or lower, 2.95.3 does NOT work!) +#ifeq ($(shell $(CC) $(CFLAGS) -dumpmachine), m68k-amigaos) +#OBJS += amiga.o +#CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -Wall -m68020 -Os -noixemul -fbaserel -msmall-code +#LDFLAGS += -m68020 -noixemul -fbaserel +#LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o +#amiga.o: amiga.c amiga.h config.h +#endif +# $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) @@ -265,14 +347,14 @@ tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) install: all - $(STRIP) $(PROGRAM) + $(STRIP_PROG) $(PROGRAM) $(INSTALL) $(PROGRAM) $(SBIN_DEST) $(INSTALL) README README.TOO README.WIN README.re_filter README.cygwin $(DEST) $(INSTALL) aclfile blocklist config cookiefile forward imagelist \ popup re_filterfile trust $(DEST) # FIXME: On SuSE, these are not found. Where do they go? $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly - $(GZIP) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz + $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz $(INSTALL) junkbuster.init /sbin/init.d/junkbuster