diff options
Diffstat (limited to 'net/flow-tools/patches/patch-af')
| -rw-r--r-- | net/flow-tools/patches/patch-af | 80 |
1 files changed, 46 insertions, 34 deletions
diff --git a/net/flow-tools/patches/patch-af b/net/flow-tools/patches/patch-af index 67016598af8..ed213195c1d 100644 --- a/net/flow-tools/patches/patch-af +++ b/net/flow-tools/patches/patch-af @@ -1,20 +1,20 @@ -$NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ +$NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $ ---- lib/Makefile.in.orig Thu Dec 12 17:37:40 2002 +--- lib/Makefile.in.orig 2003-05-22 13:32:03.000000000 +0000 +++ lib/Makefile.in -@@ -89,7 +89,7 @@ CFLAGS = -g -Wall - - DEFS = -I. +@@ -120,7 +120,7 @@ target_alias = @target_alias@ + #AM_CFLAGS=-O2 + AM_CFLAGS = -g -Wall -include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h +pkginclude_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h lib_LIBRARIES = libft.a libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \ -@@ -120,30 +120,17 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ +@@ -149,30 +149,17 @@ am_libft_a_OBJECTS = ftio.$(OBJEXT) ftsw + libft_a_OBJECTS = $(am_libft_a_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/strerror.Po $(DEPDIR)/strsep.Po \ @@ -47,16 +47,16 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ SOURCES = $(libft_a_SOURCES) all: ftconfig.h -@@ -153,7 +140,7 @@ all: ftconfig.h +@@ -182,7 +169,7 @@ all: ftconfig.h .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/Makefile -+ $(AUTOMAKE) --gnu --ignore-deps lib/Makefile ++ $(AUTOMAKE) --foreign --ignore-deps lib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -@@ -218,66 +205,29 @@ mostlyclean-compile: +@@ -247,75 +234,29 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -91,17 +91,28 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ - -rm -rf $(DEPDIR) ./$(DEPDIR) - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` --CCDEPMODE = @CCDEPMODE@ +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` uninstall-info-am: -includeHEADERS_INSTALL = $(INSTALL_HEADER) -install-includeHEADERS: $(include_HEADERS) @@ -133,7 +144,7 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ done ETAGS = etags -@@ -346,7 +296,7 @@ check: check-am +@@ -408,7 +349,7 @@ check: check-am all-am: Makefile $(LIBRARIES) $(HEADERS) ftconfig.h installdirs: @@ -142,7 +153,7 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ install: install-am install-exec: install-exec-am -@@ -378,8 +328,8 @@ clean-am: clean-generic clean-libLIBRARI +@@ -440,8 +381,8 @@ clean-am: clean-generic clean-libLIBRARI distclean: distclean-am @@ -153,7 +164,7 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ dvi: dvi-am -@@ -389,7 +339,7 @@ info: info-am +@@ -451,7 +392,7 @@ info: info-am info-am: @@ -162,32 +173,33 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ install-exec-am: install-libLIBRARIES -@@ -407,21 +357,21 @@ mostlyclean: mostlyclean-am +@@ -477,21 +418,21 @@ ps: ps-am - mostlyclean-am: mostlyclean-compile mostlyclean-generic + ps-am: -uninstall-am: uninstall-includeHEADERS uninstall-info-am \ - uninstall-libLIBRARIES +uninstall-am: uninstall-info-am uninstall-libLIBRARIES \ + uninstall-pkgincludeHEADERS - .PHONY: GTAGS all all-am check check-am clean clean-generic \ -- clean-libLIBRARIES distclean distclean-compile distclean-depend \ -+ clean-libLIBRARIES distclean distclean-compile \ - distclean-generic distclean-hdr distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLIBRARIES ctags distclean distclean-compile \ +- distclean-depend distclean-generic distclean-hdr distclean-tags \ +- distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-includeHEADERS install-info install-info-am \ - install-libLIBRARIES install-man install-strip installcheck \ ++ distclean-generic distclean-hdr distclean-tags distdir dvi \ ++ dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-libLIBRARIES install-man \ + install-pkgincludeHEADERS install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic tags uninstall uninstall-am \ -- uninstall-includeHEADERS uninstall-info-am \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-includeHEADERS uninstall-info-am \ - uninstall-libLIBRARIES -+ uninstall-info-am uninstall-libLIBRARIES \ ++ uninstall-am uninstall-info-am uninstall-libLIBRARIES \ + uninstall-pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. |