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

Diff for /embedaddon/miniupnpd/Makefile between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 12:55:57 version 1.1.1.3, 2013/07/22 00:32:35
Line 10 Line 10
 # This Makefile is NOT compatible with GNU Make.  # This Makefile is NOT compatible with GNU Make.
 # Linux users, please use Makefile.linux :  # Linux users, please use Makefile.linux :
 #  make -f Makefile.linux  #  make -f Makefile.linux
   #
   # options can be passed to genconfig.sh through CONFIG_OPTIONS :
   # $ CONFIG_OPTIONS="--ipv6 --igd2" make
   #
   
CFLAGS += -pipe -WallCFLAGS ?= -pipe -Os
#CFLAGS = -pipe -Wall -O -g -DDEBUG#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  CC ?= gcc
 RM = rm -f  RM = rm -f
 MV = mv  MV = mv
Line 31  FWNAME = ipf Line 42  FWNAME = ipf
 .endif  .endif
   
 # better way to find if we are using ipf or pf  # better way to find if we are using ipf or pf
 .if $(OSNAME) == "FreeBSD"  
 .if defined(/etc/rc.subr) && defined(/etc/rc.conf)  .if defined(/etc/rc.subr) && defined(/etc/rc.conf)
   .if $(OSNAME) == "FreeBSD"
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \  FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if checkyesno ipfilter_enable; then \            if checkyesno ipfilter_enable; then \
           echo "ipf"; else echo "pf"; fi            echo "ipf"; else echo "pf"; fi
 .endif  .endif
 .endif  
   
 .if $(OSNAME) == "NetBSD"  .if $(OSNAME) == "NetBSD"
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \  FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
Line 50  FWNAME != . /etc/rc.subr; . /etc/rc.conf; \ Line 60  FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if chechyesno ipfilter; then \            if chechyesno ipfilter; then \
           echo "ipf"; else echo "pf"; fi            echo "ipf"; else echo "pf"; fi
 .endif  .endif
   .endif
   
 .if $(OSNAME) == "Darwin"  .if $(OSNAME) == "Darwin"
 FWNAME = ipfw  FWNAME = ipfw
Line 68  CFLAGS += -m64 -mcmodel=medlow Line 79  CFLAGS += -m64 -mcmodel=medlow
 STDOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \  STDOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.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 upnputils.o getconnstatus.o          upnpevents.o upnputils.o getconnstatus.o \
BSDOBJS = bsd/getifstats.o bsd/ifacewatcher.o          upnppinhole.o
SUNOSOBJS = solaris/getifstats.o bsd/ifacewatcher.oBSDOBJS = bsd/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
MACOBJS = mac/getifstats.o bsd/ifacewatcher.oSUNOSOBJS = solaris/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
PFOBJS = pf/obsdrdr.oMACOBJS = mac/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
 PFOBJS = pf/obsdrdr.o pf/pfpinhole.o
 IPFOBJS = ipf/ipfrdr.o  IPFOBJS = ipf/ipfrdr.o
IPFWOBJS = ipfw/ipfwrdr.oIPFWOBJS = ipfw/ipfwrdr.o ipfw/ipfwaux.o
 MISCOBJS = upnpreplyparse.o minixml.o  MISCOBJS = upnpreplyparse.o minixml.o
   
 ALLOBJS = $(STDOBJS) $(MISCOBJS)  ALLOBJS = $(STDOBJS) $(MISCOBJS)
 .if $(OSNAME) == "SunOS"  .if $(OSNAME) == "SunOS"
 ALLOBJS += $(SUNOSOBJS)  ALLOBJS += $(SUNOSOBJS)
 TESTGETIFSTATSOBJS = testgetifstats.o solaris/getifstats.o  TESTGETIFSTATSOBJS = testgetifstats.o solaris/getifstats.o
   TESTGETROUTEOBJS = testgetroute.o upnputils.o bsd/getroute.o
 .elif $(OSNAME) == "Darwin"  .elif $(OSNAME) == "Darwin"
 ALLOBJS += $(MACOBJS)  ALLOBJS += $(MACOBJS)
 TESTGETIFSTATSOBJS = testgetifstats.o mac/getifstats.o  TESTGETIFSTATSOBJS = testgetifstats.o mac/getifstats.o
   TESTGETROUTEOBJS = testgetroute.o upnputils.o bsd/getroute.o
 .else  .else
 ALLOBJS += $(BSDOBJS)  ALLOBJS += $(BSDOBJS)
 TESTGETIFSTATSOBJS = testgetifstats.o bsd/getifstats.o  TESTGETIFSTATSOBJS = testgetifstats.o bsd/getifstats.o
   TESTGETROUTEOBJS = testgetroute.o upnputils.o bsd/getroute.o
 .endif  .endif
   
 .if $(FWNAME) == "pf"  .if $(FWNAME) == "pf"
Line 104  MINIUPNPDCTLOBJS = miniupnpdctl.o Line 119  MINIUPNPDCTLOBJS = miniupnpdctl.o
   
 EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \  EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \
               testupnppermissions miniupnpdctl \                testupnppermissions miniupnpdctl \
              testgetifaddr              testgetifaddr testgetroute
 .if $(OSNAME) == "Darwin"  .if $(OSNAME) == "Darwin"
 LIBS =  LIBS =
 .else  .else
Line 127  clean: Line 142  clean:
         $(RM) $(STDOBJS) $(BSDOBJS) $(SUNOSOBJS) $(MACOBJS) $(EXECUTABLES) \          $(RM) $(STDOBJS) $(BSDOBJS) $(SUNOSOBJS) $(MACOBJS) $(EXECUTABLES) \
         testupnpdescgen.o \          testupnpdescgen.o \
         $(MISCOBJS) config.h testgetifstats.o testupnppermissions.o \          $(MISCOBJS) config.h testgetifstats.o testupnppermissions.o \
        miniupnpdctl.o testgetifaddr.o \        miniupnpdctl.o testgetifaddr.o testgetroute.o \
         $(PFOBJS) $(IPFOBJS) $(IPFWOBJS)          $(PFOBJS) $(IPFOBJS) $(IPFWOBJS)
   
 install:        miniupnpd genuuid  install:        miniupnpd genuuid
Line 138  install: miniupnpd genuuid Line 153  install: miniupnpd genuuid
         $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)          $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
         # TODO : install man page correctly          # TODO : install man page correctly
 #       $(INSTALL) -d $(INSTALLMANDIR)  #       $(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  # genuuid is using the uuid cli tool available under OpenBSD 4.0 in
 # the uuid-1.5.0 package  # the uuid-1.5.0 package
Line 157  genuuid: Line 172  genuuid:
   
 depend: config.h  depend: config.h
         mkdep $(ALLOBJS:.o=.c) testupnpdescgen.c testgetifstats.c \          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)  miniupnpd: config.h $(ALLOBJS)
         $(CC) $(CFLAGS) -o $@ $(ALLOBJS) $(LIBS)          $(CC) $(CFLAGS) -o $@ $(ALLOBJS) $(LIBS)
Line 180  testgetifaddr: config.h $(TESTGETIFADDROBJS) Line 196  testgetifaddr: config.h $(TESTGETIFADDROBJS)
 testupnppermissions:    config.h $(TESTUPNPPERMISSIONSOBJS)  testupnppermissions:    config.h $(TESTUPNPPERMISSIONSOBJS)
         $(CC) $(CFLAGS) -o $@ $(TESTUPNPPERMISSIONSOBJS)          $(CC) $(CFLAGS) -o $@ $(TESTUPNPPERMISSIONSOBJS)
   
   testgetroute:   config.h $(TESTGETROUTEOBJS)
           $(CC) $(CFLAGS) -o $@ $(TESTGETROUTEOBJS)
   
 # gmake :  # gmake :
 #       $(CC) $(CFLAGS) -o $@ $^  #       $(CC) $(CFLAGS) -o $@ $^
 # BSDmake :  # BSDmake :
 #       $(CC) $(CFLAGS) -o $@ $>  #       $(CC) $(CFLAGS) -o $@ $>
   
config.h:       genconfig.shconfig.h:       genconfig.sh VERSION
        ./genconfig.sh        ./genconfig.sh $(CONFIG_OPTIONS)
   
 .SUFFIXES:      .o .c  .SUFFIXES:      .o .c
 .c.o:  .c.o:
Line 194  config.h: genconfig.sh Line 213  config.h: genconfig.sh
   
 #       $(CC) $(CFLAGS) -c -o $(.TARGET) $(.IMPSRC)  #       $(CC) $(CFLAGS) -c -o $(.TARGET) $(.IMPSRC)
   
        
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

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