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 1b53095f33995ca46c223ed020c7f95cb8258d7e..af06528dbe7caf087fbd2e4f79df90fd71dda47f 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -8,11 +8,7 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-if !MINGW
-
-if HAVE_EXPERIMENTAL
 lib_LTLIBRARIES = libgnunetnat.la
-endif
 
 libgnunetnat_la_SOURCES = \
   upnp.c upnp.h \
@@ -24,7 +20,6 @@ libgnunetnat_la_SOURCES = \
   nat.c 
 
 libgnunetnat_la_CFLAGS = \
- -I$(top_scrdir)/include \
  -DDEBUG_UPNP -g -O0
 
 libgnunetnat_la_LIBADD = \
@@ -33,12 +28,11 @@ libgnunetnat_la_LIBADD = \
 
 libgnunetnat_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 0:0:0          \
+  @LIBCURL@
 
-if HAVE_EXPERIMENTAL
 check_PROGRAMS = \
   test-nat
-endif
 
 if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -51,4 +45,3 @@ test_nat_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  @LIBCURL@
-endif