aboutsummaryrefslogtreecommitdiff
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
parent5d1fce16859e1263decfb1113957607e7468e792 (diff)
ship with conf files
-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 2faeb23576..93af6f0390 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -112,5 +112,13 @@ test_core_quota_compliance_asymmetric_recv_limited_LDADD = \
EXTRA_DIST = \
test_core_api_data.conf \
test_core_api_peer1.conf \
- test_core_api_peer2.conf
-
+ test_core_api_peer2.conf \
+ test_core_api_send_to_self.conf \
+ test_core_quota_asymmetric_recv_limited_peer1.conf \
+ test_core_quota_asymmetric_recv_limited_peer2.conf \
+ test_core_quota_asymmetric_send_limited_peer1.conf \
+ test_core_quota_asymmetric_send_limited_peer2.conf \
+ test_core_quota_asymmetric_send_limit_peer1.conf \
+ test_core_quota_asymmetric_send_limit_peer2.conf \
+ test_core_quota_peer1.conf \
+ test_core_quota_peer2.conf
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index a3c4845310..027a805190 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -222,4 +222,7 @@ EXTRA_DIST = \
test_datastore_api_data_mysql.conf \
perf_plugin_datastore_data_mysql.conf \
test_datastore_api_data_postgres.conf \
- perf_plugin_datastore_data_postgres.conf
+ perf_plugin_datastore_data_postgres.conf \
+ test_plugin_datastore_data_mysql.conf \
+ test_plugin_datastore_data_postgres.conf \
+ 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 11ab7ca8be..294b912890 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -226,7 +226,8 @@ EXTRA_DIST = \
test_dht_api_data.conf \
test_dht_api_peer1.conf \
test_dht_twopeer_data.conf \
- test_dht_multipeer_data.conf
+ test_dht_multipeer_data.conf \
+ test_dhtlog_data.conf
check_SCRIPTS = \
test_dht_tools.sh
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 04f300fadf..254f5ab4d8 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -11,6 +11,7 @@ if MINGW
endif
gnunetinclude_HEADERS = \
+ gauger.h \
gettext.h \
platform.h \
plibc.h \
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 7cdf98c989..653bd9eb34 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -56,4 +56,7 @@ test_mesh_api_LDADD = \
test_mesh_api_DEPENDENCIES = \
libgnunetmeshnew.la
-TESTS = test_mesh_api \ No newline at end of file
+TESTS = test_mesh_api
+
+EXTRA_DIST = \
+ test_mesh.conf \ No newline at end of file
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am
index 4b170da58c..60329df8dc 100644
--- a/src/monkey/Makefile.am
+++ b/src/monkey/Makefile.am
@@ -87,7 +87,7 @@ bug_bad_memory_access:
bug_assertion_failure:
gcc -g -O0 -o bug_assertion_failure bug_assertion_failure.c
-
+
check_PROGRAMS = \
test_monkey_edb
#test_gnunet_monkey
@@ -114,9 +114,9 @@ check_SCRIPTS = \
#test_gnunet_monkey.sh \
#test_monkey_npe.sh
-#EXTRA_DIST = \
+EXTRA_DIST = \
+ test_gnunet_monkey_data.conf
#$(check_SCRIPTS)
-#test_gnunet_monkey_data.conf
endif
endif
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index cfdd1ac24b..8542af8fa8 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -49,3 +49,6 @@ test_nat_LDADD = \
$(top_builddir)/src/nat/libgnunetnat.la \
$(top_builddir)/src/util/libgnunetutil.la \
@LIBCURL@
+
+EXTRA_DIST = \
+ test-nat.conf
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index c25087d69e..2b17788765 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -237,5 +237,7 @@ EXTRA_DIST = \
test_testing_data_topology_scale_free.conf \
test_testing_data_topology_blacklist.conf \
test_testing_data_topology_churn.conf \
- test_testing_data_topology_none.conf
-
+ test_testing_data_topology_none.conf \
+ test_testing_data_remote.conf \
+ test_testing_data_topology_stability.conf \
+ test_testing_peergroup_data.conf
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index bba676eb90..e21895f7f0 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -591,4 +591,8 @@ EXTRA_DIST = \
test_quota_compliance_udp_peer1.conf \
test_quota_compliance_udp_peer2.conf \
test_quota_compliance_unix_peer1.conf \
- test_quota_compliance_unix_peer2.conf
+ test_quota_compliance_unix_peer2.conf \
+ test_plugin_transport_data_udp.conf \
+ test_transport_ats_1addr.conf \
+ test_transport_ats_2addr.conf \
+ test_transport_ats_4addr.conf
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index f36031f7be..d2835c8462 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -82,4 +82,5 @@ endif
# $(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
- gnunet-vpn-packet.h
+ gnunet-vpn-packet.h \
+ test-conf.conf