-docu, style fixes

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

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 7f95f60b8965fd0a2af624d001595bda65560c39..1ca9a7c330f00a274fb4d65f7629521acd1907e6 100644 (file)
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,4 +1,11 @@
-INCLUDES = -I$(top_srcdir)/src/include
+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,92 +22,101 @@ lib_LTLIBRARIES = \
 
 libgnunetcore_la_SOURCES = \
   core_api.c core.h \
-  core_api_iterate_peers.c
+  core_api_mq.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
+
 
+libexec_PROGRAMS = \
+ gnunet-service-core
 
 bin_PROGRAMS = \
- gnunet-service-core \
- gnunet-core-list-connections
+ gnunet-core
 
 gnunet_service_core_SOURCES = \
- gnunet-service-core.c 
+ 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
 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/libgnunettransportnew.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
+  $(GN_LIBINTL) $(Z_LIBS)
 
 
-gnunet_core_list_connections_SOURCES = \
- gnunet-core-list-connections.c         
-gnunet_core_list_connections_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
+gnunet_core_SOURCES = \
+ gnunet-core.c
+gnunet_core_LDADD = \
+  libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_core_list_connections_DEPENDENCIES = \
-  libgnunetcore.la
+
+if HAVE_TESTING
+  TESTING_TESTS = test_core_api_send_to_self test_core_api_mq
+endif
 
 check_PROGRAMS = \
  test_core_api_start_only \
  test_core_api \
- test_core_api_preferences \
  test_core_api_reliability \
  test_core_quota_compliance_symmetric \
  test_core_quota_compliance_asymmetric_send_limited \
  test_core_quota_compliance_asymmetric_recv_limited \
- test_core_api_send_to_self
+ $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 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/util/libgnunetutil.la
 
 test_core_api_reliability_SOURCES = \
  test_core_api_reliability.c
 test_core_api_reliability_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
-test_core_api_preferences_SOURCES = \
- test_core_api_preferences.c
-test_core_api_preferences_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.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 = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(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 = \
- $(top_builddir)/src/core/libgnunetcore.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 = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
@@ -108,7 +124,7 @@ test_core_quota_compliance_symmetric_LDADD = \
 test_core_quota_compliance_asymmetric_send_limited_SOURCES = \
  test_core_quota_compliance.c
 test_core_quota_compliance_asymmetric_send_limited_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
@@ -116,20 +132,19 @@ test_core_quota_compliance_asymmetric_send_limited_LDADD = \
 test_core_quota_compliance_asymmetric_recv_limited_SOURCES = \
  test_core_quota_compliance.c
 test_core_quota_compliance_asymmetric_recv_limited_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.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_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_limited_peer1.conf \
-  test_core_quota_asymmetric_send_limited_peer2.conf \
   test_core_quota_asymmetric_send_limit_peer1.conf \
   test_core_quota_asymmetric_send_limit_peer2.conf \
   test_core_quota_peer1.conf \