adjusted makefile-template for gnunet-mainline toolchain

1 files changed, 69 insertions, 54 deletions

diff --git a/src/vectorproduct/Makefile.am b/src/vectorproduct/Makefile.am
index e9cbbc644..1f0912e50 100644
--- a/src/vectorproduct/Makefile.am
+++ b/src/vectorproduct/Makefile.am
@@ -1,37 +1,64 @@
-SUBDIRS = .
+INCLUDES = -I$(top_srcdir)/src/include
 
-INCLUDES = \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)
+pkgcfgdir= $(pkgdatadir)/config.d/
 
-AM_CPPFLAGS = \
-  $(GNUNET_CPPFLAGS)
+libexecdir= $(pkglibdir)/libexec/
 
-# Set this variable if you are using GNUNET libraries for all programs and
-# libraries. You don't then need to target-specific _LDFLAGS with GNUNET_LDFLAGS
-# AM_LDFLAGS = \
-#   $(GNUNET_LDFLAGS) \
-#   $(WINFLAGS) \
-#   -export-dynamic
+pkgcfg_DATA = \
+  vectorproduct.conf 
 
-lib_LTLIBRARIES = libgnunetvectorproduct.la
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+endif
 
-pkgcfgdir= $(prefix)/share/gnunet/config.d/
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
 
-libexecdir= $(prefix)/lib/gnunet/libexec/
+bin_PROGRAMS = \
+ gnunet-vectorproduct
+
+libexec_PROGRAMS = \
+ gnunet-service-vectorproduct
+
+# FIXME: add option "configure --with-evil"?
+#if HAVE_EXPERIMENTAL
+#libexec_PROGRAMS += \
+# gnunet-service-evil-consensus
+#endif
+
+lib_LTLIBRARIES = \
+  libgnunetvectorproduct.la
+
+gnunet_vectorproduct_SOURCES = \
+  gnunet-vectorproduct.c
+gnunet_vectorproduct_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
+  -lgcrypt \
+  $(GN_LIBINTL) 
+gnunet_vectorproduct_DEPENDENCIES = \
+  libgnunetvectorproduct.la
+
+gnunet_service_vectorproduct_SOURCES = \
+  gnunet-service-vectorproduct.c
+gnunet_service_vectorproduct_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  -lgcrypt \
+  $(GN_LIBINTL)
 
 libgnunetvectorproduct_la_SOURCES = \
   vectorproduct_api.c 
 libgnunetvectorproduct_la_LIBADD = \
-  -lgnunetutil -lgcrypt -lgnunetstatistics
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgcrypt \
+  $(LTLIBINTL)
 libgnunetvectorproduct_la_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) \
-  -version-info 0:0:0
-
-
-bin_PROGRAMS = gnunet-vectorproduct 
-
-libexec_PROGRAMS = gnunet-service-vectorproduct
+  $(GN_LIB_LDFLAGS)
 
 check_PROGRAMS = \
         test_vectorproduct_api_regression \
@@ -40,58 +67,46 @@ check_PROGRAMS = \
 #FIXME unfinished
 #test_vectorproduct_api_regression2 
 
-TESTS = $(check_PROGRAMS)
-
-gnunet_service_vectorproduct_SOURCES = \
-  gnunet-service-vectorproduct.c
-gnunet_service_vectorproduct_LDADD = \
-  -lgnunetutil -lgnunettransport -lgnunetcore -lgnunetmesh -lgnunetdht -lgcrypt \
-  $(INTLLIBS) 
-gnunet_service_vectorproduct_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic 
-
-gnunet_vectorproduct_SOURCES = \
-  gnunet-vectorproduct.c
-gnunet_vectorproduct_LDADD = \
-  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
-  -lgnunetutil -lgcrypt \
-  $(INTLLIBS) 
-gnunet_vectorproduct_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic 
+if ENABLE_TEST_RUN
+  TESTS = $(check_PROGRAMS)
+endif
 
+test_consensus_api_SOURCES = \
+ test_consensus_api.c
+test_consensus_api_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/consensus/libgnunetconsensus.la
 
 test_vectorproduct_api_SOURCES = \
   test_vectorproduct_api.c
 test_vectorproduct_api_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
-  -lgnunetutil -lgcrypt -lgnunetstatistics -lgnunettestbed
-test_vectorproduct_api_LDFLAGS = \
- $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
+  -lgcrypt
 
 #FIXME unfinished
 #test_vectorproduct_api_regression2_SOURCES = \
 #       test_vectorproduct_api_regression2.c
 #test_vectorproduct_api_regression2_LDADD = \
 #  $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
-#  -lgnunetutil -lgcrypt -lgnunetstatistics -lgnunettestbed
-#test_vectorproduct_api_regression2_LDFLAGS = \
-# $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  -lgcrypt
 
 test_vectorproduct_api_regression_SOURCES = \
         test_vectorproduct_api_regression.c
 test_vectorproduct_api_regression_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
-  -lgnunetutil -lgcrypt -lgnunetstatistics -lgnunettestbed
-test_vectorproduct_api_regression_LDFLAGS = \
- $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
+  -lgcrypt
 
 test_vectorproduct_api_4peers_SOURCES = \
  test_vectorproduct_api_4peers.c
 test_vectorproduct_api_4peers_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/vectorproduct/libgnunetvectorproduct.la \
-  -lgnunetutil -lgcrypt -lgnunetstatistics -lgnunettestbed
-test_vectorproduct_api_4peers_LDFLAGS = \
- $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
+  -lgcrypt
  
- pkgcfg_DATA = vectorproduct.conf 
+EXTRA_DIST = \
+  test_vectorproduct.conf