diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-01-02 02:55:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-01-02 11:57:10 +0100 |
commit | 4ffa88828d1f14aeef51a777d553e904549fb03e (patch) | |
tree | f57d025d8a2766d19053a15606e7b694804ae84e /src | |
parent | 4e084e4842cddf5de988534c84e2d65bb122472f (diff) | |
download | gnunet-4ffa88828d1f14aeef51a777d553e904549fb03e.tar.gz gnunet-4ffa88828d1f14aeef51a777d553e904549fb03e.zip |
fix more 'make dist' issues
Diffstat (limited to 'src')
-rw-r--r-- | src/auction/Makefile.am | 5 | ||||
-rw-r--r-- | src/dht/Makefile.am | 1 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht.c | 1 | ||||
-rw-r--r-- | src/identity-provider/Makefile.am | 5 | ||||
-rw-r--r-- | src/include/Makefile.am | 7 | ||||
-rw-r--r-- | src/jsonapi/Makefile.am | 2 | ||||
-rw-r--r-- | src/multicast/Makefile.am | 2 | ||||
-rw-r--r-- | src/rest/Makefile.am | 2 | ||||
-rw-r--r-- | src/set/Makefile.am | 2 | ||||
-rw-r--r-- | src/testbed/Makefile.am | 2 | ||||
-rw-r--r-- | 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 = \ | |||
68 | check_SCRIPTS = \ | 68 | check_SCRIPTS = \ |
69 | test_auction_create.sh | 69 | test_auction_create.sh |
70 | 70 | ||
71 | EXTRA_DIST = \ | ||
72 | auction.h \ | ||
73 | auction.conf \ | ||
74 | $(check_SCRIPTS) | ||
75 | |||
71 | if ENABLE_TEST_RUN | 76 | if ENABLE_TEST_RUN |
72 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 77 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
73 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 78 | 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 = \ | |||
197 | 197 | ||
198 | EXTRA_DIST = \ | 198 | EXTRA_DIST = \ |
199 | $(check_SCRIPTS) \ | 199 | $(check_SCRIPTS) \ |
200 | gnunet-service-dht_clients.c \ | ||
200 | test_dht_api_data.conf \ | 201 | test_dht_api_data.conf \ |
201 | test_dht_api_peer1.conf \ | 202 | test_dht_api_peer1.conf \ |
202 | test_dht_monitor.conf \ | 203 | 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; | |||
55 | struct GNUNET_TIME_Relative hello_expiration; | 55 | struct GNUNET_TIME_Relative hello_expiration; |
56 | 56 | ||
57 | 57 | ||
58 | /* Code shared between different DHT implementations */ | ||
59 | #include "gnunet-service-dht_clients.c" | 58 | #include "gnunet-service-dht_clients.c" |
60 | 59 | ||
61 | 60 | ||
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 = \ | |||
30 | libexec_PROGRAMS = \ | 30 | libexec_PROGRAMS = \ |
31 | gnunet-service-identity-provider | 31 | gnunet-service-identity-provider |
32 | 32 | ||
33 | EXTRA_DIST = \ | ||
34 | $(pkgcfg_DATA) | ||
35 | |||
33 | gnunet_service_identity_provider_SOURCES = \ | 36 | gnunet_service_identity_provider_SOURCES = \ |
34 | gnunet-service-identity-provider.c \ | 37 | gnunet-service-identity-provider.c \ |
35 | identity_token.c | 38 | identity_token.c identity_token.h |
36 | gnunet_service_identity_provider_LDADD = \ | 39 | gnunet_service_identity_provider_LDADD = \ |
37 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 40 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
38 | $(top_builddir)/src/util/libgnunetutil.la \ | 41 | $(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 = \ | |||
33 | gnunet_bandwidth_lib.h \ | 33 | gnunet_bandwidth_lib.h \ |
34 | gnunet_bio_lib.h \ | 34 | gnunet_bio_lib.h \ |
35 | gnunet_block_lib.h \ | 35 | gnunet_block_lib.h \ |
36 | gnunet_block_group_lib.h \ | ||
36 | gnunet_block_plugin.h \ | 37 | gnunet_block_plugin.h \ |
37 | gnunet_client_lib.h \ | 38 | gnunet_client_lib.h \ |
38 | gnunet_common.h \ | 39 | gnunet_common.h \ |
@@ -65,7 +66,10 @@ gnunetinclude_HEADERS = \ | |||
65 | gnunet_hello_lib.h \ | 66 | gnunet_hello_lib.h \ |
66 | gnunet_helper_lib.h \ | 67 | gnunet_helper_lib.h \ |
67 | gnunet_identity_service.h \ | 68 | gnunet_identity_service.h \ |
69 | gnunet_identity_provider_service.h \ | ||
68 | gnunet_json_lib.h \ | 70 | gnunet_json_lib.h \ |
71 | gnunet_jsonapi_lib.h \ | ||
72 | gnunet_jsonapi_util.h \ | ||
69 | gnunet_load_lib.h \ | 73 | gnunet_load_lib.h \ |
70 | gnunet_cadet_service.h \ | 74 | gnunet_cadet_service.h \ |
71 | gnunet_microphone_lib.h \ | 75 | gnunet_microphone_lib.h \ |
@@ -102,6 +106,8 @@ gnunetinclude_HEADERS = \ | |||
102 | gnunet_protocols.h \ | 106 | gnunet_protocols.h \ |
103 | gnunet_resolver_service.h \ | 107 | gnunet_resolver_service.h \ |
104 | gnunet_regex_service.h \ | 108 | gnunet_regex_service.h \ |
109 | gnunet_rest_lib.h \ | ||
110 | gnunet_rest_plugin.h \ | ||
105 | gnunet_revocation_service.h \ | 111 | gnunet_revocation_service.h \ |
106 | gnunet_scalarproduct_service.h \ | 112 | gnunet_scalarproduct_service.h \ |
107 | gnunet_scheduler_lib.h \ | 113 | gnunet_scheduler_lib.h \ |
@@ -111,6 +117,7 @@ gnunetinclude_HEADERS = \ | |||
111 | gnunet_signal_lib.h \ | 117 | gnunet_signal_lib.h \ |
112 | gnunet_signatures.h \ | 118 | gnunet_signatures.h \ |
113 | gnunet_social_service.h \ | 119 | gnunet_social_service.h \ |
120 | gnunet_socks.h \ | ||
114 | gnunet_speaker_lib.h \ | 121 | gnunet_speaker_lib.h \ |
115 | gnunet_sq_lib.h \ | 122 | gnunet_sq_lib.h \ |
116 | gnunet_statistics_service.h \ | 123 | 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 = \ | |||
24 | -version-info 0:0:0 \ | 24 | -version-info 0:0:0 \ |
25 | -no-undefined | 25 | -no-undefined |
26 | libgnunetjsonapi_la_SOURCES = \ | 26 | libgnunetjsonapi_la_SOURCES = \ |
27 | jsonapi_document.c \ | 27 | jsonapi_document.c jsonapi_objects.h \ |
28 | jsonapi_resource.c \ | 28 | jsonapi_resource.c \ |
29 | jsonapi_error.c \ | 29 | jsonapi_error.c \ |
30 | jsonapi_relationship.c | 30 | 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 | |||
19 | lib_LTLIBRARIES = libgnunetmulticast.la | 19 | lib_LTLIBRARIES = libgnunetmulticast.la |
20 | 20 | ||
21 | libgnunetmulticast_la_SOURCES = \ | 21 | libgnunetmulticast_la_SOURCES = \ |
22 | multicast_api.c | 22 | multicast_api.c multicast.h |
23 | libgnunetmulticast_la_LIBADD = \ | 23 | libgnunetmulticast_la_LIBADD = \ |
24 | $(top_builddir)/src/util/libgnunetutil.la \ | 24 | $(top_builddir)/src/util/libgnunetutil.la \ |
25 | $(GN_LIBINTL) $(XLIB) | 25 | $(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 = \ | |||
26 | libexec_PROGRAMS = \ | 26 | libexec_PROGRAMS = \ |
27 | gnunet-rest-server | 27 | gnunet-rest-server |
28 | 28 | ||
29 | EXTRA_DIST = \ | ||
30 | rest.conf | ||
29 | 31 | ||
30 | gnunet_rest_server_SOURCES = \ | 32 | gnunet_rest_server_SOURCES = \ |
31 | gnunet-rest-server.c | 33 | 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 = \ | |||
52 | gnunet_service_set_SOURCES = \ | 52 | gnunet_service_set_SOURCES = \ |
53 | gnunet-service-set.c gnunet-service-set.h \ | 53 | gnunet-service-set.c gnunet-service-set.h \ |
54 | gnunet-service-set_union.c gnunet-service-set_union.h \ | 54 | gnunet-service-set_union.c gnunet-service-set_union.h \ |
55 | gnunet-service-set_intersection.c \ | 55 | gnunet-service-set_intersection.c gnunet-service-set_intersection.h \ |
56 | ibf.c ibf.h \ | 56 | ibf.c ibf.h \ |
57 | gnunet-service-set_union_strata_estimator.c gnunet-service-set_union_strata_estimator.h \ | 57 | gnunet-service-set_union_strata_estimator.c gnunet-service-set_union_strata_estimator.h \ |
58 | gnunet-service-set_protocol.h | 58 | 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 = \ | |||
45 | gnunet-service-testbed_oc.c \ | 45 | gnunet-service-testbed_oc.c \ |
46 | gnunet-service-testbed_cpustatus.c \ | 46 | gnunet-service-testbed_cpustatus.c \ |
47 | gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \ | 47 | gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \ |
48 | gnunet-service-testbed_barriers.c \ | 48 | gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \ |
49 | gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h | 49 | gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h |
50 | gnunet_service_testbed_LDADD = $(XLIB) \ | 50 | gnunet_service_testbed_LDADD = $(XLIB) \ |
51 | $(top_builddir)/src/util/libgnunetutil.la \ | 51 | $(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 = \ | |||
295 | libgnunet_plugin_transport_template.la | 295 | libgnunet_plugin_transport_template.la |
296 | 296 | ||
297 | libgnunet_plugin_transport_tcp_la_SOURCES = \ | 297 | libgnunet_plugin_transport_tcp_la_SOURCES = \ |
298 | plugin_transport_tcp.c | 298 | plugin_transport_tcp.c |
299 | libgnunet_plugin_transport_tcp_la_LIBADD = \ | 299 | libgnunet_plugin_transport_tcp_la_LIBADD = \ |
300 | $(top_builddir)/src/hello/libgnunethello.la \ | 300 | $(top_builddir)/src/hello/libgnunethello.la \ |
301 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 301 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -1349,4 +1349,8 @@ test_transport_api_http_reverse_peer2.conf \ | |||
1349 | perf_tcp_peer1.conf \ | 1349 | perf_tcp_peer1.conf \ |
1350 | perf_tcp_peer2.conf \ | 1350 | perf_tcp_peer2.conf \ |
1351 | test_transport_api_slow_ats_peer1.conf \ | 1351 | test_transport_api_slow_ats_peer1.conf \ |
1352 | test_transport_api_slow_ats_peer2.conf | 1352 | test_transport_api_slow_ats_peer2.conf \ |
1353 | tcp_connection_legacy.c \ | ||
1354 | tcp_server_mst_legacy.c \ | ||
1355 | tcp_server_legacy.c \ | ||
1356 | tcp_service_legacy.c | ||