refactor DHT for new service API

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

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 1ca9a7c330f00a274fb4d65f7629521acd1907e6..aea64fa34cbbd55902152e75205d115d22941d7e 100644 (file)
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -22,7 +23,7 @@ lib_LTLIBRARIES = \
 
 libgnunetcore_la_SOURCES = \
   core_api.c core.h \
-  core_api_mq.c \
+  core_api_2.c \
   core_api_monitor_peers.c
 libgnunetcore_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -40,8 +41,6 @@ bin_PROGRAMS = \
 
 gnunet_service_core_SOURCES = \
  gnunet-service-core.c gnunet-service-core.h \
- gnunet-service-core_clients.c gnunet-service-core_clients.h \
- gnunet-service-core_neighbours.c gnunet-service-core_neighbours.h \
  gnunet-service-core_kx.c gnunet-service-core_kx.h \
  gnunet-service-core_sessions.c gnunet-service-core_sessions.h \
  gnunet-service-core_typemap.c gnunet-service-core_typemap.h
@@ -59,7 +58,8 @@ gnunet_core_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_TESTING
-  TESTING_TESTS = test_core_api_send_to_self test_core_api_mq
+  TESTING_TESTS = \
+    test_core_api_send_to_self 
 endif
 
 check_PROGRAMS = \
@@ -81,6 +81,7 @@ test_core_api_SOURCES = \
 test_core_api_LDADD = \
  libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_core_api_reliability_SOURCES = \
@@ -88,6 +89,7 @@ test_core_api_reliability_SOURCES = \
 test_core_api_reliability_LDADD = \
  libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_core_api_send_to_self_SOURCES = \
@@ -98,14 +100,6 @@ test_core_api_send_to_self_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-test_core_api_mq_SOURCES = \
- test_core_api_mq.c
-test_core_api_mq_LDADD = \
- libgnunetcore.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
 test_core_api_start_only_SOURCES = \
  test_core_api_start_only.c
 test_core_api_start_only_LDADD = \
@@ -118,6 +112,7 @@ test_core_quota_compliance_symmetric_SOURCES = \
 test_core_quota_compliance_symmetric_LDADD = \
  libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -126,6 +121,7 @@ test_core_quota_compliance_asymmetric_send_limited_SOURCES = \
 test_core_quota_compliance_asymmetric_send_limited_LDADD = \
  libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -134,6 +130,7 @@ test_core_quota_compliance_asymmetric_recv_limited_SOURCES = \
 test_core_quota_compliance_asymmetric_recv_limited_LDADD = \
  libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la