--- embedaddon/miniupnpd/Makefile	2012/05/29 12:55:57	1.1.1.2
+++ embedaddon/miniupnpd/Makefile	2013/07/22 00:32:35	1.1.1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2012/05/29 12:55:57 misho Exp $
+# $Id: Makefile,v 1.1.1.3 2013/07/22 00:32:35 misho Exp $
 # MiniUPnP project
 # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 # Author: Thomas Bernard
@@ -10,9 +10,20 @@
 # This Makefile is NOT compatible with GNU Make.
 # Linux users, please use Makefile.linux :
 #  make -f Makefile.linux
+#
+# options can be passed to genconfig.sh through CONFIG_OPTIONS :
+# $ CONFIG_OPTIONS="--ipv6 --igd2" make
+#
 
-CFLAGS += -pipe -Wall
-#CFLAGS = -pipe -Wall -O -g -DDEBUG
+CFLAGS ?= -pipe -Os
+#CFLAGS = -pipe -O -g -DDEBUG
+CFLAGS += -ansi
+CFLAGS += -Wall
+CFLAGS += -W
+CFLAGS += -Wstrict-prototypes
+#CFLAGS += -Wdeclaration-after-statement
+#CFLAGS += -Wno-missing-field-initializers
+CFLAGS += -fno-common
 CC ?= gcc
 RM = rm -f
 MV = mv
@@ -31,13 +42,12 @@ FWNAME = ipf
 .endif
 
 # better way to find if we are using ipf or pf
-.if $(OSNAME) == "FreeBSD"
 .if defined(/etc/rc.subr) && defined(/etc/rc.conf)
+.if $(OSNAME) == "FreeBSD"
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if checkyesno ipfilter_enable; then \
           echo "ipf"; else echo "pf"; fi
 .endif
-.endif
 
 .if $(OSNAME) == "NetBSD"
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
@@ -50,6 +60,7 @@ FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if chechyesno ipfilter; then \
           echo "ipf"; else echo "pf"; fi
 .endif
+.endif
 
 .if $(OSNAME) == "Darwin"
 FWNAME = ipfw
@@ -68,25 +79,29 @@ CFLAGS += -m64 -mcmodel=medlow
 STDOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
           upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \
           options.o upnppermissions.o minissdp.o natpmp.o \
-          upnpevents.o upnputils.o getconnstatus.o
-BSDOBJS = bsd/getifstats.o bsd/ifacewatcher.o
-SUNOSOBJS = solaris/getifstats.o bsd/ifacewatcher.o
-MACOBJS = mac/getifstats.o bsd/ifacewatcher.o
-PFOBJS = pf/obsdrdr.o
+          upnpevents.o upnputils.o getconnstatus.o \
+          upnppinhole.o
+BSDOBJS = bsd/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
+SUNOSOBJS = solaris/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
+MACOBJS = mac/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
+PFOBJS = pf/obsdrdr.o pf/pfpinhole.o
 IPFOBJS = ipf/ipfrdr.o
-IPFWOBJS = ipfw/ipfwrdr.o
+IPFWOBJS = ipfw/ipfwrdr.o ipfw/ipfwaux.o
 MISCOBJS = upnpreplyparse.o minixml.o
 
 ALLOBJS = $(STDOBJS) $(MISCOBJS)
 .if $(OSNAME) == "SunOS"
 ALLOBJS += $(SUNOSOBJS)
 TESTGETIFSTATSOBJS = testgetifstats.o solaris/getifstats.o
+TESTGETROUTEOBJS = testgetroute.o upnputils.o bsd/getroute.o
 .elif $(OSNAME) == "Darwin"
 ALLOBJS += $(MACOBJS)
 TESTGETIFSTATSOBJS = testgetifstats.o mac/getifstats.o
+TESTGETROUTEOBJS = testgetroute.o upnputils.o bsd/getroute.o
 .else
 ALLOBJS += $(BSDOBJS)
 TESTGETIFSTATSOBJS = testgetifstats.o bsd/getifstats.o
+TESTGETROUTEOBJS = testgetroute.o upnputils.o bsd/getroute.o
 .endif
 
 .if $(FWNAME) == "pf"
@@ -104,7 +119,7 @@ MINIUPNPDCTLOBJS = miniupnpdctl.o
 
 EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \
               testupnppermissions miniupnpdctl \
-              testgetifaddr
+              testgetifaddr testgetroute
 .if $(OSNAME) == "Darwin"
 LIBS =
 .else
@@ -127,7 +142,7 @@ clean:
 	$(RM) $(STDOBJS) $(BSDOBJS) $(SUNOSOBJS) $(MACOBJS) $(EXECUTABLES) \
 	testupnpdescgen.o \
 	$(MISCOBJS) config.h testgetifstats.o testupnppermissions.o \
-	miniupnpdctl.o testgetifaddr.o \
+	miniupnpdctl.o testgetifaddr.o testgetroute.o \
 	$(PFOBJS) $(IPFOBJS) $(IPFWOBJS)
 
 install:	miniupnpd genuuid
@@ -138,7 +153,7 @@ install:	miniupnpd genuuid
 	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
 	# TODO : install man page correctly
 #	$(INSTALL) -d $(INSTALLMANDIR)
-#	$(INSTALL) miniupnpd.1 $(INSTALLMANDIR)/cat1/miniupnpd.0
+#	$(INSTALL) miniupnpd.8 $(INSTALLMANDIR)/cat8/miniupnpd.0
 
 # genuuid is using the uuid cli tool available under OpenBSD 4.0 in
 # the uuid-1.5.0 package
@@ -157,7 +172,8 @@ genuuid:
 
 depend:	config.h
 	mkdep $(ALLOBJS:.o=.c) testupnpdescgen.c testgetifstats.c \
-    testupnppermissions.c miniupnpdctl.c testgetifaddr.c
+    testupnppermissions.c miniupnpdctl.c testgetifaddr.c \
+	testgetroute.c
 
 miniupnpd: config.h $(ALLOBJS)
 	$(CC) $(CFLAGS) -o $@ $(ALLOBJS) $(LIBS)
@@ -180,13 +196,16 @@ testgetifaddr:	config.h $(TESTGETIFADDROBJS)
 testupnppermissions:	config.h $(TESTUPNPPERMISSIONSOBJS)
 	$(CC) $(CFLAGS) -o $@ $(TESTUPNPPERMISSIONSOBJS)
 
+testgetroute:	config.h $(TESTGETROUTEOBJS)
+	$(CC) $(CFLAGS) -o $@ $(TESTGETROUTEOBJS)
+
 # gmake :
 #	$(CC) $(CFLAGS) -o $@ $^
 # BSDmake :
 #	$(CC) $(CFLAGS) -o $@ $>
 
-config.h:	genconfig.sh
-	./genconfig.sh
+config.h:	genconfig.sh VERSION
+	./genconfig.sh $(CONFIG_OPTIONS)
 
 .SUFFIXES:	.o .c
 .c.o:
@@ -194,4 +213,4 @@ config.h:	genconfig.sh
 
 #	$(CC) $(CFLAGS) -c -o $(.TARGET) $(.IMPSRC)
 
-	
+