X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2FMakefile.am;h=2723151c5ee451fd6a961ff52034b479054383e3;hb=17f5db6f7c8d60930367738b3d872fbf891486ee;hp=f5c1092b64e74b679c02154ec1bf5f85008f409a;hpb=b20ac6c740664563a986cc03c666e6649b1a4f7c;p=oweals%2Fgnunet.git

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index f5c1092b6..2723151c5 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,4 +1,12 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  core.conf
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -15,53 +23,125 @@ lib_LTLIBRARIES = \
 
 libgnunetcore_la_SOURCES = \
   core_api.c core.h \
-  core_api_peer_get_info.c \
-  core_api_peer_request.c
+  core_api_monitor_peers.c
 libgnunetcore_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetcore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 0:1:0
 
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
  gnunet-service-core
 
+bin_PROGRAMS = \
+ gnunet-core
+
 gnunet_service_core_SOURCES = \
- gnunet-service-core.c 
+ gnunet-service-core.c gnunet-service-core.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
 gnunet_service_core_LDADD = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
+  $(GN_LIBINTL) $(Z_LIBS)
+
 
+gnunet_core_SOURCES = \
+ gnunet-core.c
+gnunet_core_LDADD = \
+  libgnunetcore.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+if HAVE_TESTING
+  TESTING_TESTS = \
+    test_core_api_send_to_self 
+endif
 
 check_PROGRAMS = \
  test_core_api_start_only \
- test_core_api 
-
+ test_core_api \
+ test_core_api_reliability \
+ test_core_quota_compliance_symmetric \
+ test_core_quota_compliance_asymmetric_send_limited \
+ test_core_quota_compliance_asymmetric_recv_limited \
+ $(TESTING_TESTS)
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
+endif
 
 test_core_api_SOURCES = \
  test_core_api.c
 test_core_api_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
+test_core_api_reliability_SOURCES = \
+ test_core_api_reliability.c
+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 = \
+ test_core_api_send_to_self.c
+test_core_api_send_to_self_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 = \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la  
-
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_core_quota_compliance_symmetric_SOURCES = \
+ test_core_quota_compliance.c
+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
+
+test_core_quota_compliance_asymmetric_send_limited_SOURCES = \
+ test_core_quota_compliance.c
+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
+
+test_core_quota_compliance_asymmetric_recv_limited_SOURCES = \
+ test_core_quota_compliance.c
+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
 
 EXTRA_DIST = \
+  test_core_defaults.conf \
   test_core_api_data.conf \
   test_core_api_peer1.conf \
-  test_core_api_peer2.conf 
-
+  test_core_api_peer2.conf \
+  test_core_api_send_to_self.conf \
+  test_core_quota_asymmetric_recv_limited_peer1.conf \
+  test_core_quota_asymmetric_recv_limited_peer2.conf \
+  test_core_quota_asymmetric_send_limit_peer1.conf \
+  test_core_quota_asymmetric_send_limit_peer2.conf \
+  test_core_quota_peer1.conf \
+  test_core_quota_peer2.conf