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

miniupnpc: Fixed Makefile for *BSD

This commit is contained in:
Thomas Bernard 2013-03-23 10:08:43 +01:00
parent 3f1aaef49a
commit 2b2efd4459
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniupnpc/Changelog.txt
View File

@ -1,6 +1,9 @@
$Id: Changelog.txt,v 1.182 2013/03/11 10:19:11 nanard Exp $ $Id: Changelog.txt,v 1.183 2013/03/23 09:05:07 nanard Exp $
miniUPnP client Changelog. miniUPnP client Changelog.
2013/03/23:
Fixed Makefile for *BSD
2013/03/11: 2013/03/11:
Update Makefile to use JNAerator version 0.11 Update Makefile to use JNAerator version 0.11

15
miniupnpc/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.102 2013/03/11 10:19:12 nanard Exp $ # $Id: Makefile,v 1.103 2013/03/23 09:05:07 nanard Exp $
# MiniUPnP Project # MiniUPnP Project
# http://miniupnp.free.fr/ # http://miniupnp.free.fr/
# http://miniupnp.tuxfamily.org/ # http://miniupnp.tuxfamily.org/
@ -85,12 +85,12 @@ ifeq ($(OS), Darwin)
SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS) CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS)
else else
ifeq ($(OS), Linux)
SHAREDLIBRARY = libminiupnpc.so
SONAME = $(SHAREDLIBRARY).$(APIVERSION)
endif
ifeq ($(JARSUFFIX), win32) ifeq ($(JARSUFFIX), win32)
SHAREDLIBRARY = miniupnpc.dll SHAREDLIBRARY = miniupnpc.dll
else
# Linux/BSD/etc.
SHAREDLIBRARY = libminiupnpc.so
SONAME = $(SHAREDLIBRARY).$(APIVERSION)
endif endif
endif endif
@ -244,8 +244,11 @@ testigddescparse: $(TESTIGDDESCPARSE)
miniupnpcstrings.h: miniupnpcstrings.h.in updateminiupnpcstrings.sh VERSION miniupnpcstrings.h: miniupnpcstrings.h.in updateminiupnpcstrings.sh VERSION
$(SH) updateminiupnpcstrings.sh $(SH) updateminiupnpcstrings.sh
# ftp tool supplied with OpenBSD can download files from http.
jnaerator-%.jar: jnaerator-%.jar:
wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@ wget $(JNAERATORBASEURL)/$@ || \
curl -o $@ $(JNAERATORBASEURL)/$@ || \
ftp $(JNAERATORBASEURL)/$@
jar: $(SHAREDLIBRARY) $(JNAERATOR) jar: $(SHAREDLIBRARY) $(JNAERATOR)
$(JAVA) -jar $(JNAERATOR) $(JNAERATORARGS) \ $(JAVA) -jar $(JNAERATOR) $(JNAERATORARGS) \