-bringing copyright tags up to FSF standard

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

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 9089fa42253009d8631597a1fd05dcd6f2ef3586..98043373db0562a716c065f5de820a2a3d49cd04 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
 
 plugindir = $(libdir)/gnunet
 
@@ -26,7 +27,7 @@ SQLITE_TESTS = test_plugin_namestore_sqlite
 endif
 endif
 
-if HAVE_POSTGRES
+if HAVE_POSTGRESQL
 # postgres doesn't even build yet; thus: experimental!
 POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
 if HAVE_TESTING
@@ -52,7 +53,7 @@ TESTING_TESTS = \
  test_namestore_api_zone_iteration_stop \
  test_namestore_api_monitoring \
  test_namestore_api_monitoring_existing
-#test_namestore_api_zone_to_name
+# test_namestore_api_zone_to_name
 endif
 
 if HAVE_SQLITE
@@ -105,10 +106,6 @@ gnunet_namestore_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.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 = \
@@ -116,12 +113,9 @@ gnunet_namestore_fcfsd_SOURCES = \
 gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetnamestore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_namestore_fcfsd_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamestore.la
 
 
 
@@ -135,10 +129,6 @@ gnunet_service_namestore_LDADD = \
   $(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
 
 
 plugin_LTLIBRARIES = \
@@ -154,11 +144,6 @@ libgnunet_plugin_namestore_sqlite_la_LIBADD = \
   $(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
-
 
 libgnunet_plugin_namestore_postgres_la_SOURCES = \
   plugin_namestore_postgres.c
@@ -169,12 +154,7 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \
   $(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
+ $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
 
 test_namestore_api_store_SOURCES = \
  test_namestore_api_store.c
@@ -182,7 +162,7 @@ test_namestore_api_store_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_store_update_SOURCES = \
  test_namestore_api_store_update.c
@@ -191,7 +171,7 @@ test_namestore_api_store_update_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_public_SOURCES = \
  test_namestore_api_lookup_public.c
@@ -200,7 +180,7 @@ test_namestore_api_lookup_public_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_SOURCES = \
  test_namestore_api_lookup_nick.c
@@ -209,7 +189,7 @@ test_namestore_api_lookup_nick_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_private_SOURCES = \
  test_namestore_api_lookup_private.c
@@ -218,7 +198,7 @@ test_namestore_api_lookup_private_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_shadow_SOURCES = \
  test_namestore_api_lookup_shadow.c
@@ -227,7 +207,7 @@ test_namestore_api_lookup_shadow_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_shadow_filter_SOURCES = \
  test_namestore_api_lookup_shadow_filter.c
@@ -236,7 +216,7 @@ test_namestore_api_lookup_shadow_filter_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_remove_SOURCES = \
  test_namestore_api_remove.c
@@ -244,7 +224,7 @@ test_namestore_api_remove_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
@@ -252,20 +232,20 @@ test_namestore_api_remove_not_existing_record_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  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_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 \
+#  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 \
+  libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -273,7 +253,7 @@ test_namestore_api_monitoring_existing_SOURCES = \
  test_namestore_api_monitoring_existing.c
 test_namestore_api_monitoring_existing_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -283,7 +263,7 @@ test_namestore_api_zone_iteration_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_nick_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
@@ -291,7 +271,7 @@ test_namestore_api_zone_iteration_nick_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 
 test_namestore_api_zone_iteration_specific_zone_SOURCES = \
@@ -300,7 +280,7 @@ test_namestore_api_zone_iteration_specific_zone_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_stop_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
@@ -308,7 +288,7 @@ test_namestore_api_zone_iteration_stop_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c