X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsyc%2FMakefile.am;h=0016b1b3bd6daab7cd1a72d85f633f7bffe9cb1c;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=453227e7955e60cf9a29ee3426d98dff75fe81b1;hpb=d94c5185fcdf47c6a57d3233b946fa7e621f7ad9;p=oweals%2Fgnunet.git

diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 453227e79..0016b1b3b 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -17,24 +18,13 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-lib_LTLIBRARIES = libgnunetpsycutil.la libgnunetpsyc.la
-
-libgnunetpsycutil_la_SOURCES = \
-  psyc_util_lib.c
-libgnunetpsycutil_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetpsycutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 0:0:0
+lib_LTLIBRARIES = libgnunetpsyc.la
 
 libgnunetpsyc_la_SOURCES = \
   psyc_api.c psyc.h
 libgnunetpsyc_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  libgnunetpsycutil.la \
+  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsyc_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -52,7 +42,7 @@ gnunet_service_psyc_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/multicast/libgnunetmulticast.la \
   $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
-  libgnunetpsycutil.la \
+  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL)
 gnunet_service_psyc_CFLAGS = $(AM_CFLAGS)
 
@@ -71,10 +61,8 @@ test_psyc_SOURCES = \
  test_psyc.c
 test_psyc_LDADD = \
   libgnunetpsyc.la \
-  libgnunetpsycutil.la \
+  $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \