diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-22 11:53:26 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-22 11:53:26 +0000 |
commit | d9a610d5d7c6d5c59f7c75385dcc9767c06bd5c3 (patch) | |
tree | 0e8e19c935735b4ab2cd2e6b884e70a451331ed3 /src | |
parent | 171caf7cfe0ef1baf0bab83d9efbbfde8d672562 (diff) | |
download | gnunet-d9a610d5d7c6d5c59f7c75385dcc9767c06bd5c3.tar.gz gnunet-d9a610d5d7c6d5c59f7c75385dcc9767c06bd5c3.zip |
moving block plugins to respective subsystem
Diffstat (limited to 'src')
-rw-r--r-- | src/block/Makefile.am | 32 | ||||
-rw-r--r-- | src/dht/Makefile.am | 18 | ||||
-rw-r--r-- | src/dht/plugin_block_dht.c (renamed from src/block/plugin_block_dht.c) | 0 | ||||
-rw-r--r-- | src/fs/Makefile.am | 18 | ||||
-rw-r--r-- | src/fs/plugin_block_fs.c (renamed from src/block/plugin_block_fs.c) | 0 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 14 | ||||
-rw-r--r-- | src/vpn/plugin_block_dns.c (renamed from src/block/plugin_block_dns.c) | 0 |
7 files changed, 49 insertions, 33 deletions
diff --git a/src/block/Makefile.am b/src/block/Makefile.am index cfbcb797f..39de6edf0 100644 --- a/src/block/Makefile.am +++ b/src/block/Makefile.am | |||
@@ -13,41 +13,9 @@ endif | |||
13 | lib_LTLIBRARIES = libgnunetblock.la | 13 | lib_LTLIBRARIES = libgnunetblock.la |
14 | 14 | ||
15 | plugin_LTLIBRARIES = \ | 15 | plugin_LTLIBRARIES = \ |
16 | libgnunet_plugin_block_dht.la \ | ||
17 | libgnunet_plugin_block_fs.la \ | ||
18 | libgnunet_plugin_block_template.la \ | 16 | libgnunet_plugin_block_template.la \ |
19 | libgnunet_plugin_block_dns.la \ | ||
20 | libgnunet_plugin_block_test.la | 17 | libgnunet_plugin_block_test.la |
21 | 18 | ||
22 | libgnunet_plugin_block_dht_la_SOURCES = \ | ||
23 | plugin_block_dht.c | ||
24 | libgnunet_plugin_block_dht_la_LIBADD = \ | ||
25 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
26 | $(top_builddir)/src/block/libgnunetblock.la \ | ||
27 | $(top_builddir)/src/util/libgnunetutil.la | ||
28 | libgnunet_plugin_block_dht_la_LDFLAGS = \ | ||
29 | $(GN_PLUGIN_LDFLAGS) | ||
30 | libgnunet_plugin_block_dht_la_DEPENDENCIES = \ | ||
31 | libgnunetblock.la | ||
32 | |||
33 | |||
34 | libgnunet_plugin_block_fs_la_SOURCES = \ | ||
35 | plugin_block_fs.c | ||
36 | libgnunet_plugin_block_fs_la_LIBADD = \ | ||
37 | $(top_builddir)/src/block/libgnunetblock.la \ | ||
38 | $(top_builddir)/src/util/libgnunetutil.la | ||
39 | libgnunet_plugin_block_fs_la_LDFLAGS = \ | ||
40 | $(GN_PLUGIN_LDFLAGS) | ||
41 | libgnunet_plugin_block_fs_la_DEPENDENCIES = \ | ||
42 | libgnunetblock.la | ||
43 | |||
44 | |||
45 | libgnunet_plugin_block_dns_la_SOURCES = \ | ||
46 | plugin_block_dns.c | ||
47 | libgnunet_plugin_block_dns_la_LIBADD = \ | ||
48 | $(top_builddir)/src/util/libgnunetutil.la | ||
49 | libgnunet_plugin_block_dns_la_LDFLAGS = \ | ||
50 | $(GN_PLUGIN_LDFLAGS) | ||
51 | 19 | ||
52 | libgnunet_plugin_block_template_la_SOURCES = \ | 20 | libgnunet_plugin_block_template_la_SOURCES = \ |
53 | plugin_block_template.c | 21 | plugin_block_template.c |
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index ad1d05d25..b2bbf5897 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -22,7 +22,6 @@ endif | |||
22 | lib_LTLIBRARIES = \ | 22 | lib_LTLIBRARIES = \ |
23 | libgnunetdht.la | 23 | libgnunetdht.la |
24 | 24 | ||
25 | |||
26 | libgnunetdht_la_SOURCES = \ | 25 | libgnunetdht_la_SOURCES = \ |
27 | dht_api.c dht.h | 26 | dht_api.c dht.h |
28 | libgnunetdht_la_LIBADD = \ | 27 | libgnunetdht_la_LIBADD = \ |
@@ -32,6 +31,23 @@ libgnunetdht_la_LDFLAGS = \ | |||
32 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 31 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
33 | -version-info 0:0:0 | 32 | -version-info 0:0:0 |
34 | 33 | ||
34 | |||
35 | plugin_LTLIBRARIES = \ | ||
36 | libgnunet_plugin_block_dht.la | ||
37 | |||
38 | libgnunet_plugin_block_dht_la_SOURCES = \ | ||
39 | plugin_block_dht.c | ||
40 | libgnunet_plugin_block_dht_la_LIBADD = \ | ||
41 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
42 | $(top_builddir)/src/block/libgnunetblock.la \ | ||
43 | $(top_builddir)/src/util/libgnunetutil.la | ||
44 | libgnunet_plugin_block_dht_la_LDFLAGS = \ | ||
45 | $(GN_PLUGIN_LDFLAGS) | ||
46 | libgnunet_plugin_block_dht_la_DEPENDENCIES = \ | ||
47 | $(top_builddir)/src/block/libgnunetblock.la | ||
48 | |||
49 | |||
50 | |||
35 | bin_PROGRAMS = \ | 51 | bin_PROGRAMS = \ |
36 | gnunet-service-dht \ | 52 | gnunet-service-dht \ |
37 | gnunet-dht-get \ | 53 | gnunet-dht-get \ |
diff --git a/src/block/plugin_block_dht.c b/src/dht/plugin_block_dht.c index f574e6d06..f574e6d06 100644 --- a/src/block/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c | |||
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index b1f15afa3..22201b45a 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -14,9 +14,14 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
14 | dist_pkgcfg_DATA = \ | 14 | dist_pkgcfg_DATA = \ |
15 | fs.conf | 15 | fs.conf |
16 | 16 | ||
17 | plugindir = $(libdir)/gnunet | ||
18 | |||
17 | 19 | ||
18 | lib_LTLIBRARIES = libgnunetfs.la | 20 | lib_LTLIBRARIES = libgnunetfs.la |
19 | 21 | ||
22 | plugin_LTLIBRARIES = \ | ||
23 | libgnunet_plugin_block_fs.la | ||
24 | |||
20 | noinst_LIBRARIES = libgnunetfstest.a | 25 | noinst_LIBRARIES = libgnunetfstest.a |
21 | 26 | ||
22 | libgnunetfs_la_SOURCES = \ | 27 | libgnunetfs_la_SOURCES = \ |
@@ -151,6 +156,19 @@ gnunet_unindex_LDADD = \ | |||
151 | gnunet_unindex_DEPENDENCIES = \ | 156 | gnunet_unindex_DEPENDENCIES = \ |
152 | libgnunetfs.la | 157 | libgnunetfs.la |
153 | 158 | ||
159 | |||
160 | libgnunet_plugin_block_fs_la_SOURCES = \ | ||
161 | plugin_block_fs.c | ||
162 | libgnunet_plugin_block_fs_la_LIBADD = \ | ||
163 | $(top_builddir)/src/block/libgnunetblock.la \ | ||
164 | $(top_builddir)/src/util/libgnunetutil.la | ||
165 | libgnunet_plugin_block_fs_la_LDFLAGS = \ | ||
166 | $(GN_PLUGIN_LDFLAGS) | ||
167 | libgnunet_plugin_block_fs_la_DEPENDENCIES = \ | ||
168 | $(top_builddir)/src/block/libgnunetblock.la | ||
169 | |||
170 | |||
171 | |||
154 | if HAVE_BENCHMARKS | 172 | if HAVE_BENCHMARKS |
155 | FS_BENCHMARKS = \ | 173 | FS_BENCHMARKS = \ |
156 | perf_gnunet_service_fs_p2p \ | 174 | perf_gnunet_service_fs_p2p \ |
diff --git a/src/block/plugin_block_fs.c b/src/fs/plugin_block_fs.c index c1b4ad7c8..c1b4ad7c8 100644 --- a/src/block/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c | |||
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index c6b390aca..e69c5643e 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -10,6 +10,8 @@ endif | |||
10 | 10 | ||
11 | pkgcfgdir= $(pkgdatadir)/config.d/ | 11 | pkgcfgdir= $(pkgdatadir)/config.d/ |
12 | 12 | ||
13 | plugindir = $(libdir)/gnunet | ||
14 | |||
13 | dist_pkgcfg_DATA = \ | 15 | dist_pkgcfg_DATA = \ |
14 | vpn.conf | 16 | vpn.conf |
15 | 17 | ||
@@ -72,6 +74,18 @@ gnunet_daemon_exit_LDADD = \ | |||
72 | $(top_builddir)/src/mesh/libgnunetmesh.la \ | 74 | $(top_builddir)/src/mesh/libgnunetmesh.la \ |
73 | $(GN_LIBINTL) | 75 | $(GN_LIBINTL) |
74 | 76 | ||
77 | |||
78 | plugin_LTLIBRARIES = \ | ||
79 | libgnunet_plugin_block_dns.la | ||
80 | |||
81 | libgnunet_plugin_block_dns_la_SOURCES = \ | ||
82 | plugin_block_dns.c | ||
83 | libgnunet_plugin_block_dns_la_LIBADD = \ | ||
84 | $(top_builddir)/src/util/libgnunetutil.la | ||
85 | libgnunet_plugin_block_dns_la_LDFLAGS = \ | ||
86 | $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS) | ||
87 | |||
88 | |||
75 | #check_PROGRAMS = \ | 89 | #check_PROGRAMS = \ |
76 | # test_XXX | 90 | # test_XXX |
77 | 91 | ||
diff --git a/src/block/plugin_block_dns.c b/src/vpn/plugin_block_dns.c index b33b3798a..b33b3798a 100644 --- a/src/block/plugin_block_dns.c +++ b/src/vpn/plugin_block_dns.c | |||