X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpt%2FMakefile.am;h=2bec1632995ff8a9905d80620545dd7bd7a01603;hb=372afebb55cc8b40d5f7115a398564e6ffd61434;hp=a9ae4fa5ed7eabbb535113c03262d585bb0b04fd;hpb=a4de07fd32aa846b48da80980da97e292bdae691;p=oweals%2Fgnunet.git diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index a9ae4fa5e..2bec16329 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/src/include +AM_CPPFLAGS = -I$(top_srcdir)/src/include if MINGW WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols @@ -18,21 +18,23 @@ dist_pkgcfg_DATA = \ pt.conf libexec_PROGRAMS = \ - gnunet-daemon-pt + gnunet-daemon-pt gnunet_daemon_pt_SOURCES = \ - gnunet-daemon-pt.c + gnunet-daemon-pt.c gnunet_daemon_pt_LDADD = \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/mesh/libgnunetmesh.la \ + $(top_builddir)/src/dht/libgnunetdht.la \ $(top_builddir)/src/dns/libgnunetdns.la \ $(top_builddir)/src/dns/libgnunetdnsparser.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) +if HAVE_TESTING if HAVE_MHD -if HAVE_LIBCURL +if HAVE_LIBGNURL if LINUX VPN_TEST = \ test_gnunet_vpn-4_to_6 \ @@ -46,7 +48,8 @@ if MINGW test_gnunet_vpn-4_to_6 \ test_gnunet_vpn-6_to_4 \ test_gnunet_vpn-6_over \ - test_gnunet_vpn-4_over + test_gnunet_vpn-4_over +endif endif endif endif @@ -65,46 +68,48 @@ EXTRA_DIST = \ test_gns_vpn_SOURCES = \ test_gns_vpn.c -test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ $(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 = \ - @LIBCURL_CPPFLAGS@ + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_4_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_4_over_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_6_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_6_over_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_4_to_6_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_4_to_6_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) test_gnunet_vpn_6_to_4_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \ +test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_6_to_4_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ + @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) +