X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2FMakefile.am;h=c47348b7c8b3ea2f39877f726ab8cabb712f931c;hb=b69cbe3e0c7be5a7c2c22ca945ecf5a0d74c1dac;hp=57be6832d5cdc5842921638d0e9ba228f5cbf030;hpb=0eb708afde86ce4e342bb19b7caac55e314c04c1;p=oweals%2Fgnunet.git

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 57be6832d..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,18 +26,20 @@ 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)
+endif
 
 test_nat_SOURCES = \
   test_nat.c
@@ -44,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