From a25ea7e439e87a27cdb503bf15bf25461909240f Mon Sep 17 00:00:00 2001 From: Heikki Lindholm Date: Thu, 29 Oct 2009 09:52:26 +0000 Subject: [PATCH] libtool to the rescue! --- src/nat/Makefile.am | 9 +++------ src/nat/libnatpmp/Makefile.am | 4 ++-- src/nat/miniupnp/Makefile.am | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 34f73c00a..89cfba7a9 100644 --- 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 923ab169d..472bcabae 100644 --- 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 cd5e8c7b8..731c41a84 100644 --- 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 \ -- 2.25.1