From f68e5cda5acb6f39abaaeec839cb7e7cf2b77053 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Wed, 27 Jun 2012 10:26:20 +0000 Subject: -fix order --- src/vpn/Makefile.am | 65 +---------------------------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) (limited to 'src/vpn/Makefile.am') diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index c079f3711..efd61d775 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -20,14 +20,6 @@ VPNBIN = gnunet-helper-vpn install-exec-hook: $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true -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 else install-exec-hook: endif @@ -40,18 +32,6 @@ lib_LTLIBRARIES = \ bin_PROGRAMS = \ $(VPNBIN) gnunet-service-vpn gnunet-vpn - - -check_PROGRAMS = $(VPN_TEST) - -if ENABLE_TEST_RUN -TESTS = $(check_PROGRAMS) -endif - -EXTRA_DIST = \ - test_gnunet_vpn.conf \ - test_gns_vpn.conf - gnunet_helper_vpn_SOURCES = \ gnunet-helper-vpn.c @@ -82,47 +62,4 @@ libgnunetvpn_la_LIBADD = \ libgnunetvpn_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) -test_gns_vpn_SOURCES = \ - test_gns_vpn.c -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 = \ - @LIBCURL_CPPFLAGS@ - -test_gnunet_vpn_4_over_SOURCES = \ - test_gnunet_vpn.c -test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la -test_gnunet_vpn_4_over_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ - -test_gnunet_vpn_6_over_SOURCES = \ - test_gnunet_vpn.c -test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la -test_gnunet_vpn_6_over_CPPFLAGS = \ - @LIBCURL_CPPFLAGS@ - -test_gnunet_vpn_4_to_6_SOURCES = \ - test_gnunet_vpn.c -test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \ - $(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 = \ - @LIBCURL_CPPFLAGS@ - -test_gnunet_vpn_6_to_4_SOURCES = \ - test_gnunet_vpn.c -test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \ - $(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 = \ - @LIBCURL_CPPFLAGS@ + -- cgit v1.2.3