diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/dns/Makefile.am | 34 | ||||
-rw-r--r-- | src/util/Makefile.am | 25 | ||||
-rw-r--r-- | src/util/dnsparser.c (renamed from src/dns/dnsparser.c) | 0 | ||||
-rw-r--r-- | src/util/dnsstub.c (renamed from src/dns/dnsstub.c) | 0 | ||||
-rw-r--r-- | src/util/regex.c (renamed from src/tun/regex.c) | 0 | ||||
-rw-r--r-- | src/util/test_regex.c (renamed from src/tun/test_regex.c) | 0 | ||||
-rw-r--r-- | src/util/test_tun.c (renamed from src/tun/test_tun.c) | 0 | ||||
-rw-r--r-- | src/util/tun.c (renamed from src/tun/tun.c) | 0 |
9 files changed, 23 insertions, 37 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d8d548706..00f30adc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -83,7 +83,6 @@ SUBDIRS = \ | |||
83 | $(REST_DIR) \ | 83 | $(REST_DIR) \ |
84 | $(JSONAPI_DIR) \ | 84 | $(JSONAPI_DIR) \ |
85 | hello \ | 85 | hello \ |
86 | tun \ | ||
87 | block \ | 86 | block \ |
88 | statistics \ | 87 | statistics \ |
89 | arm \ | 88 | arm \ |
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 9a4ecdcfd..ca2685765 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -27,8 +27,6 @@ install-exec-hook: | |||
27 | endif | 27 | endif |
28 | 28 | ||
29 | lib_LTLIBRARIES = \ | 29 | lib_LTLIBRARIES = \ |
30 | libgnunetdnsparser.la \ | ||
31 | libgnunetdnsstub.la \ | ||
32 | libgnunetdns.la | 30 | libgnunetdns.la |
33 | 31 | ||
34 | libexec_PROGRAMS = \ | 32 | libexec_PROGRAMS = \ |
@@ -47,9 +45,6 @@ check_SCRIPTS = \ | |||
47 | test_gnunet_dns.sh | 45 | test_gnunet_dns.sh |
48 | endif | 46 | endif |
49 | 47 | ||
50 | check_PROGRAMS = \ | ||
51 | test_hexcoder | ||
52 | |||
53 | gnunet_helper_dns_SOURCES = \ | 48 | gnunet_helper_dns_SOURCES = \ |
54 | gnunet-helper-dns.c | 49 | gnunet-helper-dns.c |
55 | 50 | ||
@@ -57,7 +52,6 @@ gnunet_helper_dns_SOURCES = \ | |||
57 | gnunet_dns_monitor_SOURCES = \ | 52 | gnunet_dns_monitor_SOURCES = \ |
58 | gnunet-dns-monitor.c | 53 | gnunet-dns-monitor.c |
59 | gnunet_dns_monitor_LDADD = \ | 54 | gnunet_dns_monitor_LDADD = \ |
60 | libgnunetdnsparser.la \ | ||
61 | libgnunetdns.la \ | 55 | libgnunetdns.la \ |
62 | $(top_builddir)/src/util/libgnunetutil.la \ | 56 | $(top_builddir)/src/util/libgnunetutil.la \ |
63 | $(GN_LIBINTL) | 57 | $(GN_LIBINTL) |
@@ -65,15 +59,12 @@ gnunet_dns_monitor_LDADD = \ | |||
65 | gnunet_zonewalk_SOURCES = \ | 59 | gnunet_zonewalk_SOURCES = \ |
66 | gnunet-zonewalk.c | 60 | gnunet-zonewalk.c |
67 | gnunet_zonewalk_LDADD = \ | 61 | gnunet_zonewalk_LDADD = \ |
68 | libgnunetdnsparser.la \ | ||
69 | libgnunetdnsstub.la \ | ||
70 | $(top_builddir)/src/util/libgnunetutil.la \ | 62 | $(top_builddir)/src/util/libgnunetutil.la \ |
71 | $(GN_LIBINTL) | 63 | $(GN_LIBINTL) |
72 | 64 | ||
73 | gnunet_dns_redirector_SOURCES = \ | 65 | gnunet_dns_redirector_SOURCES = \ |
74 | gnunet-dns-redirector.c | 66 | gnunet-dns-redirector.c |
75 | gnunet_dns_redirector_LDADD = \ | 67 | gnunet_dns_redirector_LDADD = \ |
76 | libgnunetdnsparser.la \ | ||
77 | libgnunetdns.la \ | 68 | libgnunetdns.la \ |
78 | $(top_builddir)/src/util/libgnunetutil.la \ | 69 | $(top_builddir)/src/util/libgnunetutil.la \ |
79 | $(GN_LIBINTL) | 70 | $(GN_LIBINTL) |
@@ -81,30 +72,10 @@ gnunet_dns_redirector_LDADD = \ | |||
81 | gnunet_service_dns_SOURCES = \ | 72 | gnunet_service_dns_SOURCES = \ |
82 | gnunet-service-dns.c | 73 | gnunet-service-dns.c |
83 | gnunet_service_dns_LDADD = \ | 74 | gnunet_service_dns_LDADD = \ |
84 | libgnunetdnsstub.la \ | ||
85 | $(top_builddir)/src/tun/libgnunettun.la \ | ||
86 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 75 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
87 | $(top_builddir)/src/util/libgnunetutil.la \ | 76 | $(top_builddir)/src/util/libgnunetutil.la \ |
88 | $(GN_LIBINTL) | 77 | $(GN_LIBINTL) |
89 | 78 | ||
90 | libgnunetdnsparser_la_SOURCES = \ | ||
91 | dnsparser.c | ||
92 | libgnunetdnsparser_la_LIBADD = \ | ||
93 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \ | ||
94 | -lidn | ||
95 | libgnunetdnsparser_la_LDFLAGS = \ | ||
96 | $(GN_LIB_LDFLAGS) \ | ||
97 | -version-info 1:0:1 | ||
98 | |||
99 | libgnunetdnsstub_la_SOURCES = \ | ||
100 | dnsstub.c | ||
101 | libgnunetdnsstub_la_LIBADD = \ | ||
102 | $(top_builddir)/src/tun/libgnunettun.la \ | ||
103 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) | ||
104 | libgnunetdnsstub_la_LDFLAGS = \ | ||
105 | $(GN_LIB_LDFLAGS) \ | ||
106 | -version-info 0:0:0 | ||
107 | |||
108 | libgnunetdns_la_SOURCES = \ | 79 | libgnunetdns_la_SOURCES = \ |
109 | dns_api.c dns.h | 80 | dns_api.c dns.h |
110 | libgnunetdns_la_LIBADD = \ | 81 | libgnunetdns_la_LIBADD = \ |
@@ -131,8 +102,3 @@ EXTRA_DIST = \ | |||
131 | $(check_SCRIPTS) | 102 | $(check_SCRIPTS) |
132 | 103 | ||
133 | 104 | ||
134 | test_hexcoder_SOURCES = \ | ||
135 | test_hexcoder.c | ||
136 | test_hexcoder_LDADD = \ | ||
137 | libgnunetdnsparser.la \ | ||
138 | $(top_builddir)/src/util/libgnunetutil.la | ||
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 4296199db..ec7bcb016 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -89,6 +89,8 @@ libgnunetutil_la_SOURCES = \ | |||
89 | crypto_rsa.c \ | 89 | crypto_rsa.c \ |
90 | disk.c \ | 90 | disk.c \ |
91 | disk.h \ | 91 | disk.h \ |
92 | dnsparser.c \ | ||
93 | dnsstub.c \ | ||
92 | getopt.c \ | 94 | getopt.c \ |
93 | getopt_helpers.c \ | 95 | getopt_helpers.c \ |
94 | helper.c \ | 96 | helper.c \ |
@@ -104,12 +106,14 @@ libgnunetutil_la_SOURCES = \ | |||
104 | peer.c \ | 106 | peer.c \ |
105 | plugin.c \ | 107 | plugin.c \ |
106 | program.c \ | 108 | program.c \ |
109 | regex.c \ | ||
107 | resolver_api.c resolver.h \ | 110 | resolver_api.c resolver.h \ |
108 | scheduler.c \ | 111 | scheduler.c \ |
109 | service.c \ | 112 | service.c \ |
110 | signal.c \ | 113 | signal.c \ |
111 | strings.c \ | 114 | strings.c \ |
112 | time.c \ | 115 | time.c \ |
116 | tun.c \ | ||
113 | speedup.c speedup.h | 117 | speedup.c speedup.h |
114 | 118 | ||
115 | libgnunetutil_la_LIBADD = \ | 119 | libgnunetutil_la_LIBADD = \ |
@@ -117,7 +121,7 @@ libgnunetutil_la_LIBADD = \ | |||
117 | $(LIBGCRYPT_LIBS) \ | 121 | $(LIBGCRYPT_LIBS) \ |
118 | $(LTLIBICONV) \ | 122 | $(LTLIBICONV) \ |
119 | $(LTLIBINTL) \ | 123 | $(LTLIBINTL) \ |
120 | -lltdl $(Z_LIBS) -lunistring $(XLIB) | 124 | -lltdl -lidn $(Z_LIBS) -lunistring $(XLIB) |
121 | 125 | ||
122 | libgnunetutil_la_LDFLAGS = \ | 126 | libgnunetutil_la_LDFLAGS = \ |
123 | $(GN_LIB_LDFLAGS) \ | 127 | $(GN_LIB_LDFLAGS) \ |
@@ -291,19 +295,22 @@ check_PROGRAMS = \ | |||
291 | test_crypto_rsa \ | 295 | test_crypto_rsa \ |
292 | test_disk \ | 296 | test_disk \ |
293 | test_getopt \ | 297 | test_getopt \ |
298 | test_hexcoder \ | ||
294 | test_mq \ | 299 | test_mq \ |
295 | test_os_network \ | 300 | test_os_network \ |
296 | test_peer \ | 301 | test_peer \ |
297 | test_plugin \ | 302 | test_plugin \ |
298 | test_program \ | 303 | test_program \ |
304 | test_regex \ | ||
299 | test_resolver_api.nc \ | 305 | test_resolver_api.nc \ |
300 | test_scheduler \ | 306 | test_scheduler \ |
301 | test_scheduler_delay \ | 307 | test_scheduler_delay \ |
302 | test_service \ | 308 | test_service \ |
303 | test_strings \ | 309 | test_strings \ |
304 | test_strings_to_data \ | 310 | test_strings_to_data \ |
305 | test_time \ | ||
306 | test_speedup \ | 311 | test_speedup \ |
312 | test_time \ | ||
313 | test_tun \ | ||
307 | $(BENCHMARKS) \ | 314 | $(BENCHMARKS) \ |
308 | test_os_start_process \ | 315 | test_os_start_process \ |
309 | test_common_logging_runtime_loglevels | 316 | test_common_logging_runtime_loglevels |
@@ -319,6 +326,20 @@ test_bio_SOURCES = \ | |||
319 | test_bio_LDADD = \ | 326 | test_bio_LDADD = \ |
320 | libgnunetutil.la | 327 | libgnunetutil.la |
321 | 328 | ||
329 | test_hexcoder_SOURCES = \ | ||
330 | test_hexcoder.c | ||
331 | test_hexcoder_LDADD = \ | ||
332 | libgnunetutil.la | ||
333 | |||
334 | test_tun_SOURCES = \ | ||
335 | test_tun.c | ||
336 | test_tun_LDADD = \ | ||
337 | libgnunetutil.la | ||
338 | |||
339 | test_regex_SOURCES = \ | ||
340 | test_regex.c | ||
341 | test_regex_LDADD = \ | ||
342 | libgnunetutil.la | ||
322 | 343 | ||
323 | test_os_start_process_SOURCES = \ | 344 | test_os_start_process_SOURCES = \ |
324 | test_os_start_process.c | 345 | test_os_start_process.c |
diff --git a/src/dns/dnsparser.c b/src/util/dnsparser.c index 32ad7c0c2..32ad7c0c2 100644 --- a/src/dns/dnsparser.c +++ b/src/util/dnsparser.c | |||
diff --git a/src/dns/dnsstub.c b/src/util/dnsstub.c index 969ff7beb..969ff7beb 100644 --- a/src/dns/dnsstub.c +++ b/src/util/dnsstub.c | |||
diff --git a/src/tun/regex.c b/src/util/regex.c index 7565a9eac..7565a9eac 100644 --- a/src/tun/regex.c +++ b/src/util/regex.c | |||
diff --git a/src/tun/test_regex.c b/src/util/test_regex.c index 2e7d52828..2e7d52828 100644 --- a/src/tun/test_regex.c +++ b/src/util/test_regex.c | |||
diff --git a/src/tun/test_tun.c b/src/util/test_tun.c index edbd4c05d..edbd4c05d 100644 --- a/src/tun/test_tun.c +++ b/src/util/test_tun.c | |||
diff --git a/src/tun/tun.c b/src/util/tun.c index f85f72209..f85f72209 100644 --- a/src/tun/tun.c +++ b/src/util/tun.c | |||