diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-09-14 21:04:12 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-09-14 21:04:12 +0200 |
commit | 13a263894ae13460803d2f7fb1ec3efadaeb79d1 (patch) | |
tree | 42c42df9e482324d27d72d1b4c5ead405eaec0e9 /external/miniupnpc/Makefile | |
parent | Merge pull request #2438 (diff) | |
parent | update miniupnpc (diff) | |
download | monero-13a263894ae13460803d2f7fb1ec3efadaeb79d1.tar.xz |
Merge pull request #2378
b338dad2 update miniupnpc (MaxXor)
Diffstat (limited to 'external/miniupnpc/Makefile')
-rw-r--r-- | external/miniupnpc/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/external/miniupnpc/Makefile b/external/miniupnpc/Makefile index b7826caa1..178fbf5d3 100644 --- a/external/miniupnpc/Makefile +++ b/external/miniupnpc/Makefile @@ -1,9 +1,9 @@ -# $Id: Makefile,v 1.133 2016/01/24 17:24:35 nanard Exp $ +# $Id: Makefile,v 1.134 2016/10/07 09:04:36 nanard Exp $ # MiniUPnP Project # http://miniupnp.free.fr/ # http://miniupnp.tuxfamily.org/ # https://github.com/miniupnp/miniupnp -# (c) 2005-2015 Thomas Bernard +# (c) 2005-2017 Thomas Bernard # to install use : # $ make DESTDIR=/tmp/dummylocation install # or @@ -48,7 +48,7 @@ CFLAGS += -D_XOPEN_SOURCE=600 endif endif #CFLAGS += -ansi -# -DNO_GETADDRINFO +#CFLAGS += -DNO_GETADDRINFO INSTALL = install SH = /bin/sh JAVA = java @@ -65,7 +65,9 @@ JNAERATORARGS = -mode StandaloneJar -runtime JNAerator -library miniupnpc JNAERATORBASEURL = https://repo1.maven.org/maven2/com/nativelibs4java/jnaerator/0.12 ifeq (SunOS, $(OS)) - LDFLAGS=-lsocket -lnsl -lresolv + LDLIBS=-lsocket -lnsl -lresolv + CFLAGS += -D__EXTENSIONS__ + CFLAGS += -std=c99 endif # APIVERSION is used to build SONAME @@ -85,7 +87,9 @@ LIBOBJS = miniwget.o minixml.o igd_desc_parse.o minisoap.o \ connecthostport.o portlistingparse.o receivedata.o upnpdev.o ifneq ($(OS), AmigaOS) +ifeq (,$(findstring CYGWIN,$(OS))) CFLAGS := -fPIC $(CFLAGS) +endif LIBOBJS := $(LIBOBJS) minissdpc.o endif @@ -169,18 +173,18 @@ check: validateminixml validateminiwget validateupnpreplyparse \ everything: all $(EXECUTABLES_ADDTESTS) pythonmodule: $(LIBRARY) miniupnpcmodule.c setup.py - python setup.py build + MAKE=$(MAKE) python setup.py build touch $@ installpythonmodule: pythonmodule - python setup.py install + MAKE=$(MAKE) python setup.py install pythonmodule3: $(LIBRARY) miniupnpcmodule.c setup.py - python3 setup.py build + MAKE=$(MAKE) python3 setup.py build touch $@ installpythonmodule3: pythonmodule3 - python3 setup.py install + MAKE=$(MAKE) python3 setup.py install validateminixml: minixmlvalid @echo "minixml validation test" |