-fixing #2434, plus some code cleanup

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

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b2629a567b71b00d137c518ba0022572a7b02e06..e95cbcffd199c01f8d1c836a4553c602f779dcd6 100644 (file)
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,5 +1,10 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  core.conf
+
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
@@ -15,7 +20,8 @@ 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)
@@ -26,7 +32,7 @@ libgnunetcore_la_LDFLAGS = \
 
 bin_PROGRAMS = \
  gnunet-service-core \
- gnunet-core-list-connections
+ gnunet-core
 
 gnunet_service_core_SOURCES = \
  gnunet-service-core.c gnunet-service-core.h \
@@ -44,14 +50,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 = \