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

miniupnpc: Update Makefile to use JNAerator version 0.11 

fix #29
This commit is contained in:
Thomas Bernard 2013-03-11 11:22:08 +01:00
parent 01ec54aec3
commit 3f1aaef49a
2 changed files with 13 additions and 11 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.181 2013/02/11 10:31:17 nanard Exp $ $Id: Changelog.txt,v 1.182 2013/03/11 10:19:11 nanard Exp $
miniUPnP client Changelog. miniUPnP client Changelog.
2013/03/11:
Update Makefile to use JNAerator version 0.11
2013/02/11: 2013/02/11:
Fix testminiwget.sh for use with dash Fix testminiwget.sh for use with dash
Use $(DESTDIR) in Makefile Use $(DESTDIR) in Makefile

19
miniupnpc/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.96 2012/06/23 22:30:42 nanard Exp $ # $Id: Makefile,v 1.102 2013/03/11 10:19:12 nanard Exp $
# MiniUPnP Project # MiniUPnP Project
# http://miniupnp.free.fr/ # http://miniupnp.free.fr/
# http://miniupnp.tuxfamily.org/ # http://miniupnp.tuxfamily.org/
@ -42,7 +42,12 @@ INSTALL = install
SH = /bin/sh SH = /bin/sh
JAVA = java JAVA = java
# see http://code.google.com/p/jnaerator/ # see http://code.google.com/p/jnaerator/
JNAERATOR = jnaerator-0.9.7.jar #JNAERATOR = jnaerator-0.9.7.jar
#JNAERATOR = jnaerator-0.9.8-shaded.jar
#JNAERATORARGS = -library miniupnpc
#JNAERATOR = jnaerator-0.10-shaded.jar
JNAERATOR = jnaerator-0.11-shaded.jar
JNAERATORARGS = -mode StandaloneJar -runtime JNAerator -library miniupnpc
JNAERATORBASEURL = http://jnaerator.googlecode.com/files/ JNAERATORBASEURL = http://jnaerator.googlecode.com/files/
#following libs are needed on Solaris #following libs are needed on Solaris
#LDLIBS=-lsocket -lnsl -lresolv #LDLIBS=-lsocket -lnsl -lresolv
@ -239,17 +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
jnaerator-0.9.8-shaded.jar: jnaerator-%.jar:
wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
jnaerator-0.9.7.jar:
wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
jnaerator-0.9.3.jar:
wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@ wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
jar: $(SHAREDLIBRARY) $(JNAERATOR) jar: $(SHAREDLIBRARY) $(JNAERATOR)
$(JAVA) -jar $(JNAERATOR) -library miniupnpc \ $(JAVA) -jar $(JNAERATOR) $(JNAERATORARGS) \
miniupnpc.h declspec.h upnpcommands.h upnpreplyparse.h \ miniupnpc.h declspec.h upnpcommands.h upnpreplyparse.h \
igd_desc_parse.h miniwget.h upnperrors.h $(SHAREDLIBRARY) \ igd_desc_parse.h miniwget.h upnperrors.h $(SHAREDLIBRARY) \
-package fr.free.miniupnp -o . -jar java/miniupnpc_$(JARSUFFIX).jar -v -package fr.free.miniupnp -o . -jar java/miniupnpc_$(JARSUFFIX).jar -v