X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=inline;f=Makefile.in;h=3b27c4feb8f86d8eb715fe87daf26e87d7a7ded9;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hp=4cca76a08b966b96d2173d487809e9eeffa55c72;hpb=bd18cebb4ffe568926d3fe10ac5d7476ecf3f16a;p=privoxy.git diff --git a/Makefile.in b/Makefile.in index 4cca76a0..3b27c4fe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.17 2001/07/28 16:44:54 oes Exp $ +# $Id: Makefile.in,v 1.27 2001/09/13 13:11:37 steudten Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,46 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.27 2001/09/13 13:11:37 steudten +# +# Replace DEBUG_CFLAGS with OTHER_CFLAGS +# +# Revision 1.26 2001/09/12 23:44:54 david__schmidt +# Mac OSX (Darwin) support added. +# +# Revision 1.25 2001/09/12 22:55:45 joergs +# AmigaOS support added. +# +# Revision 1.24 2001/09/12 17:28:59 david__schmidt +# +# OS/2 port: update autoconf'd support for the platform. +# +# Revision 1.23 2001/09/12 16:28:42 swa +# added "make dok" section to generate html pages from +# the sgml source documents. note that the we do not want +# generated stuff in cvs. +# +# Revision 1.22 2001/09/10 16:31:23 swa +# buildroot definition in the specfile fucks up the build +# process under suse. hence I moved it to the "rpm -ta" +# command +# +# 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 # @@ -126,7 +166,7 @@ CC = @CC@ ECHO = echo GZIP_PROG = gzip INSTALL = cp -f -LD = gcc +LD = @CC@ OBJEXT = @OBJEXT@ RM = rm -f STRIP_PROG = strip @@ -143,13 +183,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)) @@ -172,8 +211,8 @@ REGEX_HDRS = $(REGEX_SRC:.c=.h) # Dependencies introduced by #include "project.h". PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h -# Only need this on Solaris -SOCKET_LIB = @SOLARIS_ONLY@-lsocket -lnsl +# Socket libraries for platforms that need them explicitly defined +SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ @@ -195,12 +234,11 @@ LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) # possibly other OSs). SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ -# Either/Or of these next two lines -#DEBUG_CFLAGS = -g # Debug build -DEBUG_CFLAGS = -O3 # Full optimization +# Add your flags here +OTHER_CFLAGS = -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) \ - @STATIC_PCRE_ONLY@ -Ipcre +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \ + @STATIC_PCRE_ONLY@ -Ipcre -Wall LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) @@ -260,7 +298,7 @@ redhat-dist: ############################################################################# -# suse distribution +# suse distribution (need to be root to build) ############################################################################# suse-dist: @@ -271,8 +309,19 @@ 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 @@ -292,6 +341,28 @@ tarball-dist: chmod a+r ../../ijb-distribution-$(VERSION).tar.gz @$(ECHO) Tarball with binary created. +############################################################################# +# +# Documentation +# +# converts doc/source/*.sgml into html, text and man pages +# +############################################################################# +dok: + mkdir -p doc/text doc/man +# user manual + rm -rf doc/webserver/user-manual + cd doc/source && db2html -s ldp.dsl user-manual.sgml && mv user-manual ../webserver + cd doc/source && db2html -s ldp.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual +## developer manual + rm -rf doc/webserver/developer-manual + cd doc/source && db2html -s ldp.dsl developer-manual.sgml && mv developer-manual ../webserver + cd doc/source && db2html -s ldp.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual +## faq + rm -rf doc/webserver/faq + 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 + ############################################################################# # Source file dependencies @@ -330,30 +401,27 @@ pcre/study.@OBJEXT@: pcre/study.c pcre/config.h pcre/internal.h pcre/p # An auxiliary program makes the PCRE default character table source -pcre/chartables.c: pcre/dftables - pcre/dftables >pcre/chartables.c +pcre/chartables.c: pcre/dftables@EXEEXT@ + pcre/dftables@EXEEXT@ >pcre/chartables.c -pcre/dftables: pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal.h pcre/config.h - $(CC) -o pcre/dftables $(CFLAGS) pcre/dftables.c +pcre/dftables@EXEEXT@: pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal.h pcre/config.h + $(CC) -o pcre/dftables@EXEEXT@ $(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!) -#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 -# +# AmigaOS +@AMIGAOS_ONLY@OBJS += amiga.o +@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -Wall -m68020 -Os -noixemul -fbaserel -msmall-code +@AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel +@AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o +@AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h + $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)