[vino] Convert server/miniupnp to build non-recursively

[David King <davidk src gnome org>]

commit e5e2c837a2184776c9e970ee96f54981fc34b8ef
Author: David King <amigadave amigadave com>
Date:   Tue Mar 1 21:24:51 2011 +0100

    Convert server/miniupnp to build non-recursively

 .gitignore                  |    5 ++++-
 Makefile.am                 |   31 +++++++++++++++++++++++++++++--
 configure.ac                |    1 -
 server/miniupnp/Makefile.am |   30 ------------------------------
 4 files changed, 33 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80609be..5b44bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *~
 Makefile
 Makefile.in
+/.deps
+/.libs
 /*.tar.gz
 /ABOUT-NLS
 /INSTALL
@@ -25,6 +27,7 @@ Makefile.in
 /intltool-extract.in
 /intltool-merge.in
 /intltool-update.in
+/libminiupnp.la
 /libtool
 /mkinstalldirs
 /m4/
@@ -61,8 +64,8 @@ Makefile.in
 /server/miniupnp/*.o
 /server/miniupnp/*.lo
 /server/miniupnp/.deps
+/server/miniupnp/.dirstamp
 /server/miniupnp/.libs
-/server/miniupnp/libminiupnp.la
 /server/smclient/*.o
 /server/smclient/*.lo
 /server/smclient/.deps
diff --git a/Makefile.am b/Makefile.am
index 8e0e664..32dc398 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,33 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = docs po server/libvncserver server/miniupnp server/smclient
+SUBDIRS = docs po server/libvncserver server/smclient
 
 DISTCHECK_CONFIGURE_FLAGS = --with-avahi --with-libnotify --with-gnome-keyring --with-network-manager --with-telepathy --with-gnutls --with-gcrypt --with-zlib --with-jpeg --enable-debug --enable-http-server
 
+noinst_LTLIBRARIES = libminiupnp.la
+
+libminiupnp_la_CPPFLAGS = -DNDEBUG
+
+libminiupnp_la_SOURCES = \
+	server/miniupnp/bsdqueue.h \
+	server/miniupnp/codelength.h \
+	server/miniupnp/declspec.h \
+	server/miniupnp/igd_desc_parse.c \
+	server/miniupnp/igd_desc_parse.h \
+	server/miniupnp/minisoap.c \
+	server/miniupnp/minisoap.h \
+	server/miniupnp/minissdpc.c \
+	server/miniupnp/minissdpc.h \
+	server/miniupnp/miniupnpc.c \
+	server/miniupnp/miniupnpc.h \
+	server/miniupnp/miniwget.c \
+	server/miniupnp/miniwget.h \
+	server/miniupnp/minixml.c \
+	server/miniupnp/minixml.h \
+	server/miniupnp/upnpcommands.c \
+	server/miniupnp/upnpcommands.h \
+	server/miniupnp/upnpreplyparse.c \
+	server/miniupnp/upnpreplyparse.h
+
 vino_server_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/common \
@@ -29,7 +54,7 @@ libexec_PROGRAMS = vino-server
 
 vino_server_LDADD = \
 	$(top_builddir)/server/libvncserver/libvncserver.la \
-	$(top_builddir)/server/miniupnp/libminiupnp.la \
+	libminiupnp.la \
 	$(top_builddir)/server/smclient/libeggsmclient.la \
 	$(VINO_SERVER_LIBS) \
 	$(LIBNOTIFY_LIBS) \
@@ -238,6 +263,8 @@ dist_noinst_DATA = \
 	server/vino-server.desktop.in.in \
 	server/org.freedesktop.Telepathy.Client.Vino.service.in \
 	server/dbus-interface.xml \
+	server/miniupnp/README \
+	server/miniupnp/LICENCE \
 	\
 	MAINTAINERS \
 	intltool-extract.in \
diff --git a/configure.ac b/configure.ac
index c492469..e7e5634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,6 @@ Makefile
 server/libvncserver/Makefile
 server/libvncserver/ifaddr/Makefile
 server/libvncserver/rfb/Makefile
-server/miniupnp/Makefile
 server/smclient/Makefile
 capplet/vino-preferences.desktop.in
 docs/Makefile