-remove deprecated GNUNET_NAMESTORE_RF_AUTHORITY

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

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 17b7657074558352b124df110bb4baae2f986499..a3874a922cfa144f05df344167e0c02f7cb2bb20 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -4,6 +4,8 @@ plugindir = $(libdir)/gnunet
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfg_DATA = \
    namestore.conf
 
@@ -19,31 +21,50 @@ endif
 
 if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
+if HAVE_TESTING
 SQLITE_TESTS = test_plugin_namestore_sqlite 
 endif
+endif
+
 if HAVE_POSTGRES
-POSTGRES_TESTS = test_plugin_namestore_postgres
+# postgres doesn't even build yet; thus: experimental!
+if HAVE_EXPERIMENTAL
 POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
+if HAVE_TESTING
+POSTGRES_TESTS = test_plugin_namestore_postgres
+endif
+endif
+endif
+
+# testcases do not even build yet; thus: experimental!
+if HAVE_EXPERIMENTAL
+
+if HAVE_TESTING
+TESTING_TESTS = \
+ test_namestore_api \
+ test_namestore_api_remove \
+ test_namestore_api_lookup
+#test_namestore_api_lookup_specific_type
+#test_namestore_api_create 
+#test_namestore_api_create_update
+#test_namestore_api_remove_not_existing_record 
+#test_namestore_api_zone_to_name 
+#test_namestore_api_monitoring 
+#test_namestore_api_zone_iteration 
+#test_namestore_api_zone_iteration_specific_zone 
+#test_namestore_api_zone_iteration_stop
 endif
 
 if HAVE_SQLITE
 check_PROGRAMS = \
+ test_namestore_record_serialization \
+ test_namestore_api_blocks \
  $(SQLITE_TESTS) \
  $(POSTGRES_TESTS) \
- test_namestore_record_serialization \
- test_namestore_api_sign_verify \
- test_namestore_api \
- test_namestore_api_put \
- test_namestore_api_lookup \
- test_namestore_api_lookup_specific_type \
- test_namestore_api_create \
- test_namestore_api_create_update \
- test_namestore_api_remove \
- test_namestore_api_remove_not_existing_record \
- test_namestore_api_zone_to_name \
- test_namestore_api_zone_iteration \
- test_namestore_api_zone_iteration_specific_zone \
- test_namestore_api_zone_iteration_stop 
+ $(TESTING_TESTS)
+endif
+
+# end of 'HAVE_EXPERIMENTAL' for testcases 
 endif
 
 if ENABLE_TEST_RUN
@@ -54,27 +75,50 @@ lib_LTLIBRARIES = \
   libgnunetnamestore.la
 
 libgnunetnamestore_la_SOURCES = \
-  namestore_api.c namestore_common.c namestore.h
+  namestore_api.c \
+  namestore_api_monitor.c \
+  namestore_api_common.c \
+  namestore.h
 libgnunetnamestore_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) 
 libgnunetnamestore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 0:1:0
+
+libexec_PROGRAMS = \
+ gnunet-service-namestore 
 
 bin_PROGRAMS = \
- gnunet-service-namestore \
- gnunet-namestore
+ gnunet-namestore 
 
+if HAVE_MHD
+bin_PROGRAMS += \
+ gnunet-namestore-fcfsd
+endif
 
 gnunet_namestore_SOURCES = \
  gnunet-namestore.c 
 gnunet_namestore_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(GN_LIBINTL)
 gnunet_namestore_DEPENDENCIES = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la
+
+
+gnunet_namestore_fcfsd_SOURCES = \
+ gnunet-namestore-fcfsd.c 
+gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+gnunet_namestore_fcfsd_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetnamestore.la
 
@@ -99,7 +143,7 @@ plugin_LTLIBRARIES = \
   $(POSTGRES_PLUGIN)
 
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
-  plugin_namestore_sqlite.c namestore_common.c
+  plugin_namestore_sqlite.c 
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -114,7 +158,7 @@ libgnunet_plugin_namestore_sqlite_la_DEPENDENCIES = \
 
 
 libgnunet_plugin_namestore_postgres_la_SOURCES = \
-  plugin_namestore_postgres.c namestore_common.c
+  plugin_namestore_postgres.c 
 libgnunet_plugin_namestore_postgres_la_LIBADD = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la  \
   $(top_builddir)/src/postgres/libgnunetpostgres.la  \
@@ -129,9 +173,9 @@ libgnunet_plugin_namestore_postgres_la_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetnamestore.la
 
-test_namestore_api_sign_verify_SOURCES = \
- test_namestore_api_sign_verify.c
-test_namestore_api_sign_verify_LDADD = \
+test_namestore_api_blocks_SOURCES = \
+ test_namestore_api_blocks.c
+test_namestore_api_blocks_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
@@ -201,6 +245,13 @@ test_namestore_api_zone_to_name_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
+test_namestore_api_monitoring_SOURCES = \
+ test_namestore_api_monitoring.c
+test_namestore_api_monitoring_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+
 test_namestore_api_zone_iteration_SOURCES = \
  test_namestore_api_zone_iteration.c
 test_namestore_api_zone_iteration_LDADD = \
@@ -231,13 +282,16 @@ test_namestore_record_serialization_LDADD = \
 
 EXTRA_DIST = \
   test_namestore_api.conf \
-  test_plugin_namestore_sqlite.conf\
-  test_plugin_namestore_postgres.conf\
+  test_plugin_namestore_sqlite.conf \
+  test_plugin_namestore_postgres.conf \
   test_hostkey \
+  zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey \
+  zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey \
   zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
   zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey
 
 
+
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c
 test_plugin_namestore_sqlite_LDADD = \