libtool to the rescue!

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 34f73c00a9c2edf1cf5fd76c7ee6531618f1bf57..89cfba7a912e1c7a5379e2adf55d05b29dd62e65 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -20,11 +20,10 @@ libgnunetnat_la_SOURCES = \
 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_SOURCES = \
 
 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
 

diff --git a/src/nat/libnatpmp/Makefile.am b/src/nat/libnatpmp/Makefile.am
index 923ab169d691c127db6aec7d0c1dfab47e04568b..472bcabae7fe07c1aebeec3abb12b9e3e80214dd 100644 (file)
--- a/src/nat/libnatpmp/Makefile.am
+++ b/src/nat/libnatpmp/Makefile.am
@@ -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
 

diff --git a/src/nat/miniupnp/Makefile.am b/src/nat/miniupnp/Makefile.am
index cd5e8c7b83de1b796bf854bd5846a103ecbdb6d6..731c41a84dc5cb30c3d25af5ec2d94efa2dd391d 100644 (file)
--- a/src/nat/miniupnp/Makefile.am
+++ b/src/nat/miniupnp/Makefile.am
@@ -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 \