- fixed string to address parsing

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 2a8a8c8963af835dae9146164e3318337aaccc7f..cf6cab8490c74e7b31312718fef80d8573fe4b64 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -33,9 +33,12 @@ libgnunetfs_la_SOURCES = \
   fs_getopt.c \
   fs_list_indexed.c \
   fs_publish.c \
+  fs_publish_ksk.c \
   fs_misc.c \
   fs_namespace.c \
+  fs_namespace_advertise.c \
   fs_search.c \
+  fs_sharetree.c \
   fs_tree.c fs_tree.h \
   fs_unindex.c \
   fs_uri.c 
@@ -43,12 +46,11 @@ libgnunetfs_la_SOURCES = \
 libgnunetfs_la_LIBADD = \
   $(top_builddir)/src/datastore/libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
-  $(GN_LIBINTL) $(XLIB) -lunistring
+  $(GN_LIBINTL) $(XLIB) -lunistring -lextractor
 
 libgnunetfs_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 2:0:0
 
 
 libgnunetfstest_a_SOURCES = \
@@ -61,12 +63,16 @@ bin_PROGRAMS = \
   gnunet-directory \
   gnunet-download \
   gnunet-publish \
+  gnunet-helper-fs-publish \
   gnunet-pseudonym \
   gnunet-search \
   gnunet-service-fs \
   gnunet-fs \
   gnunet-unindex 
 
+bin_SCRIPTS = \
+  gnunet-download-manager.scm
+
 gnunet_directory_SOURCES = \
  gnunet-directory.c
 gnunet_directory_LDADD = \
@@ -106,6 +112,15 @@ gnunet_publish_LDADD =  \
 gnunet_publish_DEPENDENCIES = \
   libgnunetfs.la
 
+gnunet_helper_fs_publish_SOURCES =  \
+ gnunet-helper-fs-publish.c 
+gnunet_helper_fs_publish_LDADD =  \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ -lextractor \
+ $(GN_LIBINTL)
+gnunet_helper_fs_publish_DEPENDENCIES = \
+  libgnunetfs.la
+
 gnunet_pseudonym_SOURCES = \
  gnunet-pseudonym.c
 gnunet_pseudonym_LDADD = \
@@ -191,6 +206,7 @@ check_PROGRAMS = \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
  test_fs_test_lib \
@@ -210,6 +226,11 @@ check_SCRIPTS = \
  test_gnunet_fs_ns.py 
 endif
 
+if ENABLE_MONKEY
+ TESTS_ENVIRONMENT = @MONKEYPREFIX@
+ AM_LDFLAGS = -no-install
+endif
+
 
 if ENABLE_TEST_RUN
 TESTS = \
@@ -224,6 +245,7 @@ TESTS = \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
  test_fs_unindex \
@@ -314,6 +336,11 @@ test_fs_search_SOURCES = \
 test_fs_search_LDADD = $(top_builddir)/src/fs/libgnunetfs.la   \
   $(top_builddir)/src/util/libgnunetutil.la
 
+test_fs_search_probes_SOURCES = \
+ test_fs_search_probes.c
+test_fs_search_probes_LDADD = $(top_builddir)/src/fs/libgnunetfs.la    \
+  $(top_builddir)/src/util/libgnunetutil.la
+
 test_fs_search_persistence_SOURCES = \
  test_fs_search_persistence.c
 test_fs_search_persistence_LDADD = $(top_builddir)/src/fs/libgnunetfs.la       \
@@ -429,7 +456,6 @@ EXTRA_DIST = \
   test_fs_data.conf \
   test_fs_download_data.conf \
   test_fs_file_information_data.conf \
-  test_fs_file_information_meta_data_image.jpg \
   fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
   test_fs_namespace_data.conf \
@@ -446,6 +472,7 @@ EXTRA_DIST = \
   test_gnunet_fs_psd.py.in \
   test_gnunet_fs_rec.py.in \
   test_gnunet_fs_ns.py.in \
-  test_gnunet_fs_idx.py.in
+  test_gnunet_fs_idx.py.in \
+  $(bin_SCRIPTS) 
 
 CLEANFILES = $(check_SCRIPTS)