# Note: Makefile is built automatically from Makefile.in
#
-# $Id: Makefile.in,v 1.3 2001/05/29 20:02:48 joergs Exp $
+# $Id: Makefile.in,v 1.14 2001/07/01 16:27:44 oes Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: Makefile.in,v $
+# 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.
#
#
#
-
# 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".
# 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
# 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 = 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
+ 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
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)
# FIXME: This is always commented out
SOCKET_LIB = @SOLARIS_ONLY@-lsocket -lnsl
-LIBS = $(PCRE_LIB) $(W32_LIB) $(SOCKET_LIB)
+LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB)
SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC)
OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
# -------------------------------------------------------------------------
LDFLAGS = $(DEBUG_CFLAGS) $(CYGWIN_FLAGS)
-
all: $(PROGRAM)
-
SUFFIX = .txt:o
.SUFFIXES : .txt
# -------------------------------------------------------------------------
-#
+# redhat distribution
# -------------------------------------------------------------------------
-rpm-dist:
- @make clean
+redhat-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-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
- 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-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
# -------------------------------------------------------------------------
#
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
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
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
projects / privoxy.git / blobdiff