From 3f1aaef49a3687513ac451bf01a78b1e5ba70cdc Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 11 Mar 2013 11:22:08 +0100
Subject: [PATCH] miniupnpc: Update Makefile to use JNAerator version 0.11

fix #29
---
 miniupnpc/Changelog.txt |  5 ++++-
 miniupnpc/Makefile      | 19 +++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/miniupnpc/Changelog.txt b/miniupnpc/Changelog.txt
index 9a945a4..5740d37 100644
--- a/miniupnpc/Changelog.txt
+++ b/miniupnpc/Changelog.txt
@@ -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.
 
+2013/03/11:
+  Update Makefile to use JNAerator version 0.11
+
 2013/02/11:
   Fix testminiwget.sh for use with dash
   Use $(DESTDIR) in Makefile
diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile
index 3d919b1..e82e50c 100644
--- a/miniupnpc/Makefile
+++ b/miniupnpc/Makefile
@@ -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
 # http://miniupnp.free.fr/
 # http://miniupnp.tuxfamily.org/
@@ -42,7 +42,12 @@ INSTALL = install
 SH = /bin/sh
 JAVA = java
 # 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/
 #following libs are needed on Solaris
 #LDLIBS=-lsocket -lnsl -lresolv
@@ -239,17 +244,11 @@ testigddescparse:	$(TESTIGDDESCPARSE)
 miniupnpcstrings.h:	miniupnpcstrings.h.in updateminiupnpcstrings.sh VERSION
 	$(SH) updateminiupnpcstrings.sh
 
-jnaerator-0.9.8-shaded.jar:
-	wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
-
-jnaerator-0.9.7.jar:
-	wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
-
-jnaerator-0.9.3.jar:
+jnaerator-%.jar:
 	wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
 
 jar: $(SHAREDLIBRARY)  $(JNAERATOR)
-	$(JAVA) -jar $(JNAERATOR) -library miniupnpc \
+	$(JAVA) -jar $(JNAERATOR) $(JNAERATORARGS) \
 	miniupnpc.h declspec.h upnpcommands.h upnpreplyparse.h \
 	igd_desc_parse.h miniwget.h upnperrors.h $(SHAREDLIBRARY) \
 	-package fr.free.miniupnp -o . -jar java/miniupnpc_$(JARSUFFIX).jar -v