aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-06-10 15:00:35 +0000
committerChristian Grothoff <christian@grothoff.org>2011-06-10 15:00:35 +0000
commitb68913a0f7b62ece97738243616ad8e2dbe5619c (patch)
treefee223fb50f6f1c4fc71a423c40c6f59d88d670a /src
parent5d1fce16859e1263decfb1113957607e7468e792 (diff)
downloadgnunet-b68913a0f7b62ece97738243616ad8e2dbe5619c.tar.gz
gnunet-b68913a0f7b62ece97738243616ad8e2dbe5619c.zip
ship with conf files
Diffstat (limited to 'src')
-rw-r--r--src/core/Makefile.am12
-rw-r--r--src/datastore/Makefile.am5
-rw-r--r--src/dht/Makefile.am3
-rw-r--r--src/include/Makefile.am1
-rw-r--r--src/mesh/Makefile.am5
-rw-r--r--src/monkey/Makefile.am6
-rw-r--r--src/nat/Makefile.am3
-rw-r--r--src/testing/Makefile.am6
-rw-r--r--src/transport/Makefile.am6
-rw-r--r--src/vpn/Makefile.am3
10 files changed, 38 insertions, 12 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 2faeb2357..93af6f039 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -112,5 +112,13 @@ test_core_quota_compliance_asymmetric_recv_limited_LDADD = \
112EXTRA_DIST = \ 112EXTRA_DIST = \
113 test_core_api_data.conf \ 113 test_core_api_data.conf \
114 test_core_api_peer1.conf \ 114 test_core_api_peer1.conf \
115 test_core_api_peer2.conf 115 test_core_api_peer2.conf \
116 116 test_core_api_send_to_self.conf \
117 test_core_quota_asymmetric_recv_limited_peer1.conf \
118 test_core_quota_asymmetric_recv_limited_peer2.conf \
119 test_core_quota_asymmetric_send_limited_peer1.conf \
120 test_core_quota_asymmetric_send_limited_peer2.conf \
121 test_core_quota_asymmetric_send_limit_peer1.conf \
122 test_core_quota_asymmetric_send_limit_peer2.conf \
123 test_core_quota_peer1.conf \
124 test_core_quota_peer2.conf
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index a3c484531..027a80519 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -222,4 +222,7 @@ EXTRA_DIST = \
222 test_datastore_api_data_mysql.conf \ 222 test_datastore_api_data_mysql.conf \
223 perf_plugin_datastore_data_mysql.conf \ 223 perf_plugin_datastore_data_mysql.conf \
224 test_datastore_api_data_postgres.conf \ 224 test_datastore_api_data_postgres.conf \
225 perf_plugin_datastore_data_postgres.conf 225 perf_plugin_datastore_data_postgres.conf \
226 test_plugin_datastore_data_mysql.conf \
227 test_plugin_datastore_data_postgres.conf \
228 test_plugin_datastore_data_sqlite.conf \ No newline at end of file
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 11ab7ca8b..294b91289 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -226,7 +226,8 @@ EXTRA_DIST = \
226 test_dht_api_data.conf \ 226 test_dht_api_data.conf \
227 test_dht_api_peer1.conf \ 227 test_dht_api_peer1.conf \
228 test_dht_twopeer_data.conf \ 228 test_dht_twopeer_data.conf \
229 test_dht_multipeer_data.conf 229 test_dht_multipeer_data.conf \
230 test_dhtlog_data.conf
230 231
231check_SCRIPTS = \ 232check_SCRIPTS = \
232 test_dht_tools.sh 233 test_dht_tools.sh
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 04f300fad..254f5ab4d 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -11,6 +11,7 @@ if MINGW
11endif 11endif
12 12
13gnunetinclude_HEADERS = \ 13gnunetinclude_HEADERS = \
14 gauger.h \
14 gettext.h \ 15 gettext.h \
15 platform.h \ 16 platform.h \
16 plibc.h \ 17 plibc.h \
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 7cdf98c98..653bd9eb3 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -56,4 +56,7 @@ test_mesh_api_LDADD = \
56test_mesh_api_DEPENDENCIES = \ 56test_mesh_api_DEPENDENCIES = \
57 libgnunetmeshnew.la 57 libgnunetmeshnew.la
58 58
59TESTS = test_mesh_api \ No newline at end of file 59TESTS = test_mesh_api
60
61EXTRA_DIST = \
62 test_mesh.conf \ No newline at end of file
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am
index 4b170da58..60329df8d 100644
--- a/src/monkey/Makefile.am
+++ b/src/monkey/Makefile.am
@@ -87,7 +87,7 @@ bug_bad_memory_access:
87 87
88bug_assertion_failure: 88bug_assertion_failure:
89 gcc -g -O0 -o bug_assertion_failure bug_assertion_failure.c 89 gcc -g -O0 -o bug_assertion_failure bug_assertion_failure.c
90 90
91check_PROGRAMS = \ 91check_PROGRAMS = \
92 test_monkey_edb 92 test_monkey_edb
93 #test_gnunet_monkey 93 #test_gnunet_monkey
@@ -114,9 +114,9 @@ check_SCRIPTS = \
114 #test_gnunet_monkey.sh \ 114 #test_gnunet_monkey.sh \
115 #test_monkey_npe.sh 115 #test_monkey_npe.sh
116 116
117#EXTRA_DIST = \ 117EXTRA_DIST = \
118 test_gnunet_monkey_data.conf
118#$(check_SCRIPTS) 119#$(check_SCRIPTS)
119#test_gnunet_monkey_data.conf
120 120
121endif 121endif
122endif 122endif
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index cfdd1ac24..8542af8fa 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -49,3 +49,6 @@ test_nat_LDADD = \
49 $(top_builddir)/src/nat/libgnunetnat.la \ 49 $(top_builddir)/src/nat/libgnunetnat.la \
50 $(top_builddir)/src/util/libgnunetutil.la \ 50 $(top_builddir)/src/util/libgnunetutil.la \
51 @LIBCURL@ 51 @LIBCURL@
52
53EXTRA_DIST = \
54 test-nat.conf
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index c25087d69..2b1778876 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -237,5 +237,7 @@ EXTRA_DIST = \
237 test_testing_data_topology_scale_free.conf \ 237 test_testing_data_topology_scale_free.conf \
238 test_testing_data_topology_blacklist.conf \ 238 test_testing_data_topology_blacklist.conf \
239 test_testing_data_topology_churn.conf \ 239 test_testing_data_topology_churn.conf \
240 test_testing_data_topology_none.conf 240 test_testing_data_topology_none.conf \
241 241 test_testing_data_remote.conf \
242 test_testing_data_topology_stability.conf \
243 test_testing_peergroup_data.conf
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index bba676eb9..e21895f7f 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -591,4 +591,8 @@ EXTRA_DIST = \
591 test_quota_compliance_udp_peer1.conf \ 591 test_quota_compliance_udp_peer1.conf \
592 test_quota_compliance_udp_peer2.conf \ 592 test_quota_compliance_udp_peer2.conf \
593 test_quota_compliance_unix_peer1.conf \ 593 test_quota_compliance_unix_peer1.conf \
594 test_quota_compliance_unix_peer2.conf 594 test_quota_compliance_unix_peer2.conf \
595 test_plugin_transport_data_udp.conf \
596 test_transport_ats_1addr.conf \
597 test_transport_ats_2addr.conf \
598 test_transport_ats_4addr.conf
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index f36031f7b..d2835c846 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -82,4 +82,5 @@ endif
82# $(top_builddir)/src/util/libgnunetutil.la 82# $(top_builddir)/src/util/libgnunetutil.la
83 83
84EXTRA_DIST = \ 84EXTRA_DIST = \
85 gnunet-vpn-packet.h 85 gnunet-vpn-packet.h \
86 test-conf.conf