-bringing copyright tags up to FSF standard

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

diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 8164843773c7387a7479a547d983c20043d6933a..7ce3f182f1143a45498071380382eaf940336971 100644 (file)
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -24,7 +25,7 @@ gnunet_daemon_pt_SOURCES = \
  gnunet-daemon-pt.c
 gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/vpn/libgnunetvpn.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/dns/libgnunetdns.la \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
@@ -34,7 +35,29 @@ gnunet_daemon_pt_LDADD = \
 
 if HAVE_TESTING
 if HAVE_MHD
+
 if HAVE_LIBGNURL
+LIB_GNURL=@LIBGNURL@
+CPP_GNURL=@LIBGNURL_CPPFLAGS@
+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
+if MINGW
+ VPN_TEST = \
+ test_gnunet_vpn-4_to_6 \
+ test_gnunet_vpn-6_to_4 \
+ test_gnunet_vpn-6_over \
+ test_gnunet_vpn-4_over
+endif
+else
+if HAVE_LIBCURL
+LIB_GNURL=@LIBCURL@
+CPP_GNURL=@LIBCURL_CPPFLAGS@
 if LINUX
  VPN_TEST = \
  test_gnunet_vpn-4_to_6 \
@@ -51,13 +74,15 @@ if MINGW
  test_gnunet_vpn-4_over
 endif
 endif
+endif
+
 endif
 endif
 
 check_PROGRAMS = $(VPN_TEST)
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -69,48 +94,48 @@ EXTRA_DIST = \
 
 test_gns_vpn_SOURCES = \
  test_gns_vpn.c
-test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gns_vpn_LDADD = -lmicrohttpd $(LIB_GNURL) \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gns_vpn_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(CPP_GNURL) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIB_GNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(LIB_GNURL) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIB_GNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(CPP_GNURL) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIB_GNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(CPP_GNURL) $(AM_CPPFLAGS)
 
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \
+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIB_GNURL) \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CPPFLAGS = \
- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS)
+ $(CPP_GNURL) $(AM_CPPFLAGS)