Fix: Cast closure to proper type

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

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 34f73c00a9c2edf1cf5fd76c7ee6531618f1bf57..f0d5639a1627487aed94eddc1e2632a6d76e271f 100644 (file)
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -1,47 +1,127 @@
-SUBDIRS = miniupnp libnatpmp
-
-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
+  NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
+  NATSERVER = gnunet-helper-nat-server-windows.c
+  NATCLIENT = gnunet-helper-nat-client-windows.c
+endif
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  nat.conf
+
+if LINUX
+  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 $(DESTDIR)$(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 $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 endif
+else
+install-exec-hook:
+endif
+
+bin_PROGRAMS = \
+ gnunet-nat
+
+libexec_PROGRAMS = \
+ $(NATBIN) \
+ gnunet-service-nat
+
+
+gnunet_helper_nat_server_SOURCES = \
+ $(NATSERVER)
+
+gnunet_helper_nat_client_SOURCES = \
+ $(NATCLIENT)         
+
+
+gnunet_nat_SOURCES = \
+  gnunet-nat.c nat.h
+gnunet_nat_LDADD = \
+  libgnunetnatnew.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+
 
 if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-lib_LTLIBRARIES = libgnunetnat.la
-
-libgnunetnat_la_SOURCES = \
-  upnp.c upnp.h \
-  natpmp.c natpmp.h \
-  nat.c nat.h
+lib_LTLIBRARIES = \
+  libgnunetnatnew.la 
 
-libgnunetnat_la_CFLAGS = \
- -I$(top_scrdir)/include
+libgnunetnatnew_la_SOURCES = \
+  nat_api.c \
+  nat_api_stun.c nat_stun.h \
+  nat.h
+libgnunetnatnew_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL) @EXT_LIBS@ 
+libgnunetnatnew_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  -version-info 2:0:0
 
-# FIXME should prefer not to use archives
-libgnunetnat_la_LIBADD = \
+gnunet_service_nat_SOURCES = \
+ gnunet-service-nat.c gnunet-service-nat.h \
+ gnunet-service-nat_externalip.c gnunet-service-nat_externalip.h \
+ gnunet-service-nat_stun.c gnunet-service-nat_stun.h \
+ gnunet-service-nat_mini.c gnunet-service-nat_mini.h \
+ gnunet-service-nat_helper.c gnunet-service-nat_helper.h
+gnunet_service_nat_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/nat/miniupnp/libminiupnp.a \
-  $(top_builddir)/src/nat/libnatpmp/libnatpmp.a \
-  $(GN_LIBINTL) @EXT_LIBS@
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt \
+  $(GN_LIBINTL)
 
-libgnunetnat_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+#check_PROGRAMS = \
+#  test_nat \
+#  test_nat_mini \
+#  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;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+ TESTS = $(check_PROGRAMS)
+endif
 
-check_PROGRAMS = \
-  test-nat
+#test_nat_SOURCES = \
+#  test_nat.c
+#test_nat_LDADD = \
+# libgnunetnat.la \
+# $(top_builddir)/src/util/libgnunetutil.la 
 
-TESTS = $(check_PROGRAMS)
+#test_nat_mini_SOURCES = \
+#  test_nat_mini.c
+#test_nat_mini_LDADD = \
+# libgnunetnat.la \
+# $(top_builddir)/src/util/libgnunetutil.la 
 
-test_nat_SOURCES = \
-  test_nat.c
+#test_nat_test_SOURCES = \
+#  test_nat_test.c
+#test_nat_test_LDADD = \
+# libgnunetnat.la \
+# $(top_builddir)/src/util/libgnunetutil.la 
 
-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
+#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 \
+ test_stun.conf