From 4ffa88828d1f14aeef51a777d553e904549fb03e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 2 Jan 2018 02:55:01 +0100 Subject: [PATCH] fix more 'make dist' issues --- src/auction/Makefile.am | 5 +++++ src/dht/Makefile.am | 1 + src/dht/gnunet-service-dht.c | 1 - src/identity-provider/Makefile.am | 5 ++++- src/include/Makefile.am | 7 +++++++ src/jsonapi/Makefile.am | 2 +- src/multicast/Makefile.am | 2 +- src/rest/Makefile.am | 2 ++ src/set/Makefile.am | 2 +- src/testbed/Makefile.am | 2 +- src/transport/Makefile.am | 8 ++++++-- 11 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/auction/Makefile.am b/src/auction/Makefile.am index bdede0ce0..f86e846e2 100644 --- a/src/auction/Makefile.am +++ b/src/auction/Makefile.am @@ -68,6 +68,11 @@ test_auction_api_LDADD = \ check_SCRIPTS = \ test_auction_create.sh +EXTRA_DIST = \ + auction.h \ + auction.conf \ + $(check_SCRIPTS) + if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; TESTS = $(check_PROGRAMS) $(check_SCRIPTS) diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 4a78ea4c7..d60ff62d6 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -197,6 +197,7 @@ test_dht_monitor_LDADD = \ EXTRA_DIST = \ $(check_SCRIPTS) \ + gnunet-service-dht_clients.c \ test_dht_api_data.conf \ test_dht_api_peer1.conf \ test_dht_monitor.conf \ diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index f2b922dc4..829c53aea 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c @@ -55,7 +55,6 @@ static struct GNUNET_TRANSPORT_HelloGetHandle *ghh; struct GNUNET_TIME_Relative hello_expiration; -/* Code shared between different DHT implementations */ #include "gnunet-service-dht_clients.c" diff --git a/src/identity-provider/Makefile.am b/src/identity-provider/Makefile.am index 7c2bb9646..0d8752c4c 100644 --- a/src/identity-provider/Makefile.am +++ b/src/identity-provider/Makefile.am @@ -30,9 +30,12 @@ bin_PROGRAMS = \ libexec_PROGRAMS = \ gnunet-service-identity-provider +EXTRA_DIST = \ + $(pkgcfg_DATA) + gnunet_service_identity_provider_SOURCES = \ gnunet-service-identity-provider.c \ - identity_token.c + identity_token.c identity_token.h gnunet_service_identity_provider_LDADD = \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ $(top_builddir)/src/util/libgnunetutil.la \ diff --git a/src/include/Makefile.am b/src/include/Makefile.am index e5abec416..08e9dd156 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -33,6 +33,7 @@ gnunetinclude_HEADERS = \ gnunet_bandwidth_lib.h \ gnunet_bio_lib.h \ gnunet_block_lib.h \ + gnunet_block_group_lib.h \ gnunet_block_plugin.h \ gnunet_client_lib.h \ gnunet_common.h \ @@ -65,7 +66,10 @@ gnunetinclude_HEADERS = \ gnunet_hello_lib.h \ gnunet_helper_lib.h \ gnunet_identity_service.h \ + gnunet_identity_provider_service.h \ gnunet_json_lib.h \ + gnunet_jsonapi_lib.h \ + gnunet_jsonapi_util.h \ gnunet_load_lib.h \ gnunet_cadet_service.h \ gnunet_microphone_lib.h \ @@ -102,6 +106,8 @@ gnunetinclude_HEADERS = \ gnunet_protocols.h \ gnunet_resolver_service.h \ gnunet_regex_service.h \ + gnunet_rest_lib.h \ + gnunet_rest_plugin.h \ gnunet_revocation_service.h \ gnunet_scalarproduct_service.h \ gnunet_scheduler_lib.h \ @@ -111,6 +117,7 @@ gnunetinclude_HEADERS = \ gnunet_signal_lib.h \ gnunet_signatures.h \ gnunet_social_service.h \ + gnunet_socks.h \ gnunet_speaker_lib.h \ gnunet_sq_lib.h \ gnunet_statistics_service.h \ diff --git a/src/jsonapi/Makefile.am b/src/jsonapi/Makefile.am index 3cf3a4cd2..054d3c550 100644 --- a/src/jsonapi/Makefile.am +++ b/src/jsonapi/Makefile.am @@ -24,7 +24,7 @@ libgnunetjsonapi_la_LDFLAGS = \ -version-info 0:0:0 \ -no-undefined libgnunetjsonapi_la_SOURCES = \ - jsonapi_document.c \ + jsonapi_document.c jsonapi_objects.h \ jsonapi_resource.c \ jsonapi_error.c \ jsonapi_relationship.c diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index 13212bca3..48185e1a4 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am @@ -19,7 +19,7 @@ endif lib_LTLIBRARIES = libgnunetmulticast.la libgnunetmulticast_la_SOURCES = \ - multicast_api.c + multicast_api.c multicast.h libgnunetmulticast_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am index c0feb9122..ebfb98024 100644 --- a/src/rest/Makefile.am +++ b/src/rest/Makefile.am @@ -26,6 +26,8 @@ lib_LTLIBRARIES = \ libexec_PROGRAMS = \ gnunet-rest-server +EXTRA_DIST = \ + rest.conf gnunet_rest_server_SOURCES = \ gnunet-rest-server.c diff --git a/src/set/Makefile.am b/src/set/Makefile.am index 14667d0ef..df17fa1ab 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am @@ -52,7 +52,7 @@ gnunet_set_ibf_profiler_LDADD = \ gnunet_service_set_SOURCES = \ gnunet-service-set.c gnunet-service-set.h \ gnunet-service-set_union.c gnunet-service-set_union.h \ - gnunet-service-set_intersection.c \ + gnunet-service-set_intersection.c gnunet-service-set_intersection.h \ ibf.c ibf.h \ gnunet-service-set_union_strata_estimator.c gnunet-service-set_union_strata_estimator.h \ gnunet-service-set_protocol.h diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 94b981eee..e858e44b4 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am @@ -45,7 +45,7 @@ gnunet_service_testbed_SOURCES = \ gnunet-service-testbed_oc.c \ gnunet-service-testbed_cpustatus.c \ gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \ - gnunet-service-testbed_barriers.c \ + gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \ gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h gnunet_service_testbed_LDADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la \ diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 5cf830c36..e8c1f5d4a 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -295,7 +295,7 @@ noinst_LTLIBRARIES = \ libgnunet_plugin_transport_template.la libgnunet_plugin_transport_tcp_la_SOURCES = \ - plugin_transport_tcp.c + plugin_transport_tcp.c libgnunet_plugin_transport_tcp_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @@ -1349,4 +1349,8 @@ test_transport_api_http_reverse_peer2.conf \ perf_tcp_peer1.conf \ perf_tcp_peer2.conf \ test_transport_api_slow_ats_peer1.conf \ -test_transport_api_slow_ats_peer2.conf +test_transport_api_slow_ats_peer2.conf \ + tcp_connection_legacy.c \ + tcp_server_mst_legacy.c \ + tcp_server_legacy.c \ + tcp_service_legacy.c -- 2.25.1