-do not call get callback after get_cancel

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

diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index af2817bf901c97e97f00c70f20d0793c9c135511..b9a8e497c8cbad15a6c76d624793c106f8e5e8c9 100644 (file)
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -10,13 +10,15 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 plugindir = $(libdir)/gnunet
 
 dist_pkgcfg_DATA = \
   pt.conf
 
-bin_PROGRAMS = \
-  gnunet-daemon-pt $(PTBIN) 
+libexec_PROGRAMS = \
+  gnunet-daemon-pt 
 
 gnunet_daemon_pt_SOURCES = \
  gnunet-daemon-pt.c 
@@ -30,6 +32,17 @@ gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(GN_LIBINTL)
 
+if HAVE_MHD
+if LINUX
+ VPN_TEST = \
+ test_gnunet_vpn-4_to_6 \
+ test_gnunet_vpn-6_to_4 \
+ test_gnunet_vpn-6_over \
+ test_gnunet_vpn-4_over \
+ test_gns_vpn
+endif
+endif
+
 check_PROGRAMS = $(VPN_TEST)
 
 if ENABLE_TEST_RUN
@@ -40,14 +53,6 @@ EXTRA_DIST = \
  test_gnunet_vpn.conf \
  test_gns_vpn.conf
 
-if HAVE_MHD
- VPN_TEST = \
- test_gnunet_vpn-4_to_6 \
- test_gnunet_vpn-6_to_4 \
- test_gnunet_vpn-6_over \
- test_gnunet_vpn-4_over \
- test_gns_vpn
-endif
 
 
 test_gns_vpn_SOURCES = \
@@ -56,7 +61,7 @@ test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_over_CPPFLAGS = \
+test_gns_vpn_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@
 
 test_gnunet_vpn_4_over_SOURCES = \