Imported Upstream version 0.9.3upstream/0.9.3

1 files changed, 428 insertions, 61 deletions

diff --git a/src/namestore/Makefile.in b/src/namestore/Makefile.in
index 2ed2a46..180232d 100644
--- a/src/namestore/Makefile.in
+++ b/src/namestore/Makefile.in
@@ -16,6 +16,7 @@
 @SET_MAKE@
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -36,10 +37,22 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-check_PROGRAMS = $(am__EXEEXT_1) test_namestore_api$(EXEEXT) \
+check_PROGRAMS = $(am__EXEEXT_1) \
+	test_namestore_record_serialization$(EXEEXT) \
+	test_namestore_api_sign_verify$(EXEEXT) \
+	test_namestore_api$(EXEEXT) test_namestore_api_put$(EXEEXT) \
+	test_namestore_api_lookup$(EXEEXT) \
+	test_namestore_api_lookup_specific_type$(EXEEXT) \
+	test_namestore_api_create$(EXEEXT) \
+	test_namestore_api_create_update$(EXEEXT) \
+	test_namestore_api_remove$(EXEEXT) \
+	test_namestore_api_remove_not_existing_record$(EXEEXT) \
+	test_namestore_api_zone_to_name$(EXEEXT) \
 	test_namestore_api_zone_iteration$(EXEEXT) \
-	test_namestore_record_serialization$(EXEEXT)
-bin_PROGRAMS = gnunet-service-namestore$(EXEEXT)
+	test_namestore_api_zone_iteration_specific_zone$(EXEEXT) \
+	test_namestore_api_zone_iteration_stop$(EXEEXT)
+bin_PROGRAMS = gnunet-service-namestore$(EXEEXT) \
+	gnunet-namestore$(EXEEXT)
 subdir = src/namestore
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/namestore.conf.in
@@ -84,15 +97,11 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \
-	"$(DESTDIR)$(bindir)"
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgcfgdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libgnunet_plugin_namestore_sqlite_la_DEPENDENCIES =  \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la \
-	$(top_builddir)/src/util/libgnunetutil.la \
-	$(am__DEPENDENCIES_1)
 am_libgnunet_plugin_namestore_sqlite_la_OBJECTS =  \
-	plugin_namestore_sqlite.lo
+	plugin_namestore_sqlite.lo namestore_common.lo
 libgnunet_plugin_namestore_sqlite_la_OBJECTS =  \
 	$(am_libgnunet_plugin_namestore_sqlite_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
@@ -109,7 +118,8 @@ libgnunetnamestore_la_DEPENDENCIES =  \
 	$(top_builddir)/src/statistics/libgnunetstatistics.la \
 	$(top_builddir)/src/util/libgnunetutil.la \
 	$(am__DEPENDENCIES_1)
-am_libgnunetnamestore_la_OBJECTS = namestore_api.lo
+am_libgnunetnamestore_la_OBJECTS = namestore_api.lo \
+	namestore_common.lo
 libgnunetnamestore_la_OBJECTS = $(am_libgnunetnamestore_la_OBJECTS)
 libgnunetnamestore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -118,31 +128,101 @@ libgnunetnamestore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_SQLITE_TRUE@am__EXEEXT_1 =  \
 @HAVE_SQLITE_TRUE@	test_plugin_namestore_sqlite$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
+am_gnunet_namestore_OBJECTS = gnunet-namestore.$(OBJEXT)
+gnunet_namestore_OBJECTS = $(am_gnunet_namestore_OBJECTS)
 am_gnunet_service_namestore_OBJECTS =  \
-	gnunet-service-namestore.$(OBJEXT) namestore_common.$(OBJEXT)
+	gnunet-service-namestore.$(OBJEXT)
 gnunet_service_namestore_OBJECTS =  \
 	$(am_gnunet_service_namestore_OBJECTS)
-gnunet_service_namestore_DEPENDENCIES =  \
-	$(top_builddir)/src/statistics/libgnunetstatistics.la \
-	$(top_builddir)/src/util/libgnunetutil.la \
-	$(am__DEPENDENCIES_1)
-am_test_namestore_api_OBJECTS = test_namestore_api.$(OBJEXT) \
-	namestore_common.$(OBJEXT)
+am_test_namestore_api_OBJECTS = test_namestore_api.$(OBJEXT)
 test_namestore_api_OBJECTS = $(am_test_namestore_api_OBJECTS)
 test_namestore_api_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la \
 	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_create_OBJECTS =  \
+	test_namestore_api_create.$(OBJEXT)
+test_namestore_api_create_OBJECTS =  \
+	$(am_test_namestore_api_create_OBJECTS)
+test_namestore_api_create_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_create_update_OBJECTS =  \
+	test_namestore_api_create_update.$(OBJEXT)
+test_namestore_api_create_update_OBJECTS =  \
+	$(am_test_namestore_api_create_update_OBJECTS)
+test_namestore_api_create_update_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_lookup_OBJECTS =  \
+	test_namestore_api_lookup.$(OBJEXT)
+test_namestore_api_lookup_OBJECTS =  \
+	$(am_test_namestore_api_lookup_OBJECTS)
+test_namestore_api_lookup_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_lookup_specific_type_OBJECTS =  \
+	test_namestore_api_lookup_specific_type.$(OBJEXT)
+test_namestore_api_lookup_specific_type_OBJECTS =  \
+	$(am_test_namestore_api_lookup_specific_type_OBJECTS)
+test_namestore_api_lookup_specific_type_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_put_OBJECTS = test_namestore_api_put.$(OBJEXT)
+test_namestore_api_put_OBJECTS = $(am_test_namestore_api_put_OBJECTS)
+test_namestore_api_put_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_remove_OBJECTS =  \
+	test_namestore_api_remove.$(OBJEXT)
+test_namestore_api_remove_OBJECTS =  \
+	$(am_test_namestore_api_remove_OBJECTS)
+test_namestore_api_remove_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_remove_not_existing_record_OBJECTS =  \
+	test_namestore_api_remove_not_existing_record.$(OBJEXT)
+test_namestore_api_remove_not_existing_record_OBJECTS =  \
+	$(am_test_namestore_api_remove_not_existing_record_OBJECTS)
+test_namestore_api_remove_not_existing_record_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_sign_verify_OBJECTS =  \
+	test_namestore_api_sign_verify.$(OBJEXT)
+test_namestore_api_sign_verify_OBJECTS =  \
+	$(am_test_namestore_api_sign_verify_OBJECTS)
+test_namestore_api_sign_verify_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
 am_test_namestore_api_zone_iteration_OBJECTS =  \
-	test_namestore_api_zone_iteration.$(OBJEXT) \
-	namestore_common.$(OBJEXT)
+	test_namestore_api_zone_iteration.$(OBJEXT)
 test_namestore_api_zone_iteration_OBJECTS =  \
 	$(am_test_namestore_api_zone_iteration_OBJECTS)
 test_namestore_api_zone_iteration_DEPENDENCIES =  \
 	$(top_builddir)/src/util/libgnunetutil.la \
 	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_zone_iteration_specific_zone_OBJECTS =  \
+	test_namestore_api_zone_iteration_specific_zone.$(OBJEXT)
+test_namestore_api_zone_iteration_specific_zone_OBJECTS =  \
+	$(am_test_namestore_api_zone_iteration_specific_zone_OBJECTS)
+test_namestore_api_zone_iteration_specific_zone_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_zone_iteration_stop_OBJECTS =  \
+	test_namestore_api_zone_iteration_stop.$(OBJEXT)
+test_namestore_api_zone_iteration_stop_OBJECTS =  \
+	$(am_test_namestore_api_zone_iteration_stop_OBJECTS)
+test_namestore_api_zone_iteration_stop_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
+am_test_namestore_api_zone_to_name_OBJECTS =  \
+	test_namestore_api_zone_to_name.$(OBJEXT)
+test_namestore_api_zone_to_name_OBJECTS =  \
+	$(am_test_namestore_api_zone_to_name_OBJECTS)
+test_namestore_api_zone_to_name_DEPENDENCIES =  \
+	$(top_builddir)/src/util/libgnunetutil.la \
+	$(top_builddir)/src/namestore/libgnunetnamestore.la
 am_test_namestore_record_serialization_OBJECTS =  \
-	test_namestore_record_serialization.$(OBJEXT) \
-	namestore_common.$(OBJEXT)
+	test_namestore_record_serialization.$(OBJEXT)
 test_namestore_record_serialization_OBJECTS =  \
 	$(am_test_namestore_record_serialization_OBJECTS)
 test_namestore_record_serialization_DEPENDENCIES =  \
@@ -181,21 +261,46 @@ AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libgnunet_plugin_namestore_sqlite_la_SOURCES) \
-	$(libgnunetnamestore_la_SOURCES) \
+	$(libgnunetnamestore_la_SOURCES) $(gnunet_namestore_SOURCES) \
 	$(gnunet_service_namestore_SOURCES) \
 	$(test_namestore_api_SOURCES) \
+	$(test_namestore_api_create_SOURCES) \
+	$(test_namestore_api_create_update_SOURCES) \
+	$(test_namestore_api_lookup_SOURCES) \
+	$(test_namestore_api_lookup_specific_type_SOURCES) \
+	$(test_namestore_api_put_SOURCES) \
+	$(test_namestore_api_remove_SOURCES) \
+	$(test_namestore_api_remove_not_existing_record_SOURCES) \
+	$(test_namestore_api_sign_verify_SOURCES) \
 	$(test_namestore_api_zone_iteration_SOURCES) \
+	$(test_namestore_api_zone_iteration_specific_zone_SOURCES) \
+	$(test_namestore_api_zone_iteration_stop_SOURCES) \
+	$(test_namestore_api_zone_to_name_SOURCES) \
 	$(test_namestore_record_serialization_SOURCES) \
 	$(test_plugin_namestore_sqlite_SOURCES)
 DIST_SOURCES = $(libgnunet_plugin_namestore_sqlite_la_SOURCES) \
-	$(libgnunetnamestore_la_SOURCES) \
+	$(libgnunetnamestore_la_SOURCES) $(gnunet_namestore_SOURCES) \
 	$(gnunet_service_namestore_SOURCES) \
 	$(test_namestore_api_SOURCES) \
+	$(test_namestore_api_create_SOURCES) \
+	$(test_namestore_api_create_update_SOURCES) \
+	$(test_namestore_api_lookup_SOURCES) \
+	$(test_namestore_api_lookup_specific_type_SOURCES) \
+	$(test_namestore_api_put_SOURCES) \
+	$(test_namestore_api_remove_SOURCES) \
+	$(test_namestore_api_remove_not_existing_record_SOURCES) \
+	$(test_namestore_api_sign_verify_SOURCES) \
 	$(test_namestore_api_zone_iteration_SOURCES) \
+	$(test_namestore_api_zone_iteration_specific_zone_SOURCES) \
+	$(test_namestore_api_zone_iteration_stop_SOURCES) \
+	$(test_namestore_api_zone_to_name_SOURCES) \
 	$(test_namestore_record_serialization_SOURCES) \
 	$(test_plugin_namestore_sqlite_SOURCES)
+DATA = $(pkgcfg_DATA)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -252,6 +357,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JAVAPORT = @JAVAPORT@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBADD_DL = @LIBADD_DL@
@@ -285,6 +391,7 @@ LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+MONKEYPREFIX = @MONKEYPREFIX@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -403,9 +510,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_srcdir)/src/include
 plugindir = $(libdir)/gnunet
-pkgcfgdir = $(pkgnamedir)/config.d/
-pkgcfg_NAME = \
-  namestore.conf
+pkgcfgdir = $(pkgdatadir)/config.d/
+pkgcfg_DATA = \
+   namestore.conf
 
 @MINGW_TRUE@WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 @USE_COVERAGE_TRUE@AM_CFLAGS = --coverage -O0
@@ -413,11 +520,12 @@ pkgcfg_NAME = \
 @HAVE_SQLITE_TRUE@SQLITE_TESTS = \
 @HAVE_SQLITE_TRUE@ test_plugin_namestore_sqlite 
 
+@ENABLE_TEST_RUN_TRUE@TESTS = $(check_PROGRAMS)
 lib_LTLIBRARIES = \
   libgnunetnamestore.la
 
 libgnunetnamestore_la_SOURCES = \
-  namestore_api.c namestore.h
+  namestore_api.c namestore_common.c namestore.h
 
 libgnunetnamestore_la_LIBADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -428,48 +536,145 @@ libgnunetnamestore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
+gnunet_namestore_SOURCES = \
+ gnunet-namestore.c 
+
+gnunet_namestore_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la \
+  $(GN_LIBINTL)
+
+gnunet_namestore_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetnamestore.la
+
 gnunet_service_namestore_SOURCES = \
- gnunet-service-namestore.c \
- namestore_common.c
+ gnunet-service-namestore.c
 
 gnunet_service_namestore_LDADD = \
   $(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
+
 @HAVE_SQLITE_TRUE@SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) 
 
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
-  plugin_namestore_sqlite.c
+  plugin_namestore_sqlite.c namestore_common.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
 
 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 = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
 test_namestore_api_SOURCES = \
- test_namestore_api.c \
- namestore_common.c
+ test_namestore_api.c
 
 test_namestore_api_LDADD = \
   $(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/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/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/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
+test_namestore_api_create_SOURCES = \
+ test_namestore_api_create.c
+
+test_namestore_api_create_LDADD = \
+  $(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/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_SOURCES = \
+ test_namestore_api_remove.c
+
+test_namestore_api_remove_LDADD = \
+  $(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/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/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
 test_namestore_api_zone_iteration_SOURCES = \
- test_namestore_api_zone_iteration.c \
- namestore_common.c
+ test_namestore_api_zone_iteration.c
 
 test_namestore_api_zone_iteration_LDADD = \
   $(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/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/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la    
+
 test_namestore_record_serialization_SOURCES = \
- test_namestore_record_serialization.c \
- namestore_common.c
+ test_namestore_record_serialization.c
 
 test_namestore_record_serialization_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -478,7 +683,9 @@ test_namestore_record_serialization_LDADD = \
 EXTRA_DIST = \
   test_namestore_api.conf \
   test_plugin_namestore_sqlite.conf\
-  hostkey
+  test_hostkey \
+  zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
+  zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey
 
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c
@@ -640,15 +847,51 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+gnunet-namestore$(EXEEXT): $(gnunet_namestore_OBJECTS) $(gnunet_namestore_DEPENDENCIES) 
+	@rm -f gnunet-namestore$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(gnunet_namestore_OBJECTS) $(gnunet_namestore_LDADD) $(LIBS)
 gnunet-service-namestore$(EXEEXT): $(gnunet_service_namestore_OBJECTS) $(gnunet_service_namestore_DEPENDENCIES) 
 	@rm -f gnunet-service-namestore$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gnunet_service_namestore_OBJECTS) $(gnunet_service_namestore_LDADD) $(LIBS)
 test_namestore_api$(EXEEXT): $(test_namestore_api_OBJECTS) $(test_namestore_api_DEPENDENCIES) 
 	@rm -f test_namestore_api$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_namestore_api_OBJECTS) $(test_namestore_api_LDADD) $(LIBS)
+test_namestore_api_create$(EXEEXT): $(test_namestore_api_create_OBJECTS) $(test_namestore_api_create_DEPENDENCIES) 
+	@rm -f test_namestore_api_create$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_create_OBJECTS) $(test_namestore_api_create_LDADD) $(LIBS)
+test_namestore_api_create_update$(EXEEXT): $(test_namestore_api_create_update_OBJECTS) $(test_namestore_api_create_update_DEPENDENCIES) 
+	@rm -f test_namestore_api_create_update$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_create_update_OBJECTS) $(test_namestore_api_create_update_LDADD) $(LIBS)
+test_namestore_api_lookup$(EXEEXT): $(test_namestore_api_lookup_OBJECTS) $(test_namestore_api_lookup_DEPENDENCIES) 
+	@rm -f test_namestore_api_lookup$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_lookup_OBJECTS) $(test_namestore_api_lookup_LDADD) $(LIBS)
+test_namestore_api_lookup_specific_type$(EXEEXT): $(test_namestore_api_lookup_specific_type_OBJECTS) $(test_namestore_api_lookup_specific_type_DEPENDENCIES) 
+	@rm -f test_namestore_api_lookup_specific_type$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_lookup_specific_type_OBJECTS) $(test_namestore_api_lookup_specific_type_LDADD) $(LIBS)
+test_namestore_api_put$(EXEEXT): $(test_namestore_api_put_OBJECTS) $(test_namestore_api_put_DEPENDENCIES) 
+	@rm -f test_namestore_api_put$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_put_OBJECTS) $(test_namestore_api_put_LDADD) $(LIBS)
+test_namestore_api_remove$(EXEEXT): $(test_namestore_api_remove_OBJECTS) $(test_namestore_api_remove_DEPENDENCIES) 
+	@rm -f test_namestore_api_remove$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_remove_OBJECTS) $(test_namestore_api_remove_LDADD) $(LIBS)
+test_namestore_api_remove_not_existing_record$(EXEEXT): $(test_namestore_api_remove_not_existing_record_OBJECTS) $(test_namestore_api_remove_not_existing_record_DEPENDENCIES) 
+	@rm -f test_namestore_api_remove_not_existing_record$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_remove_not_existing_record_OBJECTS) $(test_namestore_api_remove_not_existing_record_LDADD) $(LIBS)
+test_namestore_api_sign_verify$(EXEEXT): $(test_namestore_api_sign_verify_OBJECTS) $(test_namestore_api_sign_verify_DEPENDENCIES) 
+	@rm -f test_namestore_api_sign_verify$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_sign_verify_OBJECTS) $(test_namestore_api_sign_verify_LDADD) $(LIBS)
 test_namestore_api_zone_iteration$(EXEEXT): $(test_namestore_api_zone_iteration_OBJECTS) $(test_namestore_api_zone_iteration_DEPENDENCIES) 
 	@rm -f test_namestore_api_zone_iteration$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_namestore_api_zone_iteration_OBJECTS) $(test_namestore_api_zone_iteration_LDADD) $(LIBS)
+test_namestore_api_zone_iteration_specific_zone$(EXEEXT): $(test_namestore_api_zone_iteration_specific_zone_OBJECTS) $(test_namestore_api_zone_iteration_specific_zone_DEPENDENCIES) 
+	@rm -f test_namestore_api_zone_iteration_specific_zone$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_zone_iteration_specific_zone_OBJECTS) $(test_namestore_api_zone_iteration_specific_zone_LDADD) $(LIBS)
+test_namestore_api_zone_iteration_stop$(EXEEXT): $(test_namestore_api_zone_iteration_stop_OBJECTS) $(test_namestore_api_zone_iteration_stop_DEPENDENCIES) 
+	@rm -f test_namestore_api_zone_iteration_stop$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_zone_iteration_stop_OBJECTS) $(test_namestore_api_zone_iteration_stop_LDADD) $(LIBS)
+test_namestore_api_zone_to_name$(EXEEXT): $(test_namestore_api_zone_to_name_OBJECTS) $(test_namestore_api_zone_to_name_DEPENDENCIES) 
+	@rm -f test_namestore_api_zone_to_name$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_namestore_api_zone_to_name_OBJECTS) $(test_namestore_api_zone_to_name_LDADD) $(LIBS)
 test_namestore_record_serialization$(EXEEXT): $(test_namestore_record_serialization_OBJECTS) $(test_namestore_record_serialization_DEPENDENCIES) 
 	@rm -f test_namestore_record_serialization$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_namestore_record_serialization_OBJECTS) $(test_namestore_record_serialization_LDADD) $(LIBS)
@@ -662,12 +905,24 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-namestore.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnunet-service-namestore.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namestore_api.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namestore_common.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namestore_common.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin_namestore_sqlite.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_create.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_create_update.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_lookup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_lookup_specific_type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_put.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_remove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_remove_not_existing_record.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_sign_verify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_zone_iteration.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_zone_iteration_specific_zone.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_zone_iteration_stop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_api_zone_to_name.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_namestore_record_serialization.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_plugin_namestore.Po@am__quote@
 
@@ -700,6 +955,26 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-pkgcfgDATA: $(pkgcfg_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgcfgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgcfgdir)"
+	@list='$(pkgcfg_DATA)'; test -n "$(pkgcfgdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgcfgdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgcfgdir)" || exit $$?; \
+	done
+
+uninstall-pkgcfgDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgcfg_DATA)'; test -n "$(pkgcfgdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgcfgdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgcfgdir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -753,6 +1028,98 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
+	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
+	    else \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -785,12 +1152,13 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgcfgdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -842,7 +1210,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pluginLTLIBRARIES
+install-data-am: install-pkgcfgDATA install-pluginLTLIBRARIES
 
 install-dvi: install-dvi-am
 
@@ -889,29 +1257,28 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
-	uninstall-pluginLTLIBRARIES
+	uninstall-pkgcfgDATA uninstall-pluginLTLIBRARIES
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-pluginLTLIBRARIES install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
-	uninstall-pluginLTLIBRARIES
-
-
-@HAVE_EXPERIMENTAL_TRUE@ check_PROGRAMS
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-pluginLTLIBRARIES \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-pkgcfgDATA \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-pkgcfgDATA uninstall-pluginLTLIBRARIES
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.