fixing confs: core tests should pass

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

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 13054d15a39af642355baeed2091810c9bb17d7e..6d073da1ff89e6c6915e8e37e06edbf101b01650 100644 (file)
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -2,7 +2,9 @@ INCLUDES = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
-dist_pkgcfg_DATA = \
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
   core.conf
 
 if MINGW
@@ -20,18 +22,21 @@ lib_LTLIBRARIES = \
 
 libgnunetcore_la_SOURCES = \
   core_api.c core.h \
-  core_api_iterate_peers.c
+  core_api_iterate_peers.c \
+  core_api_is_connected.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.h \
@@ -49,14 +54,12 @@ gnunet_service_core_LDADD = \
   $(GN_LIBINTL) -lz
 
 
-gnunet_core_list_connections_SOURCES = \
- gnunet-core-list-connections.c         
-gnunet_core_list_connections_LDADD = \
+gnunet_core_SOURCES = \
+ gnunet-core.c         
+gnunet_core_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_core_list_connections_DEPENDENCIES = \
+gnunet_core_DEPENDENCIES = \
   libgnunetcore.la
 
 check_PROGRAMS = \
@@ -90,12 +93,14 @@ 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 \
+ $(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/testing/libgnunettesting.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la