1 files changed, 7 insertions, 5 deletions

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 14a4d4e92..c47348b7c 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = miniupnp libnatpmp
+SUBDIRS = .
 
 INCLUDES = -I$(top_srcdir)/src/include
 
@@ -12,7 +12,9 @@ endif
 
 if !MINGW
 
+if HAVE_EXPERIMENTAL
 lib_LTLIBRARIES = libgnunetnat.la
+endif
 
 libgnunetnat_la_SOURCES = \
   upnp.c upnp.h \
@@ -24,16 +26,16 @@ libgnunetnat_la_CFLAGS = \
 
 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
 
+if HAVE_EXPERIMENTAL
 check_PROGRAMS = \
   test-nat
+endif
 
 if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -46,4 +48,4 @@ test_nat_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-endif
\ No newline at end of file
+endif