projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix doxygen warning
[oweals/gnunet.git]
/
src
/
nat
/
Makefile.am
diff --git
a/src/nat/Makefile.am
b/src/nat/Makefile.am
index 34f73c00a9c2edf1cf5fd76c7ee6531618f1bf57..c47348b7c8b3ea2f39877f726ab8cabb712f931c 100644
(file)
--- a/
src/nat/Makefile.am
+++ b/
src/nat/Makefile.am
@@
-1,4
+1,4
@@
-SUBDIRS =
miniupnp libnatpmp
+SUBDIRS =
.
INCLUDES = -I$(top_srcdir)/src/include
INCLUDES = -I$(top_srcdir)/src/include
@@
-10,38
+10,42
@@
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
+if !MINGW
+
+if HAVE_EXPERIMENTAL
lib_LTLIBRARIES = libgnunetnat.la
lib_LTLIBRARIES = libgnunetnat.la
+endif
libgnunetnat_la_SOURCES = \
upnp.c upnp.h \
natpmp.c natpmp.h \
libgnunetnat_la_SOURCES = \
upnp.c upnp.h \
natpmp.c natpmp.h \
- nat.c
nat.h
+ nat.c
libgnunetnat_la_CFLAGS = \
-I$(top_scrdir)/include
libgnunetnat_la_CFLAGS = \
-I$(top_scrdir)/include
-# FIXME should prefer not to use archives
libgnunetnat_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunetnat_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/nat/miniupnp/libminiupnp.a \
- $(top_builddir)/src/nat/libnatpmp/libnatpmp.a \
- $(GN_LIBINTL) @EXT_LIBS@
+ $(GN_LIBINTL) @EXT_LIBS@
libgnunetnat_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
libgnunetnat_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
+if HAVE_EXPERIMENTAL
check_PROGRAMS = \
test-nat
check_PROGRAMS = \
test-nat
+endif
+if !DISABLE_TEST_RUN
TESTS = $(check_PROGRAMS)
TESTS = $(check_PROGRAMS)
+endif
test_nat_SOURCES = \
test_nat.c
test_nat_LDADD = \
$(top_builddir)/src/nat/libgnunetnat.la \
test_nat_SOURCES = \
test_nat.c
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
+ $(top_builddir)/src/util/libgnunetutil.la
+endif