projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Mention new filter types and the 'D' option.
[privoxy.git]
/
GNUmakefile.in
diff --git
a/GNUmakefile.in
b/GNUmakefile.in
index
638f947
..
5de6ab5
100644
(file)
--- a/
GNUmakefile.in
+++ b/
GNUmakefile.in
@@
-1,6
+1,6
@@
# Note: Makefile is built automatically from Makefile.in
#
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.15
1 2006/11/30 01:08:55 hal9
Exp $
+# $Id: GNUmakefile.in,v 1.15
3 2007/01/07 07:36:36 joergs
Exp $
#
# Written by and Copyright (C) 2001 - 2004 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Written by and Copyright (C) 2001 - 2004 the SourceForge
# Privoxy team. http://www.privoxy.org/
@@
-482,7
+482,7
@@
suse-dist: rpm-stuff
# fi
$(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
# fi
$(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-rh.spec" --exclude "privoxy-cl.spec" --exclude "PACKAGERS" -czf $(TAR_ARCH) .
- $(RPM) --clean -ta $(TAR_ARCH)
+ $(RPM
BUILD
) --clean -ta $(TAR_ARCH)
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
# anonymously ncftps the rpms to sourceforge
if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
# anonymously ncftps the rpms to sourceforge
@@
-1000,9
+1000,13
@@
w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ic
# AmigaOS
@AMIGAOS_ONLY@OBJS += amiga.o
# 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@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
@AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h
@@
-1355,6
+1359,12
@@
coffee:
## end:
# $Log: GNUmakefile.in,v $
## end:
# $Log: GNUmakefile.in,v $
+# 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.151 2006/11/30 01:08:55 hal9
# Fix problem with variable declarations in the Slackware section. Thanks to higuita.
#