[BACK]Return to Makefile.linux CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / miniupnpd

Diff for /embedaddon/miniupnpd/Makefile.linux between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:16:02 version 1.1.1.2, 2012/05/29 12:55:57
Line 1 Line 1
 # $Id$  # $Id$
 # MiniUPnP project  # MiniUPnP project
   # (c) 2006-2011 Thomas Bernard
 # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/  # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 # Author : Thomas Bernard  # Author : Thomas Bernard
 # for use with GNU Make  # for use with GNU Make
Line 17 Line 18
 # $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux  # $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
 #  #
 #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG  #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
CFLAGS = -Wall -Os -D_GNU_SOURCECFLAGS ?= -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes 
CC = gccCC ?= gcc
 RM = rm -f  RM = rm -f
 INSTALL = install  INSTALL = install
STRIP = stripSTRIP ?= strip
 CP = cp
   
   
 INSTALLPREFIX ?= $(PREFIX)/usr  INSTALLPREFIX ?= $(PREFIX)/usr
 SBININSTALLDIR = $(INSTALLPREFIX)/sbin  SBININSTALLDIR = $(INSTALLPREFIX)/sbin
 ETCINSTALLDIR = $(PREFIX)/etc/miniupnpd  ETCINSTALLDIR = $(PREFIX)/etc/miniupnpd
Line 31  BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpso Line 34  BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpso
            upnpreplyparse.o minixml.o \             upnpreplyparse.o minixml.o \
                    upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \                     upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \
            options.o upnppermissions.o minissdp.o natpmp.o \             options.o upnppermissions.o minissdp.o natpmp.o \
           upnpevents.o           upnpevents.o upnputils.o getconnstatus.o
   
LNXOBJS = linux/getifstats.oLNXOBJS = linux/getifstats.o linux/ifacewatcher.o
 NETFILTEROBJS = netfilter/iptcrdr.o  NETFILTEROBJS = netfilter/iptcrdr.o
   
 ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)  ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
   
LIBS = -liptcifeq "$(wildcard /etc/gentoo-release )" ""
 LIBS ?= -liptc
 else
 # the following is better, at least on gentoo with iptables 1.4.6  # the following is better, at least on gentoo with iptables 1.4.6
 # see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618  # see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618
#LIBS = -lip4tc# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
 LIBS ?= -lip4tc
 CFLAGS := -I/usr/src/linux/include -DIPTABLES_143 $(CFLAGS)
 endif
   
ARCH := $(shell uname -m | grep -q "x86_64" && echo 64)ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64)
 ifdef IPTABLESPATH  ifdef IPTABLESPATH
 CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/  CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/
 LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/  LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/
 # get iptables version and set IPTABLES_143 macro if needed  # get iptables version and set IPTABLES_143 macro if needed
   ifeq ($(TARGET_OPENWRT),)
 IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 )  IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 )
 IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )  IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
 IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )  IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
Line 57  TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) - Line 66  TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -
 ifeq ($(TEST), 1)  ifeq ($(TEST), 1)
 CFLAGS := $(CFLAGS) -DIPTABLES_143  CFLAGS := $(CFLAGS) -DIPTABLES_143
 # the following sucks, but works  # the following sucks, but works
#LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.oLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
 else  else
 LIBS = $(IPTABLESPATH)/libiptc/libiptc.a  LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
 endif  endif
Line 74  LIBS = -liptc /usr/lib$(ARCH)/libiptc.a Line 83  LIBS = -liptc /usr/lib$(ARCH)/libiptc.a
 endif  endif
 endif   endif 
 endif  endif
   endif
   
 TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o  TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
   
Line 105  install: miniupnpd genuuid Line 115  install: miniupnpd genuuid
 # genuuid is using the uuidgen CLI tool which is part of libuuid  # genuuid is using the uuidgen CLI tool which is part of libuuid
 # from the e2fsprogs  # from the e2fsprogs
 genuuid:  genuuid:
        sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`(genuuid||uuidgen) 2>/dev/null`/" miniupnpd.confifeq ($(TARGET_OPENWRT),)
         sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`(genuuid||uuidgen||uuid) 2>/dev/null`/" miniupnpd.conf
 else
         sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/genuuid||$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid) 2>/dev/null`/" miniupnpd.conf
 endif
   
 miniupnpd:      $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS)  miniupnpd:      $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS)
   
Line 132  depend: config.h Line 146  depend: config.h
 miniupnpd.o: config.h upnpglobalvars.h upnppermissions.h miniupnpdtypes.h  miniupnpd.o: config.h upnpglobalvars.h upnppermissions.h miniupnpdtypes.h
 miniupnpd.o: upnphttp.h upnpdescgen.h miniupnpdpath.h getifaddr.h upnpsoap.h  miniupnpd.o: upnphttp.h upnpdescgen.h miniupnpdpath.h getifaddr.h upnpsoap.h
 miniupnpd.o: options.h minissdp.h upnpredirect.h daemonize.h upnpevents.h  miniupnpd.o: options.h minissdp.h upnpredirect.h daemonize.h upnpevents.h
miniupnpd.o: natpmp.h commonrdr.hminiupnpd.o: natpmp.h commonrdr.h upnputils.h ifacewatcher.h
 upnphttp.o: config.h upnphttp.h upnpdescgen.h miniupnpdpath.h upnpsoap.h  upnphttp.o: config.h upnphttp.h upnpdescgen.h miniupnpdpath.h upnpsoap.h
 upnphttp.o: upnpevents.h  upnphttp.o: upnpevents.h
upnpdescgen.o: config.h upnpdescgen.h miniupnpdpath.h upnpglobalvars.hupnpdescgen.o: config.h getifaddr.h upnpredirect.h upnpdescgen.h
upnpdescgen.o: upnppermissions.h miniupnpdtypes.h upnpdescstrings.hupnpdescgen.o: miniupnpdpath.h upnpglobalvars.h upnppermissions.h
 upnpdescgen.o: miniupnpdtypes.h upnpdescstrings.h upnpurns.h getconnstatus.h
 upnpsoap.o: config.h upnpglobalvars.h upnppermissions.h miniupnpdtypes.h  upnpsoap.o: config.h upnpglobalvars.h upnppermissions.h miniupnpdtypes.h
 upnpsoap.o: upnphttp.h upnpsoap.h upnpreplyparse.h upnpredirect.h getifaddr.h  upnpsoap.o: upnphttp.h upnpsoap.h upnpreplyparse.h upnpredirect.h getifaddr.h
upnpsoap.o: getifstats.hupnpsoap.o: getifstats.h getconnstatus.h upnpurns.h
 upnpreplyparse.o: upnpreplyparse.h minixml.h  upnpreplyparse.o: upnpreplyparse.h minixml.h
 minixml.o: minixml.h  minixml.o: minixml.h
 upnpredirect.o: config.h upnpredirect.h upnpglobalvars.h upnppermissions.h  upnpredirect.o: config.h upnpredirect.h upnpglobalvars.h upnppermissions.h
 upnpredirect.o: miniupnpdtypes.h upnpevents.h netfilter/iptcrdr.h commonrdr.h  upnpredirect.o: miniupnpdtypes.h upnpevents.h netfilter/iptcrdr.h commonrdr.h
getifaddr.o: getifaddr.hgetifaddr.o: config.h getifaddr.h
 daemonize.o: daemonize.h config.h  daemonize.o: daemonize.h config.h
 upnpglobalvars.o: config.h upnpglobalvars.h upnppermissions.h  upnpglobalvars.o: config.h upnpglobalvars.h upnppermissions.h
 upnpglobalvars.o: miniupnpdtypes.h  upnpglobalvars.o: miniupnpdtypes.h
Line 153  options.o: miniupnpdtypes.h Line 168  options.o: miniupnpdtypes.h
 upnppermissions.o: config.h upnppermissions.h  upnppermissions.o: config.h upnppermissions.h
 minissdp.o: config.h upnpdescstrings.h miniupnpdpath.h upnphttp.h  minissdp.o: config.h upnpdescstrings.h miniupnpdpath.h upnphttp.h
 minissdp.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h minissdp.h  minissdp.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h minissdp.h
minissdp.o: codelength.hminissdp.o: upnputils.h codelength.h
 natpmp.o: config.h natpmp.h upnpglobalvars.h upnppermissions.h  natpmp.o: config.h natpmp.h upnpglobalvars.h upnppermissions.h
 natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h  natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h
 upnpevents.o: config.h upnpevents.h miniupnpdpath.h upnpglobalvars.h  upnpevents.o: config.h upnpevents.h miniupnpdpath.h upnpglobalvars.h
 upnpevents.o: upnppermissions.h miniupnpdtypes.h upnpdescgen.h  upnpevents.o: upnppermissions.h miniupnpdtypes.h upnpdescgen.h
linux/getifstats.o: getifstats.h config.hupnputils.o: config.h upnputils.h
 getconnstatus.o: getconnstatus.h getifaddr.h
 linux/getifstats.o: config.h getifstats.h
 linux/ifacewatcher.o: config.h ifacewatcher.h config.h minissdp.h
 linux/ifacewatcher.o: miniupnpdtypes.h getifaddr.h upnpglobalvars.h
 linux/ifacewatcher.o: upnppermissions.h natpmp.h
 netfilter/iptcrdr.o: netfilter/iptcrdr.h commonrdr.h config.h  netfilter/iptcrdr.o: netfilter/iptcrdr.h commonrdr.h config.h
 netfilter/iptcrdr.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h  netfilter/iptcrdr.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h
 testupnpdescgen.o: config.h upnpdescgen.h  testupnpdescgen.o: config.h upnpdescgen.h
upnpdescgen.o: config.h upnpdescgen.h miniupnpdpath.h upnpglobalvars.hupnpdescgen.o: config.h getifaddr.h upnpredirect.h upnpdescgen.h
upnpdescgen.o: upnppermissions.h miniupnpdtypes.h upnpdescstrings.hupnpdescgen.o: miniupnpdpath.h upnpglobalvars.h upnppermissions.h
 upnpdescgen.o: miniupnpdtypes.h upnpdescstrings.h upnpurns.h getconnstatus.h
 testgetifstats.o: getifstats.h  testgetifstats.o: getifstats.h
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>