- fix

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

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 294ff5cca5a4369ce8501577b5ece50320dc6245..8387c4fc4cc77776c99df87cb6f1b09490634560 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -1,56 +1,74 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  peerinfo.conf
+
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
 
 if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
 endif
 
 lib_LTLIBRARIES = libgnunetpeerinfo.la
 
 libgnunetpeerinfo_la_SOURCES = \
-  peerinfo_api.c peerinfo.h
+  peerinfo_api.c peerinfo.h \
+  peerinfo_api_notify.c
 libgnunetpeerinfo_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetpeerinfo_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
 
-bin_PROGRAMS = \
- gnunet-peerinfo \
+libexec_PROGRAMS = \
  gnunet-service-peerinfo
 
-gnunet_peerinfo_SOURCES = \
- gnunet-peerinfo.c         
-gnunet_peerinfo_LDADD = \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
 gnunet_service_peerinfo_SOURCES = \
  gnunet-service-peerinfo.c         
 gnunet_service_peerinfo_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+if HAVE_BENCHMARKS
+ PEERINFO_BENCHMARKS = \
+ perf_peerinfo_api
+endif
 
 check_PROGRAMS = \
- test_peerinfo_api
+ test_peerinfo_api \
+ $(PEERINFO_BENCHMARKS) 
 
-TESTS = $(check_PROGRAMS) # $(check_SCRIPTS)
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
 
 test_peerinfo_api_SOURCES = \
  test_peerinfo_api.c
 test_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+perf_peerinfo_api_SOURCES = \
+ perf_peerinfo_api.c
+perf_peerinfo_api_LDADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
   test_peerinfo_api_data.conf 
-
-#check_SCRIPTS = \
-#  test_gnunet_peerinfo.sh