diff options
author | Heikki Lindholm <holin@iki.fi> | 2009-10-29 09:52:26 +0000 |
---|---|---|
committer | Heikki Lindholm <holin@iki.fi> | 2009-10-29 09:52:26 +0000 |
commit | a25ea7e439e87a27cdb503bf15bf25461909240f (patch) | |
tree | c95205d06dc608330a24b5bdf0f36061cfb9e67c /src/nat | |
parent | f3374052ea793801f5ca2921017a3354648f5a1f (diff) | |
download | gnunet-a25ea7e439e87a27cdb503bf15bf25461909240f.tar.gz gnunet-a25ea7e439e87a27cdb503bf15bf25461909240f.zip |
libtool to the rescue!
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/Makefile.am | 9 | ||||
-rw-r--r-- | src/nat/libnatpmp/Makefile.am | 4 | ||||
-rw-r--r-- | 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 = \ | |||
20 | libgnunetnat_la_CFLAGS = \ | 20 | libgnunetnat_la_CFLAGS = \ |
21 | -I$(top_scrdir)/include | 21 | -I$(top_scrdir)/include |
22 | 22 | ||
23 | # FIXME should prefer not to use archives | ||
24 | libgnunetnat_la_LIBADD = \ | 23 | libgnunetnat_la_LIBADD = \ |
25 | $(top_builddir)/src/util/libgnunetutil.la \ | 24 | $(top_builddir)/src/util/libgnunetutil.la \ |
26 | $(top_builddir)/src/nat/miniupnp/libminiupnp.a \ | 25 | $(top_builddir)/src/nat/miniupnp/libminiupnp.la \ |
27 | $(top_builddir)/src/nat/libnatpmp/libnatpmp.a \ | 26 | $(top_builddir)/src/nat/libnatpmp/libnatpmp.la \ |
28 | $(GN_LIBINTL) @EXT_LIBS@ | 27 | $(GN_LIBINTL) @EXT_LIBS@ |
29 | 28 | ||
30 | libgnunetnat_la_LDFLAGS = \ | 29 | libgnunetnat_la_LDFLAGS = \ |
@@ -41,7 +40,5 @@ test_nat_SOURCES = \ | |||
41 | 40 | ||
42 | test_nat_LDADD = \ | 41 | test_nat_LDADD = \ |
43 | $(top_builddir)/src/nat/libgnunetnat.la \ | 42 | $(top_builddir)/src/nat/libgnunetnat.la \ |
44 | $(top_builddir)/src/util/libgnunetutil.la \ | 43 | $(top_builddir)/src/util/libgnunetutil.la |
45 | $(top_builddir)/src/nat/miniupnp/libminiupnp.a \ | ||
46 | $(top_builddir)/src/nat/libnatpmp/libnatpmp.a | ||
47 | 44 | ||
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 @@ | |||
1 | noinst_LIBRARIES = libnatpmp.a | 1 | noinst_LTLIBRARIES = libnatpmp.la |
2 | 2 | ||
3 | AM_CPPFLAGS = -DENABLE_STRNATPMPERR | 3 | AM_CPPFLAGS = -DENABLE_STRNATPMPERR |
4 | 4 | ||
5 | libnatpmp_a_SOURCES = \ | 5 | libnatpmp_la_SOURCES = \ |
6 | getgateway.c \ | 6 | getgateway.c \ |
7 | natpmp.c | 7 | natpmp.c |
8 | 8 | ||
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 @@ | |||
1 | noinst_LIBRARIES = libminiupnp.a | 1 | noinst_LTLIBRARIES = libminiupnp.la |
2 | 2 | ||
3 | AM_CPPFLAGS = -DNDEBUG | 3 | AM_CPPFLAGS = -DNDEBUG |
4 | 4 | ||
5 | libminiupnp_a_SOURCES = \ | 5 | libminiupnp_la_SOURCES = \ |
6 | igd_desc_parse.c \ | 6 | igd_desc_parse.c \ |
7 | minisoap.c \ | 7 | minisoap.c \ |
8 | minissdpc.c \ | 8 | minissdpc.c \ |