status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70 from vapier/master 

Linux build clean up
This commit is contained in:
Thomas BERNARD 2014-04-30 00:00:36 +02:00
parent 13037e57b7 9f687cef9c
commit b469fdf0bc
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
miniupnpd/Makefile.linux
View File

@ -25,7 +25,7 @@
CFLAGS ?= -Os CFLAGS ?= -Os
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
CFLAGS += -fno-common CFLAGS += -fno-common
CFLAGS += -D_GNU_SOURCE CPPFLAGS += -D_GNU_SOURCE
CFLAGS += -Wall CFLAGS += -Wall
CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement
#CFLAGS += -Wno-missing-field-initializers #CFLAGS += -Wno-missing-field-initializers
@ -34,6 +34,7 @@ CC ?= gcc
RM = rm -f RM = rm -f
INSTALL = install INSTALL = install
STRIP ?= strip STRIP ?= strip
PKG_CONFIG ?= pkg-config
CP = cp CP = cp
@ -54,39 +55,39 @@ NETFILTEROBJS = netfilter/iptcrdr.o netfilter/iptpinhole.o netfilter/nfct_get.o
ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
PCFILE_FOUND := $(shell pkg-config --exists libiptc; echo $$?) PCFILE_FOUND := $(shell $(PKG_CONFIG) --exists libiptc; echo $$?)
ifeq (${PCFILE_FOUND},0) ifeq (${PCFILE_FOUND},0)
IPTABLESVERSION := $(shell pkg-config --modversion libiptc) IPTABLESVERSION := $(shell $(PKG_CONFIG) --modversion libiptc)
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 )
IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 ) IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
# test if iptables version >= 1.4.3 # test if iptables version >= 1.4.3
TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
ifeq ($(TEST), 1) ifeq ($(TEST), 1)
CFLAGS += -DIPTABLES_143 CPPFLAGS += -DIPTABLES_143
endif endif
CFLAGS += $(shell pkg-config --cflags libiptc) CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
LIBS += $(shell pkg-config --static --libs-only-l libiptc) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
LDFLAGS += $(shell pkg-config --libs-only-L libiptc) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
LDFLAGS += $(shell pkg-config --libs-only-other libiptc) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
else else
ifeq "$(wildcard /etc/gentoo-release )" "" ifeq "$(wildcard /etc/gentoo-release )" ""
LIBS ?= -liptc LDLIBS ?= -liptc
else # gentoo else # gentoo
# 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
# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183 # and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
LIBS ?= -lip4tc LDLIBS ?= -lip4tc
CFLAGS := -DIPTABLES_143 $(CFLAGS) CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS)
endif 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/ CPPFLAGS := $(CPPFLAGS) -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),) ifeq ($(TARGET_OPENWRT),)
@ -97,12 +98,12 @@ IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
# test if iptables version >= 1.4.3 # test if iptables version >= 1.4.3
TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
ifeq ($(TEST), 1) ifeq ($(TEST), 1)
CFLAGS := $(CFLAGS) -DIPTABLES_143 CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
# the following sucks, but works # the following sucks, but works
LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a #LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
else # ifeq ($(TEST), 1) else # ifeq ($(TEST), 1)
LIBS = $(IPTABLESPATH)/libiptc/libiptc.a LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a
endif # ifeq ($(TEST), 1) endif # ifeq ($(TEST), 1)
else # ($(TARGET_OPENWRT),) else # ($(TARGET_OPENWRT),)
# openWRT : # openWRT :
@ -110,12 +111,12 @@ else # ($(TARGET_OPENWRT),)
# the following test has to be verified : # the following test has to be verified :
TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1) TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1)
ifeq ($(TEST), 1) ifeq ($(TEST), 1)
CFLAGS := $(CFLAGS) -DIPTABLES_143 CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
LIBS = -liptc LDLIBS = -liptc
endif # ($(TEST), 1) endif # ($(TEST), 1)
TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1) TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1)
ifeq ($(TEST_LIB), 1) ifeq ($(TEST_LIB), 1)
LIBS = -liptc /usr/lib$(ARCH)/libiptc.a LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a
endif # ($(TEST_LIB), 1) endif # ($(TEST_LIB), 1)
endif # ($(TARGET_OPENWRT),) endif # ($(TARGET_OPENWRT),)
else # ifdef IPTABLESPATH else # ifdef IPTABLESPATH
@ -123,30 +124,30 @@ else # ifdef IPTABLESPATH
# the following test has to be verified : # the following test has to be verified :
TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1) TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1)
ifeq ($(TEST), 1) ifeq ($(TEST), 1)
CFLAGS := $(CFLAGS) -DIPTABLES_143 CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
LIBS = -liptc LDLIBS = -liptc
TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1) TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1)
ifeq ($(TESTIP4TC), 1) ifeq ($(TESTIP4TC), 1)
LIBS := $(LIBS) -lip4tc LDLIBS := $(LDLIBS) -lip4tc
endif # ($(TESTIP4TC), 1) endif # ($(TESTIP4TC), 1)
TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1) TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1)
ifeq ($(TESTIP6TC), 1) ifeq ($(TESTIP6TC), 1)
LIBS := $(LIBS) -lip6tc LDLIBS := $(LDLIBS) -lip6tc
endif # ($(TESTIP6TC), 1) endif # ($(TESTIP6TC), 1)
endif # ($(TEST), 1) endif # ($(TEST), 1)
endif # ifdef IPTABLESPATH endif # ifdef IPTABLESPATH
endif # ifdef PCFILE_FOUND endif # ifdef PCFILE_FOUND
LIBS += -lnfnetlink LDLIBS += -lnfnetlink
TEST := $(shell pkg-config --atleast-version=1.0.2 libnetfilter_conntrack && pkg-config --atleast-version=1.0.3 libmnl && echo 1) TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack && $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1)
ifeq ($(TEST),1) ifeq ($(TEST),1)
CFLAGS += -DUSE_NFCT CPPFLAGS += -DUSE_NFCT
LIBS += $(shell pkg-config --static --libs-only-l libmnl) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
LIBS += $(shell pkg-config --static --libs-only-l libnetfilter_conntrack) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
endif # ($(TEST),1) endif # ($(TEST),1)
LIBS += $(shell pkg-config --static --libs-only-l libssl) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
@ -195,7 +196,7 @@ 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 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 endif
miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS) miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
testupnpdescgen: $(TESTUPNPDESCGENOBJS) testupnpdescgen: $(TESTUPNPDESCGENOBJS)
@ -205,13 +206,13 @@ testupnppermissions: testupnppermissions.o upnppermissions.o
testgetifaddr: testgetifaddr.o getifaddr.o testgetifaddr: testgetifaddr.o getifaddr.o
testgetroute: testgetroute.o linux/getroute.o upnputils.o -lnfnetlink testgetroute: testgetroute.o linux/getroute.o upnputils.o
testasyncsendto: testasyncsendto.o asyncsendto.o upnputils.o \ testasyncsendto: testasyncsendto.o asyncsendto.o upnputils.o \
linux/getroute.o -lnfnetlink linux/getroute.o
testportinuse: testportinuse.o portinuse.o getifaddr.o \ testportinuse: testportinuse.o portinuse.o getifaddr.o \
netfilter/iptcrdr.o $(LIBS) netfilter/iptcrdr.o
miniupnpdctl: miniupnpdctl.o miniupnpdctl: miniupnpdctl.o