tcpdump-mini: merge r18468 to 8.09

[openwrt/svn-archive/archive.git] / net / miniupnpd / patches / 001-makefile-tweaks.patch

diff --git a/net/miniupnpd/patches/001-makefile-tweaks.patch b/net/miniupnpd/patches/001-makefile-tweaks.patch
index eaed59e112464bb6a05ecfc855a8aa2c9420e093..1af76c5f23bd308f75cf5d22b3590e86e6475e77 100644 (file)
--- a/net/miniupnpd/patches/001-makefile-tweaks.patch
+++ b/net/miniupnpd/patches/001-makefile-tweaks.patch
@@ -1,39 +1,35 @@
-Index: miniupnpd-1.0-RC6/Makefile.openwrt
+Index: Makefile.openwrt
 ===================================================================
---- miniupnpd-1.0-RC6.orig/Makefile.openwrt    2007-06-30 18:30:56.000000000 +0200
-+++ miniupnpd-1.0-RC6/Makefile.openwrt 2007-06-30 18:30:57.000000000 +0200
-@@ -2,7 +2,7 @@
- # http://miniupnp.free.fr/
- # Author : Thomas Bernard
- # for use with GNU Make
+RCS file: /usr/local/cvsroot/miniupnp/miniupnpd/Makefile.openwrt,v
+retrieving revision 1.11
+diff -u -r1.11 miniupnpd-1.1/Makefile.openwrt
+--- miniupnpd-1.1.orig/Makefile.openwrt        29 Jan 2008 12:52:03 -0000      1.11
++++ miniupnpd-1.1/Makefile.openwrt     1 May 2008 22:34:28 -0000
+@@ -6,7 +6,7 @@
+ # your openwrt SDK/etc...
+ # http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=713
+ 
 -include $(TOPDIR)/rules.mk
-+
++#include $(TOPDIR)/rules.mk
  #CFLAGS = -Wall -O -D_GNU_SOURCE -g
  #CFLAGS = -Wall -Os -D_GNU_SOURCE
  #CC = mipsel-linux-gcc
-@@ -11,7 +11,7 @@
- CFLAGS += -D_GNU_SOURCE
+@@ -16,7 +16,8 @@
+ CP = cp
  RM = rm -f
  INSTALL = install
 -IPTABLESINC=$(BUILD_DIR)/iptables-1.3.3/include
 +IPTABLESINC=$(STAGING_DIR)/usr/include
++#IPTABLESINC=$(BUILD_DIR)/iptables-1.3.3/include
+ #IPTABLESINC=$(TOPDIR)/../iptables-1.3.3/include
  
  BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
-            upnpreplyparse.o minixml.o \
-@@ -20,8 +20,6 @@
- 
- LNXOBJS = linux/getifstats.o linux/iptcrdr.o
+@@ -28,7 +29,7 @@
+ NETFILTEROBJS = netfilter/iptcrdr.o
+ ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
  
 -LIBS = $(BUILD_DIR)/iptables-1.3.3/libiptc/libiptc.a
--
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
- 
- EXECUTABLES = miniupnpd testupnpdescgen
-@@ -38,6 +36,7 @@
-       @echo no install for now...
- 
- miniupnpd:    $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+      $(CC) $(CFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
- 
- testupnpdescgen:      $(TESTUPNPDESCGENOBJS)
++#LIBS = $(BUILD_DIR)/iptables-1.3.3/libiptc/libiptc.a
+ #LIBS = $(TOPDIR)/../iptables-1.3.3/libiptc/libiptc.a
  
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o