(no commit message)

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

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 14a4d4e922b187aa9cd431965ef3bee32b150f48..3ca896bac729d954778d3c8f4e8980c19e6c9d95 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
@@ -16,21 +14,25 @@ lib_LTLIBRARIES = libgnunetnat.la
 
 libgnunetnat_la_SOURCES = \
   upnp.c upnp.h \
-  natpmp.c natpmp.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
+ -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
@@ -44,6 +46,6 @@ test_nat_SOURCES = \
 
 test_nat_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-endif
\ No newline at end of file
+ $(top_builddir)/src/util/libgnunetutil.la \
+ @LIBCURL@
+endif