fix 1678

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

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index dc881a30216d491f3c29c6b24a7f7f9e9d39e716..a795b56fa768daac225cf0de7822eeae8e2f4f17 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,24 +12,32 @@ 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 nat.h \
+  natpmp.h 
 
 libgnunetnat_la_CFLAGS = \
- -I$(top_scrdir)/include
+ -DDEBUG_UPNP -g -O0
 
 libgnunetnat_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) @EXT_LIBS@
+  @LIBCURL@ \
+  $(GN_LIBINTL) @EXT_LIBS@ 
 
 libgnunetnat_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 0:0:0          
 
 check_PROGRAMS = \
   test-nat
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
 
 test_nat_SOURCES = \
   test_nat.c
@@ -39,6 +45,4 @@ 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
-
+ @LIBCURL@