X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile.in;h=82cb1bb52cf7a992b16a424bd95c28545a66f257;hp=8c670b886f93ee4415ce695543377019392d6e69;hb=df302b0c1ff43a919477ff131ee56ae24941bf20;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/Makefile.in b/Makefile.in index 8c670b88..82cb1bb5 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.3 2001/05/29 20:02:48 joergs Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,17 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# 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 +# # @@ -83,12 +94,12 @@ OBJEXT = @OBJEXT@ RM = rm -f STRIP = 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 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 @@ -145,7 +156,7 @@ SUFFIX = .txt:o .SUFFIXES : .txt %.txt: - sed -e 's/$$//' < $< > $@ + sed -e 's/$$/& /' < $< > $@ inifiles: $(W32_INIS) @@ -160,7 +171,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 @@ -207,6 +219,7 @@ 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 @@ -214,6 +227,7 @@ gateway.@OBJEXT@: gateway.c gateway.h config.h $(PROJECT_H_DEPS) errlog.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 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 @@ -251,6 +265,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)