+# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
nat.conf
if LINUX
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
+ $(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 $(libexecdir) $(SUDO_BINARY) || true
+ $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
endif
else
install-exec-hook:
endif
bin_PROGRAMS = \
- gnunet-nat-server
+ gnunet-nat
libexec_PROGRAMS = \
- $(NATBIN)
+ $(NATBIN) \
+ gnunet-service-nat
-gnunet_nat_server_SOURCES = \
- gnunet-nat-server.c nat.h
-gnunet_nat_server_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/util/libgnunetutil.la
-gnunet_nat_server_DEPENDENCIES = \
- libgnunetnat.la
gnunet_helper_nat_server_SOURCES = \
$(NATSERVER)
$(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
+lib_LTLIBRARIES = \
+ libgnunetnatnew.la
-libgnunetnat_la_SOURCES = \
- nat.c nat.h \
- nat_auto.c \
- nat_test.c \
- nat_mini.c
-
-libgnunetnat_la_LIBADD = \
+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@
-
-libgnunetnat_la_LDFLAGS = \
+libgnunetnatnew_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
- -version-info 1:0:1
+ -version-info 2:0:0
+
+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/statistics/libgnunetstatistics.la \
+ $(LIBGCRYPT_LIBS) \
+ -lgcrypt \
+ $(GN_LIBINTL)
-check_PROGRAMS = \
- test_nat \
- test_nat_mini \
- test_nat_test
+#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;
+ 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
-test_nat_SOURCES = \
- test_nat.c
-test_nat_LDADD = \
- $(top_builddir)/src/nat/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 \
- $(top_builddir)/src/util/libgnunetutil.la
-
-
-test_nat_test_SOURCES = \
- test_nat_test.c
-test_nat_test_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
+#test_nat_SOURCES = \
+# test_nat.c
+#test_nat_LDADD = \
+# libgnunetnat.la \
+# $(top_builddir)/src/util/libgnunetutil.la
+
+#test_nat_mini_SOURCES = \
+# test_nat_mini.c
+#test_nat_mini_LDADD = \
+# libgnunetnat.la \
+# $(top_builddir)/src/util/libgnunetutil.la
+
+#test_nat_test_SOURCES = \
+# test_nat_test.c
+#test_nat_test_LDADD = \
+# 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
+ test_nat_test_data.conf \
+ test_stun.conf