does not terminate on invalid uri

[oweals/gnunet.git] / src / peerinfo-tool / Makefile.am

diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 25885a34cd639e24452dbfb8eab1e014b36df607..bd8dfbd4a2e85380f7fbccc39e1b45fee2507377 100644 (file)
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -13,16 +13,33 @@ bin_PROGRAMS = \
  gnunet-peerinfo 
 
 gnunet_peerinfo_SOURCES = \
- gnunet-peerinfo.c         
+ gnunet-peerinfo.c \
+ gnunet-peerinfo_plugins.c gnunet-peerinfo_plugins.h
+
 gnunet_peerinfo_LDADD = \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
-
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
  test_gnunet_peerinfo.py 
 endif
 
-TESTS = $(check_SCRIPTS) 
+if ENABLE_TEST_RUN
+TESTS = $(check_SCRIPTS)
+endif
+
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+test_gnunet_peerinfo.py: test_gnunet_peerinfo.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_peerinfo.py.in > test_gnunet_peerinfo.py
+       chmod +x test_gnunet_peerinfo.py
+
+EXTRA_DIST = \
+  test_gnunet_peerinfo.py.in \
+  test_gnunet_peerinfo_data.conf
+
+CLEANFILES = $(check_SCRIPTS)