# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.148 2006/09/26 10:57:58 hal9 Exp $
+# $Id: GNUmakefile.in,v 1.155 2007/09/22 16:23:25 fabiankeil Exp $
#
-# Written by and Copyright (C) 2001 - 2004 the SourceForge
+# Written by and Copyright (C) 2001 - 2007 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
@STATIC_PCRE_ONLY@ -Ipcre
-LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
+LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
#############################################################################
# fi
$(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
- $(RPM) --clean -ta $(TAR_ARCH)
+ $(RPMBUILD) --clean -ta $(TAR_ARCH)
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
# anonymously ncftps the rpms to sourceforge
# NOTE: This will require some hand editing. The new file is outputted
# as config.new so that problem sections can be compared to previous
# version. This is hardcored to w3m for html/text conversion. Also,
-# requires the shell util 'fmt'.
+# requires the shell util 'fmt'. 2007-11-14: note the perl below dies
+# with perl 5.8.8. The same code pasted into a free standing script,
+# without the makefile-isms, works fine.
config-file: dok-release
cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
w3m -dump __tmp.html |fmt -w 70 > ../../config.new && $(RM) -r __tmp.*
- $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\
- /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\
- $$header_len=0 unless $$hit_header;\
- if ($$hit_header) {\
- print "# ";\
- for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\
- print "\n";\
- };\
- $$hit_header=0;\
- $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\
- $$header_len = length($$_);\
- s/^/# /; /^# #{12,}/ && s/^# #/####/;\
- s/^.*$$// if $$hit_option;\
- $$hit_option=0;\
- s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\
- $$hit_option=1 if s/^#\s+@@//;' config.new
+ $(PERL) -pi.bak -e 's/^1\. \@\@TITLE\@\@/ /i;\
+ /^\d\.\d\.\s+/ && tr/[a-z]/[A-Z]/;\
+ my $$hit_header;\
+ $$header_len=0 unless $$hit_header;\
+ if ($$hit_header) {\
+ print "# ";\
+ for ($$i=1; $$i < $$header_len; $$i++) {print "=";}\
+ print "\n";\
+ };\
+ my $$hit_header;\
+ $$hit_header=0;\
+ $$hit_header=1 if m/^(\d\.)(\d\.)(\d\.)?\s/ && s/^(\d\.)//;\
+ $$header_len = length($$_);\
+ s/^/# /; /^# #{12,}/ && s/^# #/####/;\
+ s/^.*$$// if $$hit_option;\
+ $$hit_option=0;\
+ s/^\n//; s/^#\s*-{20,}//; s/ *$$//;\
+ $$hit_option=1 if s/^#\s+@@//;' config.new
+
$(RM) *.bak
@$(ECHO) "****************************************************"
@$(ECHO) "The output file is config.new."
# AmigaOS
@AMIGAOS_ONLY@OBJS += amiga.o
+@AMIGAOS_ONLY@ifeq ($(shell $(CC) -dumpmachine), m68k-amigaos)
@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -m68020 -noixemul -fbaserel -msmall-code
@AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel
@AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o
+@AMIGAOS_ONLY@else
+@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -Wextra -D__USE_INLINE__ -D__NO_INTUITION_RJ_MACROS
+@AMIGAOS_ONLY@endif
@AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h
$(CAT) config >config~ ;\
$(MV) config.base config ;\
fi
- $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \
- $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.tmp
+ $(SED) 's+^confdir \.+confdir $(CONF_DEST)+' config | \
+ $(SED) 's+^logdir \.+logdir $(LOG_DEST)+' >config.tmp
-@if [ $(check_doc) = 0 ]; then \
$(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\
else \
$(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
$(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \
$(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \
- $(SED) 's+%USER%+$$USER+' | \
+ $(SED) 's+%USER%+$(USER)+' | \
$(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
$(INSTALL) $(INSTALL_P) slackware/rc.privoxy /etc/rc.d/ ;\
$(ECHO) "Installing for Slackware." ;\
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.155 2007/09/22 16:23:25 fabiankeil
+# Update copyright line.
+#
+# Revision 1.154 2007/02/07 11:52:40 fabiankeil
+# Fix suse-dist as described in BR#1654052.
+# (I didn't test it, but it's done the same
+# way in redhat-dist which is known to work).
+#
+# Revision 1.153 2007/01/07 07:36:36 joergs
+# Added AmigaOS4 support.
+#
+# Revision 1.152 2006/12/13 14:53:51 etresoft
+# Include any existing LDFLAGS environment when linking so that a MacOS X Universal Binary can be created.
+#
+# Revision 1.151 2006/11/30 01:08:55 hal9
+# Fix problem with variable declarations in the Slackware section. Thanks to higuita.
+#
+# Revision 1.150 2006/10/25 11:55:45 fabiankeil
+# Fix sed regexes for rewriting "confdir ." and "logdir .".
+# Thanks to Darel Henman for reporting this.
+#
+# Revision 1.149 2006/10/11 01:40:28 hal9
+# Apply patch from Neil McCalden to fix syntax issue.
+#
# Revision 1.148 2006/09/26 10:57:58 hal9
# Including Karsten's patch to fix make create-snapshot.
#