Commit rewrite before moving to GNUNET_NAT functions

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

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index e27611ba9114f3284e65e07aca60876f3489c549..063b8e3ab6294104a460d2d7aef83ba688beb4db 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -21,6 +22,14 @@ if LINUX
 install-exec-hook:
        $(top_srcdir)/src/nat/install-nat-helper.sh $(libexecdir) $(SUDO_BINARY) || true
 else
+if XFREEBSD
+  NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
+  NATSERVER = gnunet-helper-nat-server.c
+  NATCLIENT = gnunet-helper-nat-client.c
+install-exec-hook:
+       $(top_srcdir)/src/nat/install-nat-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+endif
+else
 install-exec-hook:
 endif
 
@@ -33,10 +42,8 @@ libexec_PROGRAMS = \
 gnunet_nat_server_SOURCES = \
  gnunet-nat-server.c nat.h
 gnunet_nat_server_LDADD = \
-  $(top_builddir)/src/nat/libgnunetnat.la \
+  libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_nat_server_DEPENDENCIES = \
-  libgnunetnat.la
 
 gnunet_helper_nat_server_SOURCES = \
  $(NATSERVER)
@@ -56,7 +63,8 @@ libgnunetnat_la_SOURCES = \
   nat.c nat.h \
   nat_auto.c \
   nat_test.c \
-  nat_mini.c 
+  nat_mini.c \
+  nat_stun.c
 
 libgnunetnat_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -64,37 +72,44 @@ libgnunetnat_la_LIBADD = \
 
 libgnunetnat_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 1:1:1
 
 check_PROGRAMS = \
   test_nat \
   test_nat_mini \
-  test_nat_test
+  test_nat_test \
+  test_stun
 
 if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
  TESTS = $(check_PROGRAMS)
 endif
 
 test_nat_SOURCES = \
   test_nat.c
 test_nat_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_nat_mini_SOURCES = \
   test_nat_mini.c
 test_nat_mini_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 
 test_nat_test_SOURCES = \
   test_nat_test.c
 test_nat_test_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
+test_stun_SOURCES = \
+  test_stun.c
+test_stun_LDADD = \
+ libgnunetnat.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
 
 EXTRA_DIST = \
  test_nat_data.conf \
- test_nat_test_data.conf 
\ No newline at end of file
+ test_nat_test_data.conf