X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile.in;h=27e1e3fb372d64fac9c034681b448c33c17cfd6b;hp=6dd9a26e1698679dbabfc29e129d9ab761116750;hb=051dfd818a157b55837c18d1503257ff6a1a2993;hpb=4867a5461c9f7bf325687f32a27c9b2e68fc6213 diff --git a/Makefile.in b/Makefile.in index 6dd9a26e..27e1e3fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.15 2001/07/13 13:48:07 oes Exp $ +# $Id: Makefile.in,v 1.21 2001/09/10 11:12:49 oes Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,28 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.21 2001/09/10 11:12:49 oes +# Turning on -Wall +# +# Revision 1.20 2001/08/02 22:04:29 jongfoster +# Removing some remaining references to obsolete w32rulesdlg.[ch] +# +# Revision 1.19 2001/07/30 22:14:03 jongfoster +# Removing obsolete w32rulesdlg.c and w32rulesdlg.h +# +# Revision 1.18 2001/07/29 17:09:17 jongfoster +# Major changes to build system in order to fix these bugs: +# - pthreads under Linux was broken - changed -lpthread to -pthread +# - Compiling in MinGW32 mode under CygWin now correctly detects +# which shared libraries are available +# - Solaris support (?) (Not tested under Solaris yet) +# +# 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 @@ -88,7 +110,11 @@ # # -# define version (will be wired into the rpm.) + +############################################################################# +# Version number (for RPM) +############################################################################# + VERSION_MAJOR = @VERSION_MAJOR@ VERSION_MINOR = @VERSION_MINOR@ VERSION_POINT = @VERSION_POINT@ @@ -97,46 +123,34 @@ 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@ -# 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) \ - $(CYGWIN_FLAGS) $(PCRE_WIN_FLAGS) @STATIC_PCRE_ONLY@ -Ipcre - -PROGRAM = junkbuster@EXEEXT@ -CC = gcc -ECHO = echo -GZIP_PROG = gzip -INSTALL = cp -f -LD = gcc -OBJEXT = @OBJEXT@ -RM = rm -f -STRIP_PROG = strip +############################################################################# +# 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 + + +############################################################################# +# 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 \ @@ -145,13 +159,12 @@ C_SRC = actions.c encode.c errlog.c filters.c gateway.c jbsockets.c \ C_OBJS = $(C_SRC:.c=.$(OBJEXT)) C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h -W32_SRC = @WIN_ONLY@w32log.c w32rulesdlg.c w32taskbar.c win32.c +W32_SRC = @WIN_ONLY@w32log.c w32taskbar.c win32.c W32_FILES = @WIN_ONLY@w32.res W32_OBJS = @WIN_ONLY@$(W32_SRC:.c=.$(OBJEXT)) $(W32_FILES) -W32_HDRS = @WIN_ONLY@w32log.h w32res.h w32rulesdlg.h w32taskbar.h +W32_HDRS = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h 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 +W32_INIS = @WIN_ONLY@junkbstr.txt sactions.txt strust.txt sregexp.txt PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.$(OBJEXT)) @@ -175,63 +188,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 # 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) 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@ -# ------------------------------------------------------------------------- -# Do not change anything below this line -# And there should NOT be any targets above this line. -# ------------------------------------------------------------------------- -LDFLAGS = $(DEBUG_CFLAGS) $(CYGWIN_FLAGS) +# 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 -Wall + +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 @@ -242,9 +273,11 @@ redhat-dist: # verify all files in their correct location needs to be done cd .. && rpm -ta ijbswa.tar.gz -# ------------------------------------------------------------------------- -# suse distribution -# ------------------------------------------------------------------------- + +############################################################################# +# suse distribution (need to be root to build) +############################################################################# + suse-dist: @make clobber # verify that i'm root needs to be done @@ -253,17 +286,30 @@ suse-dist: 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 - -# ------------------------------------------------------------------------- -# -# ------------------------------------------------------------------------- +# never use buildroot to define the location inside the spec +# file or suse will fuck up the build process. + cd .. && rpm -ta --buildroot /tmp/xxx ijbswa.tar.gz + +# handle with care. use with root. +suse-clean: + rpm -e junkbuster + rm -rf /etc/junkbuster + rm -rf /var/log/junkbuster + rm -f /etc/init.d/junkbuster + rm -f /usr/sbin/junkbuster + rm -f /usr/sbin/rcjunkbuster + rm -f /usr/share/man/man1/junkbuster.1.gz + +############################################################################# +# Windows distribution +############################################################################# win-dist: $(ECHO) Not implemented. -# ------------------------------------------------------------------------- -# -# ------------------------------------------------------------------------- + +############################################################################# +# Tarball distribution +############################################################################# tarball-dist: @make clean make $(PROGRAM) @@ -272,9 +318,10 @@ 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 @@ -316,12 +363,11 @@ pcre/dftables: pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal $(CC) -o pcre/dftables $(CFLAGS) pcre/dftables.c # Win32 -w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h w32rulesdlg.h w32taskbar.h win32.h -w32rulesdlg.@OBJEXT@: w32rulesdlg.c config.h w32rulesdlg.h win32.h +w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h 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/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 +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 windres -D__MINGW32__=0.2 -O coff -i $< -o $@ ## AmigaOS, GCC 2.95.1 (or lower, 2.95.3 does NOT work!) @@ -358,6 +404,8 @@ install: all $(INSTALL) junkbuster.init /sbin/init.d/junkbuster +############################################################################# + ## Local Variables: ## tab-width: 3 ## end: