[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35853 - in gnunet/src: block consensus datacache datastore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35853 - in gnunet/src: block consensus datacache datastore dht template transport |
Date: |
Tue, 2 Jun 2015 10:54:18 +0200 |
Author: grothoff
Date: 2015-06-02 10:54:18 +0200 (Tue, 02 Jun 2015)
New Revision: 35853
Modified:
gnunet/src/block/Makefile.am
gnunet/src/consensus/Makefile.am
gnunet/src/datacache/Makefile.am
gnunet/src/datastore/Makefile.am
gnunet/src/dht/Makefile.am
gnunet/src/template/Makefile.am
gnunet/src/transport/Makefile.am
Log:
-noinst-ing non-functional binaries/libraries that just exist as
examples/templates
Modified: gnunet/src/block/Makefile.am
===================================================================
--- gnunet/src/block/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/block/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -14,9 +14,12 @@
lib_LTLIBRARIES = libgnunetblock.la
plugin_LTLIBRARIES = \
- libgnunet_plugin_block_template.la \
- libgnunet_plugin_block_test.la
+ libgnunet_plugin_block_test.la
+# Real plugins should of course go into
+# plugin_LTLIBRARIES
+noinst_LTLIBRARIES = \
+ libgnunet_plugin_block_template.la
libgnunet_plugin_block_template_la_SOURCES = \
plugin_block_template.c
@@ -38,11 +41,11 @@
libgnunetblock_la_SOURCES = \
- block.c
+ block.c
libgnunetblock_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetblock_la_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetblock_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
Modified: gnunet/src/consensus/Makefile.am
===================================================================
--- gnunet/src/consensus/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/consensus/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -22,11 +22,12 @@
libexec_PROGRAMS = \
gnunet-service-consensus
-# FIXME: add option "configure --with-evil"?
if HAVE_EXPERIMENTAL
+if ENABLE_MALICIOUS
libexec_PROGRAMS += \
gnunet-service-evil-consensus
endif
+endif
lib_LTLIBRARIES = \
libgnunetconsensus.la
@@ -83,4 +84,3 @@
EXTRA_DIST = \
test_consensus.conf
-
Modified: gnunet/src/datacache/Makefile.am
===================================================================
--- gnunet/src/datacache/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/datacache/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -28,11 +28,11 @@
libgnunetdatacache.la
libgnunetdatacache_la_SOURCES = \
- datacache.c
+ datacache.c
libgnunetdatacache_la_LIBADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
+ $(GN_LIBINTL)
libgnunetdatacache_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:1:0
@@ -41,10 +41,14 @@
plugin_LTLIBRARIES = \
$(SQLITE_PLUGIN) \
$(POSTGRES_PLUGIN) \
- libgnunet_plugin_datacache_heap.la \
- libgnunet_plugin_datacache_template.la
+ libgnunet_plugin_datacache_heap.la
+# Real plugins should of course go into
+# plugin_LTLIBRARIES
+noinst_LTLIBRARIES = \
+ libgnunet_plugin_datacache_template.la
+
libgnunet_plugin_datacache_sqlite_la_SOURCES = \
plugin_datacache_sqlite.c
libgnunet_plugin_datacache_sqlite_la_LIBADD = \
@@ -120,7 +124,7 @@
check_PROGRAMS = \
$(SQLITE_TESTS) \
$(HEAP_TESTS) \
- $(POSTGRES_TESTS)
+ $(POSTGRES_TESTS)
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
@@ -132,7 +136,7 @@
test_datacache_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datacache_quota_sqlite_SOURCES = \
test_datacache_quota.c
@@ -139,7 +143,7 @@
test_datacache_quota_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datacache_sqlite_SOURCES = \
perf_datacache.c
@@ -146,7 +150,7 @@
perf_datacache_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datacache_heap_SOURCES = \
test_datacache.c
@@ -153,7 +157,7 @@
test_datacache_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datacache_quota_heap_SOURCES = \
test_datacache_quota.c
@@ -160,7 +164,7 @@
test_datacache_quota_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datacache_heap_SOURCES = \
perf_datacache.c
@@ -167,7 +171,7 @@
perf_datacache_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datacache_postgres_SOURCES = \
test_datacache.c
@@ -174,7 +178,7 @@
test_datacache_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datacache_quota_postgres_SOURCES = \
test_datacache_quota.c
@@ -181,7 +185,7 @@
test_datacache_quota_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datacache_postgres_SOURCES = \
perf_datacache.c
@@ -188,7 +192,7 @@
perf_datacache_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatacache.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
test_datacache_data_sqlite.conf \
Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/datastore/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -24,11 +24,11 @@
libgnunetdatastore.la
libgnunetdatastore_la_SOURCES = \
- datastore_api.c datastore.h
+ datastore_api.c datastore.h
libgnunetdatastore_la_LIBADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
+ $(GN_LIBINTL)
libgnunetdatastore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 1:0:0
@@ -40,7 +40,7 @@
gnunet-service-datastore
gnunet_service_datastore_SOURCES = \
- gnunet-service-datastore.c
+ gnunet-service-datastore.c
gnunet_service_datastore_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
@@ -47,7 +47,7 @@
$(GN_LIBINTL)
gnunet_datastore_SOURCES = \
- gnunet-datastore.c
+ gnunet-datastore.c
gnunet_datastore_LDADD = \
libgnunetdatastore.la \
$(top_builddir)/src/util/libgnunetutil.la \
@@ -104,10 +104,14 @@
$(SQLITE_PLUGIN) \
$(MYSQL_PLUGIN) \
$(POSTGRES_PLUGIN) \
- libgnunet_plugin_datastore_heap.la \
- libgnunet_plugin_datastore_template.la
+ libgnunet_plugin_datastore_heap.la
+# Real plugins should of course go into
+# plugin_LTLIBRARIES
+noinst_LTLIBRARIES = \
+ libgnunet_plugin_datastore_template.la
+
libgnunet_plugin_datastore_sqlite_la_SOURCES = \
plugin_datastore_sqlite.c
libgnunet_plugin_datastore_sqlite_la_LIBADD = \
@@ -178,7 +182,7 @@
test_datastore_api_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_management_heap_SOURCES = \
test_datastore_api_management.c
@@ -185,7 +189,7 @@
test_datastore_api_management_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datastore_api_heap_SOURCES = \
perf_datastore_api.c
@@ -192,19 +196,19 @@
perf_datastore_api_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_plugin_datastore_heap_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_plugin_datastore_heap_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_heap_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_sqlite_SOURCES = \
@@ -212,7 +216,7 @@
test_datastore_api_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_management_sqlite_SOURCES = \
test_datastore_api_management.c
@@ -219,7 +223,7 @@
test_datastore_api_management_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datastore_api_sqlite_SOURCES = \
perf_datastore_api.c
@@ -226,19 +230,19 @@
perf_datastore_api_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_plugin_datastore_sqlite_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_plugin_datastore_sqlite_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_mysql_SOURCES = \
@@ -246,7 +250,7 @@
test_datastore_api_mysql_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_management_mysql_SOURCES = \
test_datastore_api_management.c
@@ -253,7 +257,7 @@
test_datastore_api_management_mysql_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datastore_api_mysql_SOURCES = \
perf_datastore_api.c
@@ -260,19 +264,19 @@
perf_datastore_api_mysql_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_plugin_datastore_mysql_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_mysql_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_plugin_datastore_mysql_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_mysql_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_postgres_SOURCES = \
@@ -280,7 +284,7 @@
test_datastore_api_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_datastore_api_management_postgres_SOURCES = \
test_datastore_api_management.c
@@ -287,7 +291,7 @@
test_datastore_api_management_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_datastore_api_postgres_SOURCES = \
perf_datastore_api.c
@@ -294,19 +298,19 @@
perf_datastore_api_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetdatastore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
test_plugin_datastore_postgres_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
perf_plugin_datastore_postgres_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/dht/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -47,9 +47,13 @@
libexec_PROGRAMS = \
- gnunet-service-dht \
+ gnunet-service-dht
+
+if HAVE_EXPERIMENTAL
+libexec_PROGRAMS += \
gnunet-service-dht-xvine \
gnunet-service-dht-whanau
+endif
noinst_PROGRAMS = \
gnunet-dht-monitor \
Modified: gnunet/src/template/Makefile.am
===================================================================
--- gnunet/src/template/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/template/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -9,7 +9,7 @@
template.conf
if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
if USE_COVERAGE
@@ -16,20 +16,23 @@
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
-bin_PROGRAMS = \
- gnunet-template
+# Note: In a real installation,
+# bin_PROGRAMS should be used for gnunet-template
+# libexec_PROGRAMS should be used for gnunet-service-template
-libexec_PROGRAMS = \
+noinst_PROGRAMS = \
+ gnunet-template \
gnunet-service-template
+
gnunet_template_SOURCES = \
- gnunet-template.c
+ gnunet-template.c
gnunet_template_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
gnunet_service_template_SOURCES = \
- gnunet-service-template.c
+ gnunet-service-template.c
gnunet_service_template_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -46,5 +49,4 @@
test_template_api_SOURCES = \
test_template_api.c
test_template_api_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
+ $(top_builddir)/src/util/libgnunetutil.la
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2015-06-02 08:07:49 UTC (rev 35852)
+++ gnunet/src/transport/Makefile.am 2015-06-02 08:54:18 UTC (rev 35853)
@@ -278,7 +278,11 @@
$(HTTP_SERVER_PLUGIN_LA) \
$(HTTPS_SERVER_PLUGIN_LA) \
$(WLAN_PLUGIN_LA) \
- $(BT_PLUGIN_LA) \
+ $(BT_PLUGIN_LA)
+
+# Note: real plugins of course need to be added
+# to the plugin_LTLIBRARIES above
+noinst_LTLIBRARIES = \
libgnunet_plugin_transport_template.la
libgnunet_plugin_transport_tcp_la_SOURCES = \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35853 - in gnunet/src: block consensus datacache datastore dht template transport,
gnunet <=