Fix W32 interface listing, and correctly copy addr in test-nat (patch by LRN)

[oweals/gnunet.git] / src / nat / Makefile.am

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 89cfba7a912e1c7a5379e2adf55d05b29dd62e65..af06528dbe7caf087fbd2e4f79df90fd71dda47f 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = miniupnp libnatpmp
-
 INCLUDES = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -14,31 +12,36 @@ lib_LTLIBRARIES = libgnunetnat.la
 
 libgnunetnat_la_SOURCES = \
   upnp.c upnp.h \
-  natpmp.c natpmp.h \
-  nat.c nat.h
+  upnp-commands.c upnp-commands.h \
+  upnp-discover.c upnp-discover.h \
+  upnp-igd-parse.c upnp-igd-parse.h \
+  upnp-minixml.c upnp-minixml.h \
+  upnp-reply-parse.c upnp-reply-parse.h bsdqueue.h \
+  nat.c 
 
 libgnunetnat_la_CFLAGS = \
- -I$(top_scrdir)/include
+ -DDEBUG_UPNP -g -O0
 
 libgnunetnat_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/nat/miniupnp/libminiupnp.la \
-  $(top_builddir)/src/nat/libnatpmp/libnatpmp.la \
-  $(GN_LIBINTL) @EXT_LIBS@
+  $(GN_LIBINTL) @EXT_LIBS@ 
 
 libgnunetnat_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 0:0:0          \
+  @LIBCURL@
 
 check_PROGRAMS = \
   test-nat
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_nat_SOURCES = \
   test_nat.c
 
 test_nat_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
+ $(top_builddir)/src/util/libgnunetutil.la \
+ @LIBCURL@