-duplication

diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 396fa0d1657e5f270cb58d6eac369fca0b478a18..a9ae4fa5ed7eabbb535113c03262d585bb0b04fd 100644 (file)
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -1,111 +1,110 @@
-INCLUDES = -I$(top_srcdir)/src/include\r
-\r
-if MINGW\r
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols\r
-endif\r
-\r
-if USE_COVERAGE\r
-  AM_CFLAGS = --coverage -O0\r
-endif\r
-\r
-pkgcfgdir= $(pkgdatadir)/config.d/\r
-\r
-libexecdir= $(pkglibdir)/libexec/\r
-\r
-plugindir = $(libdir)/gnunet\r
-\r
-dist_pkgcfg_DATA = \\r
-  pt.conf\r
-\r
-libexec_PROGRAMS = \\r
-  gnunet-daemon-pt \r
-\r
-gnunet_daemon_pt_SOURCES = \\r
- gnunet-daemon-pt.c \r
-gnunet_daemon_pt_LDADD = \\r
-  $(top_builddir)/src/vpn/libgnunetvpn.la \\r
-  $(top_builddir)/src/mesh/libgnunetmesh.la \\r
-  $(top_builddir)/src/dns/libgnunetdns.la \\r
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \\r
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \\r
-  $(top_builddir)/src/util/libgnunetutil.la \\r
-  $(top_builddir)/src/mesh/libgnunetmesh.la \\r
-  $(GN_LIBINTL)\r
-\r
-if HAVE_MHD\r
-if HAVE_LIBCURL\r
-if LINUX\r
- VPN_TEST = \\r
- test_gnunet_vpn-4_to_6 \\r
- test_gnunet_vpn-6_to_4 \\r
- test_gnunet_vpn-6_over \\r
- test_gnunet_vpn-4_over \\r
- test_gns_vpn\r
-endif\r
-if MINGW\r
- VPN_TEST = \\r
- test_gnunet_vpn-4_to_6 \\r
- test_gnunet_vpn-6_to_4 \\r
- test_gnunet_vpn-6_over \\r
- test_gnunet_vpn-4_over \r
-endif\r
-endif\r
-endif\r
-\r
-check_PROGRAMS = $(VPN_TEST)\r
-\r
-if ENABLE_TEST_RUN\r
-TESTS = $(check_PROGRAMS)\r
-endif\r
-\r
-EXTRA_DIST = \\r
- test_gnunet_vpn.conf \\r
- test_gns_vpn.conf\r
-\r
-\r
-\r
-test_gns_vpn_SOURCES = \\r
- test_gns_vpn.c\r
-test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \\r
- $(top_builddir)/src/namestore/libgnunetnamestore.la \\r
- $(top_builddir)/src/testing/libgnunettesting.la \\r
- $(top_builddir)/src/util/libgnunetutil.la\r
-test_gns_vpn_CPPFLAGS = \\r
- @LIBCURL_CPPFLAGS@\r
-\r
-test_gnunet_vpn_4_over_SOURCES = \\r
- test_gnunet_vpn.c\r
-test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \\r
- $(top_builddir)/src/vpn/libgnunetvpn.la \\r
- $(top_builddir)/src/testing/libgnunettesting.la \\r
- $(top_builddir)/src/util/libgnunetutil.la \r
-test_gnunet_vpn_4_over_CPPFLAGS = \\r
- @LIBCURL_CPPFLAGS@\r
-\r
-test_gnunet_vpn_6_over_SOURCES = \\r
- test_gnunet_vpn.c\r
-test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \\r
- $(top_builddir)/src/vpn/libgnunetvpn.la \\r
- $(top_builddir)/src/testing/libgnunettesting.la \\r
- $(top_builddir)/src/util/libgnunetutil.la \r
-test_gnunet_vpn_6_over_CPPFLAGS = \\r
- @LIBCURL_CPPFLAGS@\r
-\r
-test_gnunet_vpn_4_to_6_SOURCES = \\r
- test_gnunet_vpn.c\r
-test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \\r
- $(top_builddir)/src/vpn/libgnunetvpn.la \\r
- $(top_builddir)/src/testing/libgnunettesting.la \\r
- $(top_builddir)/src/util/libgnunetutil.la \r
-test_gnunet_vpn_4_to_6_CPPFLAGS = \\r
- @LIBCURL_CPPFLAGS@\r
-\r
-test_gnunet_vpn_6_to_4_SOURCES = \\r
- test_gnunet_vpn.c\r
-test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \\r
- $(top_builddir)/src/vpn/libgnunetvpn.la \\r
- $(top_builddir)/src/testing/libgnunettesting.la \\r
- $(top_builddir)/src/util/libgnunetutil.la \r
-test_gnunet_vpn_6_to_4_CPPFLAGS = \\r
- @LIBCURL_CPPFLAGS@\r
-\r
+INCLUDES = -I$(top_srcdir)/src/include
+
+if MINGW
+  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+dist_pkgcfg_DATA = \
+  pt.conf
+
+libexec_PROGRAMS = \
+  gnunet-daemon-pt 
+
+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/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_MHD
+if HAVE_LIBCURL
+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
+endif
+endif
+
+check_PROGRAMS = $(VPN_TEST)
+
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
+
+EXTRA_DIST = \
+ test_gnunet_vpn.conf \
+ test_gns_vpn.conf
+
+
+
+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_gns_vpn_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@
+