X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile.in;h=4cca76a08b966b96d2173d487809e9eeffa55c72;hp=099be1202bb3ae098d7f52de13c9098211c1e2f6;hb=f67326f815557ce76525f7b69d74abc94ecdf081;hpb=c25f90c972098756fc730878e5ac9a84a085c353 diff --git a/Makefile.in b/Makefile.in index 099be120..4cca76a0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.13 2001/06/29 13:18:36 oes Exp $ +# $Id: Makefile.in,v 1.17 2001/07/28 16:44:54 oes Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,24 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.17 2001/07/28 16:44:54 oes +# Fixed sed LF->CRLF conversion and removed deprecated files +# +# Revision 1.16 2001/07/15 19:45:33 jongfoster +# Added support for linking with POSIX threads library +# +# 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 # @@ -77,7 +95,10 @@ # -# define version (will be wired into the rpm.) +############################################################################# +# Version number (for RPM) +############################################################################# + VERSION_MAJOR = @VERSION_MAJOR@ VERSION_MINOR = @VERSION_MINOR@ VERSION_POINT = @VERSION_POINT@ @@ -86,54 +107,38 @@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) RPM_VERSION = $(VERSION) RPM_PACKAGEV = 1 -# The version is currently specified in config.h, which is -# written by "configure". -# -#VERSION_CFLAGS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ -# -DVERSION_MINOR=$(VERSION_MINOR) \ -# -DVERSION_POINT=$(VERSION_POINT) \ -# -DVERSION="$(VERSION)" +############################################################################# # Directories for "make install" +############################################################################# + DEST = /etc/junkbuster SBIN_DEST = @sbindir@ MAN_DEST = @mandir@ -# The flag "-mno-win32" can be used by Cygwin to emulate a un?x type install. -# 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 +############################################################################# +# Build tools +############################################################################# + +PROGRAM = junkbuster@EXEEXT@ +CC = @CC@ +ECHO = echo +GZIP_PROG = gzip +INSTALL = cp -f +LD = gcc +OBJEXT = @OBJEXT@ +RM = rm -f +STRIP_PROG = strip -# Either/Or of these next two lines -#DEBUG_CFLAGS = -g -DEBUG_CFLAGS = -O3 - -# Solaris needs a special define: -# FIXME: This is always commented out -SOLARIS_FLAGS = @SOLARIS_ONLY@-D__EXTENSIONS__=1 - -# -DSTDC_HEADERS Now in config.h -# 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) - -PROGRAM = junkbuster@EXEEXT@ -CC = gcc -ECHO = echo -GZIP_PROG = gzip -INSTALL = cp -f -LD = gcc -OBJEXT = @OBJEXT@ -RM = rm -f -STRIP_PROG = strip + +############################################################################# +# Filenames and libraries +############################################################################# 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 + parsers.c showargs.c ssplit.c cgi.c deanimate.c C_OBJS = $(C_SRC:.c=.$(OBJEXT)) C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h @@ -146,21 +151,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) @@ -169,62 +173,81 @@ REGEX_HDRS = $(REGEX_SRC:.c=.h) PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h # Only need this on Solaris -# 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@ SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) +LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) + + +############################################################################# +# Compiler switches +############################################################################# + +# The flag "-mno-win32" can be used by Cygwin to emulate a un?x type build. +# The flag "-mwindows -mno-cygwin" will cause Cygwin to use MingW32 for a +# Win32 GUI build. +# The flag "-pthread" is required if using Pthreads under Linux (and +# possibly other OSs). +SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ + +# Either/Or of these next two lines +#DEBUG_CFLAGS = -g # Debug build +DEBUG_CFLAGS = -O3 # Full optimization +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) \ + @STATIC_PCRE_ONLY@ -Ipcre -# ------------------------------------------------------------------------- -# Do not change anything below this line -# And there should NOT be any targets above this line. -# ------------------------------------------------------------------------- -LDFLAGS = $(DEBUG_CFLAGS) $(CYGWIN_FLAGS) +LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) +############################################################################# +# Build section. +# +# There should NOT be any targets above this line. +############################################################################# all: $(PROGRAM) -SUFFIX = .txt:o -.SUFFIXES : .txt +############################################################################# +# Define this explicitly because Solaris is broken! +############################################################################# +%.o: %.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + + +############################################################################# +# Win32 config files +############################################################################# %.txt: - sed -e 's/$$/& /' < $< > $@ + sed -e $$'s,$$,\r,' < $< > $@ inifiles: $(W32_INIS) junkbstr.txt: config - sed -e 's!\(/etc/junkbuster\|.\)/blocklist!sblock.txt!' \ - -e 's!\(/etc/junkbuster\|.\)/popup!spopup.txt!' \ - -e 's!\(/etc/junkbuster\|.\)/cookiefile!scookie.txt!' \ - -e 's!\(/etc/junkbuster\|.\)/forward!sforward.txt!' \ - -e 's!\(/etc/junkbuster\|.\)/trust!strust.txt!' \ - -e 's!\(/etc/junkbuster\|.\)/aclfile!sacl.txt!' \ - -e 's!\(/var/log/junkbuster\|.\)/jarfile!jar.log!' \ - -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!$$!& !' \ + sed -e 's!\actionsfile!sactions.txt!' \ + -e 's!\trust!strust.txt!' \ + -e 's!\jarfile!jar.log!' \ + -e 's!\logfile!junkbstr.log!' \ + -e 's!\re_filterfile!sregexp.txt!' \ + -e $$'s,$$,\r,' \ -e 's!#Win32-only: !!' \ < $< > $@ -saclfile.txt: aclfile -sblock.txt: blocklist -scookie.txt: cookiefile -sforward.txt: forward -simage.txt: imagelist -spopup.txt: popup +sactions.txt: actionslist strust.txt: trust sregexp.txt: re_filterfile -# ------------------------------------------------------------------------- +############################################################################# # redhat distribution -# ------------------------------------------------------------------------- +############################################################################# + redhat-dist: @make clobber # verify that i'm root needs to be done @@ -235,9 +258,11 @@ redhat-dist: # 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 @@ -248,15 +273,17 @@ suse-dist: # verify all files in their correct location needs to be done cd .. && rpm -ta ijbswa.tar.gz -# ------------------------------------------------------------------------- -# -# ------------------------------------------------------------------------- + +############################################################################# +# Windows distribution +############################################################################# win-dist: $(ECHO) Not implemented. -# ------------------------------------------------------------------------- -# -# ------------------------------------------------------------------------- + +############################################################################# +# Tarball distribution +############################################################################# tarball-dist: @make clean make $(PROGRAM) @@ -265,14 +292,15 @@ tarball-dist: chmod a+r ../../ijb-distribution-$(VERSION).tar.gz @$(ECHO) Tarball with binary created. -# ------------------------------------------------------------------------- -# -# ------------------------------------------------------------------------- + +############################################################################# +# Source file dependencies +############################################################################# 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 cgi.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 cgi.h @@ -285,6 +313,7 @@ parsers.@OBJEXT@: parsers.c parsers.h config.h $(PROJECT_H_DEPS) errlog.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 @@ -350,6 +379,8 @@ install: all $(INSTALL) junkbuster.init /sbin/init.d/junkbuster +############################################################################# + ## Local Variables: ## tab-width: 3 ## end: