[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28809 - gnunet/src/vectorproduct
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28809 - gnunet/src/vectorproduct |
Date: |
Fri, 23 Aug 2013 14:19:41 +0200 |
Author: cfuchs
Date: 2013-08-23 14:19:41 +0200 (Fri, 23 Aug 2013)
New Revision: 28809
Modified:
gnunet/src/vectorproduct/Makefile.am
Log:
adjusted makefile-template for gnunet-mainline toolchain
Modified: gnunet/src/vectorproduct/Makefile.am
===================================================================
--- gnunet/src/vectorproduct/Makefile.am 2013-08-23 10:01:19 UTC (rev
28808)
+++ gnunet/src/vectorproduct/Makefile.am 2013-08-23 12:19:41 UTC (rev
28809)
@@ -1,38 +1,65 @@
-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
+ $(GN_LIB_LDFLAGS)
-
-bin_PROGRAMS = gnunet-vectorproduct
-
-libexec_PROGRAMS = gnunet-service-vectorproduct
-
check_PROGRAMS = \
test_vectorproduct_api_regression \
test_vectorproduct_api \
@@ -40,58 +67,46 @@
#FIXME unfinished
#test_vectorproduct_api_regression2
-TESTS = $(check_PROGRAMS)
+if ENABLE_TEST_RUN
+ TESTS = $(check_PROGRAMS)
+endif
-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
+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
-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
-
-
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28809 - gnunet/src/vectorproduct,
gnunet <=