projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
[oweals/gnunet.git]
/
src
/
util
/
Makefile.am
diff --git
a/src/util/Makefile.am
b/src/util/Makefile.am
index 208cab07b02a2567abb45c66aa5b582bfc00fad2..4ae073c2ccb5210a07a1348dea6a9883955d492a 100644
(file)
--- a/
src/util/Makefile.am
+++ b/
src/util/Makefile.am
@@
-89,6
+89,8
@@
libgnunetutil_la_SOURCES = \
crypto_rsa.c \
disk.c \
disk.h \
crypto_rsa.c \
disk.c \
disk.h \
+ dnsparser.c \
+ dnsstub.c \
getopt.c \
getopt_helpers.c \
helper.c \
getopt.c \
getopt_helpers.c \
helper.c \
@@
-104,12
+106,14
@@
libgnunetutil_la_SOURCES = \
peer.c \
plugin.c \
program.c \
peer.c \
plugin.c \
program.c \
+ regex.c \
resolver_api.c resolver.h \
scheduler.c \
service.c \
signal.c \
strings.c \
time.c \
resolver_api.c resolver.h \
scheduler.c \
service.c \
signal.c \
strings.c \
time.c \
+ tun.c \
speedup.c speedup.h
libgnunetutil_la_LIBADD = \
speedup.c speedup.h
libgnunetutil_la_LIBADD = \
@@
-117,7
+121,7
@@
libgnunetutil_la_LIBADD = \
$(LIBGCRYPT_LIBS) \
$(LTLIBICONV) \
$(LTLIBINTL) \
$(LIBGCRYPT_LIBS) \
$(LTLIBICONV) \
$(LTLIBINTL) \
- -lltdl $(Z_LIBS) -lunistring $(XLIB)
+ -lltdl
-lidn
$(Z_LIBS) -lunistring $(XLIB)
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
@@
-162,6
+166,7
@@
lib_LTLIBRARIES = libgnunetutil.la
libexec_PROGRAMS = \
gnunet-service-resolver \
libexec_PROGRAMS = \
gnunet-service-resolver \
+ gnunet-timeout \
$(W32CONSOLEHELPER)
bin_SCRIPTS =\
$(W32CONSOLEHELPER)
bin_SCRIPTS =\
@@
-188,6
+193,15
@@
endif
endif
endif
+if !MINGW
+gnunet_timeout_SOURCES = \
+ gnunet-timeout.c
+else
+gnunet_timeout_SOURCES = \
+ gnunet-timeout-w32.c
+endif
+
+
do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
gnunet-qr: gnunet-qr.py.in Makefile
do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
gnunet-qr: gnunet-qr.py.in Makefile
@@
-199,6
+213,9
@@
gnunet_service_resolver_SOURCES = \
gnunet_service_resolver_LDADD = \
libgnunetutil.la \
$(GN_LIBINTL)
gnunet_service_resolver_LDADD = \
libgnunetutil.la \
$(GN_LIBINTL)
+if HAVE_GETADDRINFO_A
+gnunet_service_resolver_LDADD += -lanl
+endif
gnunet_resolver_SOURCES = \
gnunet_resolver_SOURCES = \
@@
-288,19
+305,22
@@
check_PROGRAMS = \
test_crypto_rsa \
test_disk \
test_getopt \
test_crypto_rsa \
test_disk \
test_getopt \
+ test_hexcoder \
test_mq \
test_os_network \
test_peer \
test_plugin \
test_program \
test_mq \
test_os_network \
test_peer \
test_plugin \
test_program \
+ test_regex \
test_resolver_api.nc \
test_scheduler \
test_scheduler_delay \
test_service \
test_strings \
test_strings_to_data \
test_resolver_api.nc \
test_scheduler \
test_scheduler_delay \
test_service \
test_strings \
test_strings_to_data \
- test_time \
test_speedup \
test_speedup \
+ test_time \
+ test_tun \
$(BENCHMARKS) \
test_os_start_process \
test_common_logging_runtime_loglevels
$(BENCHMARKS) \
test_os_start_process \
test_common_logging_runtime_loglevels
@@
-316,6
+336,20
@@
test_bio_SOURCES = \
test_bio_LDADD = \
libgnunetutil.la
test_bio_LDADD = \
libgnunetutil.la
+test_hexcoder_SOURCES = \
+ test_hexcoder.c
+test_hexcoder_LDADD = \
+ libgnunetutil.la
+
+test_tun_SOURCES = \
+ test_tun.c
+test_tun_LDADD = \
+ libgnunetutil.la
+
+test_regex_SOURCES = \
+ test_regex.c
+test_regex_LDADD = \
+ libgnunetutil.la
test_os_start_process_SOURCES = \
test_os_start_process.c
test_os_start_process_SOURCES = \
test_os_start_process.c
@@
-598,4
+632,4
@@
EXTRA_DIST = \
test_resolver_api_data.conf \
test_service_data.conf \
test_speedup_data.conf \
test_resolver_api_data.conf \
test_service_data.conf \
test_speedup_data.conf \
- gnunet-qr.py.in
+ gnunet-qr.py.in