[GNUnet-SVN] r9337 - in gnunet/src/nat: . libnatpmp miniupnp

[gnunet]

Author: holindho
Date: 2009-10-29 03:52:26 -0600 (Thu, 29 Oct 2009)
New Revision: 9337

Modified:
   gnunet/src/nat/Makefile.am
   gnunet/src/nat/libnatpmp/Makefile.am
   gnunet/src/nat/miniupnp/Makefile.am
Log:
libtool to the rescue!


Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am  2009-10-29 09:35:38 UTC (rev 9336)
+++ gnunet/src/nat/Makefile.am  2009-10-29 09:52:26 UTC (rev 9337)
@@ -20,11 +20,10 @@
 libgnunetnat_la_CFLAGS = \
  -I$(top_scrdir)/include
 
-# FIXME should prefer not to use archives
 libgnunetnat_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/nat/miniupnp/libminiupnp.a \
-  $(top_builddir)/src/nat/libnatpmp/libnatpmp.a \
+  $(top_builddir)/src/nat/miniupnp/libminiupnp.la \
+  $(top_builddir)/src/nat/libnatpmp/libnatpmp.la \
   $(GN_LIBINTL) @EXT_LIBS@
 
 libgnunetnat_la_LDFLAGS = \
@@ -41,7 +40,5 @@
 
 test_nat_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/nat/miniupnp/libminiupnp.a \
- $(top_builddir)/src/nat/libnatpmp/libnatpmp.a
+ $(top_builddir)/src/util/libgnunetutil.la
 

Modified: gnunet/src/nat/libnatpmp/Makefile.am
===================================================================
--- gnunet/src/nat/libnatpmp/Makefile.am        2009-10-29 09:35:38 UTC (rev 
9336)
+++ gnunet/src/nat/libnatpmp/Makefile.am        2009-10-29 09:52:26 UTC (rev 
9337)
@@ -1,8 +1,8 @@
-noinst_LIBRARIES = libnatpmp.a
+noinst_LTLIBRARIES = libnatpmp.la
 
 AM_CPPFLAGS = -DENABLE_STRNATPMPERR
 
-libnatpmp_a_SOURCES = \
+libnatpmp_la_SOURCES = \
     getgateway.c \
     natpmp.c
 

Modified: gnunet/src/nat/miniupnp/Makefile.am
===================================================================
--- gnunet/src/nat/miniupnp/Makefile.am 2009-10-29 09:35:38 UTC (rev 9336)
+++ gnunet/src/nat/miniupnp/Makefile.am 2009-10-29 09:52:26 UTC (rev 9337)
@@ -1,8 +1,8 @@
-noinst_LIBRARIES = libminiupnp.a
+noinst_LTLIBRARIES = libminiupnp.la
 
 AM_CPPFLAGS = -DNDEBUG
 
-libminiupnp_a_SOURCES = \
+libminiupnp_la_SOURCES = \
     igd_desc_parse.c \
     minisoap.c \
     minissdpc.c \