X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2FMakefile.am;h=a3874a922cfa144f05df344167e0c02f7cb2bb20;hb=dc40d894157a9eeee4c72f8cb974fd48e1a98a1b;hp=23fac2eb5d072e7f7ed8fe409338b467f6935e62;hpb=9743bcab91d15d1d6bfb93ae17669b53a98f80f9;p=oweals%2Fgnunet.git

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 23fac2eb5..a3874a922 100644
--- 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
 
@@ -18,24 +20,52 @@ if USE_COVERAGE
 endif
 
 if HAVE_SQLITE
-SQLITE_TESTS = \
- test_plugin_namestore_sqlite 
+SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
+if HAVE_TESTING
+SQLITE_TESTS = test_plugin_namestore_sqlite 
+endif
+endif
+
+if HAVE_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
 
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- test_namestore_api_sign_verify \
+if HAVE_TESTING
+TESTING_TESTS = \
  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_iteration \
- test_namestore_record_serialization
+ 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) \
+ $(TESTING_TESTS)
+endif
+
+# end of 'HAVE_EXPERIMENTAL' for testcases 
+endif
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -45,71 +75,136 @@ 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 
+
+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
+
+
 
 gnunet_service_namestore_SOURCES = \
  gnunet-service-namestore.c
 
 gnunet_service_namestore_LDADD = \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetnamestore.la \
   $(GN_LIBINTL)
+gnunet_service_namestore_DEPENDENCIES = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la
 
-if HAVE_SQLITE
- SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
-endif
 
 plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) 
+  $(SQLITE_PLUGIN) \
+  $(POSTGRES_PLUGIN)
 
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
-  plugin_namestore_sqlite.c
+  plugin_namestore_sqlite.c 
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
 libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_namestore_sqlite_la_DEPENDENCIES = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(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 = \
+
+libgnunet_plugin_namestore_postgres_la_SOURCES = \
+  plugin_namestore_postgres.c 
+libgnunet_plugin_namestore_postgres_la_LIBADD = \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la  \
+  $(top_builddir)/src/postgres/libgnunetpostgres.la  \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \
+  $(LTLIBINTL)
+libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_namestore_postgres_la_DEPENDENCIES = \
+  $(top_builddir)/src/postgres/libgnunetpostgres.la  \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la
+
+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
 
 test_namestore_api_SOURCES = \
  test_namestore_api.c
 test_namestore_api_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 test_namestore_api_put_SOURCES = \
  test_namestore_api_put.c
 test_namestore_api_put_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 test_namestore_api_lookup_SOURCES = \
  test_namestore_api_lookup.c
 test_namestore_api_lookup_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 test_namestore_api_lookup_specific_type_SOURCES = \
  test_namestore_api_lookup_specific_type.c
 test_namestore_api_lookup_specific_type_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
@@ -117,12 +212,14 @@ test_namestore_api_lookup_specific_type_LDADD = \
 test_namestore_api_create_SOURCES = \
  test_namestore_api_create.c
 test_namestore_api_create_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 test_namestore_api_create_update_SOURCES = \
  test_namestore_api_create_update.c
 test_namestore_api_create_update_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
@@ -130,34 +227,79 @@ test_namestore_api_create_update_LDADD = \
 test_namestore_api_remove_SOURCES = \
  test_namestore_api_remove.c
 test_namestore_api_remove_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
 test_namestore_api_remove_not_existing_record_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_to_name_SOURCES = \
+ test_namestore_api_zone_to_name.c
+test_namestore_api_zone_to_name_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(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 = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la  
 
+test_namestore_api_zone_iteration_specific_zone_SOURCES = \
+ test_namestore_api_zone_iteration_specific_zone.c
+test_namestore_api_zone_iteration_specific_zone_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la  
+
+test_namestore_api_zone_iteration_stop_SOURCES = \
+ test_namestore_api_zone_iteration_stop.c
+test_namestore_api_zone_iteration_stop_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la    
+
 test_namestore_record_serialization_SOURCES = \
  test_namestore_record_serialization.c
 test_namestore_record_serialization_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la  
 
 EXTRA_DIST = \
   test_namestore_api.conf \
-  test_plugin_namestore_sqlite.conf\
-  hostkey
+  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 = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+test_plugin_namestore_postgres_SOURCES = \
+ test_plugin_namestore.c
+test_plugin_namestore_postgres_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la