-code cleanup

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

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index f9c1a18e0f46797b879d9c428076e560cd909e3d..ad9bddcb698ca4421b6148a333ea39205b2cf759 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
@@ -26,27 +31,16 @@ libgnunetcore_la_LDFLAGS = \
 
 bin_PROGRAMS = \
  gnunet-service-core \
- gnunet-service-core-new \
  gnunet-core-list-connections
 
 gnunet_service_core_SOURCES = \
- gnunet-service-core.c 
-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) -lz
-
-gnunet_service_core_new_SOURCES = \
- gnunet-service-core-new.c gnunet-service-core.h \
+ 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_new_LDADD = \
+gnunet_service_core_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -92,13 +86,6 @@ test_core_api_reliability_LDADD = \
  $(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 \
- $(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 = \
@@ -144,8 +131,6 @@ EXTRA_DIST = \
   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 \