endif
if !MINGW
- SERVER_CLIENT_UNIX = test_server_with_client_unix
- TEST_CLIENT_UNIC_NC = test_client_unix.nc
+ TEST_CLIENT_UNIX_NC = test_client_unix.nc
else
- TEST_CLIENT_UNIC_NC =
+ TEST_CLIENT_UNIX_NC =
endif
if USE_COVERAGE
XLIB = -lgcov
endif
+if ENABLE_BENCHMARK
+ BENCHMARK = benchmark.c benchmark.h
+ PTHREAD = -lpthread
+endif
+
w32cat_SOURCES = w32cat.c
gnunet_helper_w32_console_SOURCES = \
libgnunetutil_la_SOURCES = \
bandwidth.c \
+ $(BENCHMARK) \
bio.c \
client.c \
common_allocation.c \
common_logging.c \
configuration.c \
configuration_loader.c \
- connection.c \
container_bloomfilter.c \
container_heap.c \
container_meta_data.c \
crypto_rsa.c \
disk.c \
disk.h \
+ dnsparser.c \
+ dnsstub.c \
getopt.c \
getopt_helpers.c \
helper.c \
peer.c \
plugin.c \
program.c \
+ regex.c \
resolver_api.c resolver.h \
scheduler.c \
- server.c \
- server_mst.c \
- server_nc.c \
- server_tc.c \
service.c \
- service_new.c \
signal.c \
strings.c \
time.c \
- socks.c \
- speedup.c speedup.h
+ tun.c \
+ speedup.c speedup.h \
+ proc_compat.c
+
+if HAVE_LIBATOMIC
+if DARWIN
+ LIBATOMIC=
+else
+ LIBATOMIC= -latomic
+endif
+else
+ LIBATOMIC=
+endif
+
+if HAVE_LIBIDN
+ LIBIDN= -lidn
+else
+ LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+ LIBIDN2= -lidn2
+else
+ LIBIDN2=
+endif
libgnunetutil_la_LIBADD = \
$(GCLIBADD) $(WINLIB) \
+ $(LIBATOMIC) \
$(LIBGCRYPT_LIBS) \
$(LTLIBICONV) \
$(LTLIBINTL) \
- -lltdl $(Z_LIBS) -lunistring $(XLIB)
+ -lltdl \
+ $(LIBIDN) $(LIBIDN2) \
+ $(Z_LIBS) \
+ -lunistring \
+ $(XLIB) \
+ $(PTHREAD)
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 13:0:0
-
libgnunetutil_taler_wallet_la_SOURCES = \
common_allocation.c \
common_endian.c \
libexec_PROGRAMS = \
gnunet-service-resolver \
+ gnunet-timeout \
$(W32CONSOLEHELPER)
-bin_SCRIPTS =\
- gnunet-qr
-
bin_PROGRAMS = \
gnunet-resolver \
gnunet-config \
$(GNUNET_ECC) \
$(GNUNET_SCRYPT) \
gnunet-uri
+if HAVE_ZBAR
+bin_PROGRAMS += gnunet-qr
+endif
noinst_PROGRAMS = \
gnunet-config-diff \
endif
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
-
-gnunet-qr: gnunet-qr.py.in Makefile
- $(do_subst) < $(top_srcdir)/src/util/gnunet-qr.py.in > gnunet-qr
- chmod +x gnunet-qr
+if !MINGW
+gnunet_timeout_SOURCES = \
+ gnunet-timeout.c
+else
+gnunet_timeout_SOURCES = \
+ gnunet-timeout-w32.c
+endif
gnunet_service_resolver_SOURCES = \
gnunet-service-resolver.c
gnunet_service_resolver_LDADD = \
libgnunetutil.la \
$(GN_LIBINTL)
+if HAVE_GETADDRINFO_A
+gnunet_service_resolver_LDADD += -lanl
+endif
gnunet_resolver_SOURCES = \
libgnunetutil.la \
$(GN_LIBINTL)
-
gnunet_uri_SOURCES = \
gnunet-uri.c
gnunet_uri_LDADD = \
libgnunetutil.la \
$(GN_LIBINTL)
+
+gnunet_qr_SOURCES = \
+ gnunet-qr.c
+gnunet_qr_LDADD = \
+ libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_qr_LDFLAGS= \
+ -lzbar
+
plugin_LTLIBRARIES = \
libgnunet_plugin_test.la
endif
if HAVE_SSH_KEY
- SSH_USING_TESTS = test_socks.nc
+# SSH_USING_TESTS = test_socks.nc
endif
check_PROGRAMS = \
test_bio \
test_client.nc \
$(TEST_CLIENT_UNIX_NC) \
- $(SSH_USING_TESTS) \
test_common_allocation \
test_common_endian \
test_common_logging \
test_crypto_rsa \
test_disk \
test_getopt \
- test_connection.nc \
- test_connection_addressing.nc \
- test_connection_receive_cancel.nc \
- test_connection_timeout.nc \
- test_connection_timeout_no_connect.nc \
- test_connection_transmit_cancel.nc \
+ test_hexcoder \
test_mq \
test_os_network \
test_peer \
test_plugin \
test_program \
+ test_regex \
test_resolver_api.nc \
test_scheduler \
test_scheduler_delay \
- test_server.nc \
- test_server_disconnect.nc \
- test_server_with_client.nc \
- test_server_mst_interrupt.nc \
- $(SERVER_CLIENT_UNIX) \
test_service \
test_strings \
test_strings_to_data \
- test_time \
test_speedup \
+ test_time \
+ test_tun \
$(BENCHMARKS) \
test_os_start_process \
test_common_logging_runtime_loglevels
# Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart
# sequential execution order for them
TEST_EXTENSIONS = .nc
-test_connection.log: test_client.log
-test_connection_addressing.log: test_connection.log
-test_connection_timeout_no_connect.log: test_connection_addressing.log
-test_connection_transmit_cancel.log: test_connection_timeout_no_connect.log
-test_connection_receive_cancel.log: test_connection_transmit_cancel.log
-test_connection_timeout.log: test_connection_receive_cancel.log
-test_resolver_api.log: test_connection_timeout.log
-test_server.log: test_resolver_api.log
-test_server_disconnect.log: test_server.log
-test_server_with_client.log: test_server_disconnect.log
-test_server_mst_interrupt.log: test_server_with_client.log
-test_client_unix.log: test_server_mst_interrupt.log
+test_test_client_unix.log: test_client.log
test_bio_SOURCES = \
test_bio.c
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_client_unix_nc_LDADD = \
libgnunetutil.la
-test_socks_nc_SOURCES = \
- test_socks.c
-test_socks_nc_LDADD = \
- libgnunetutil.la
+#test_socks_nc_SOURCES = \
+# test_socks.c
+#test_socks_nc_LDADD = \
+# libgnunetutil.la
test_common_allocation_SOURCES = \
test_common_allocation.c
test_getopt_LDADD = \
libgnunetutil.la
-test_connection_nc_SOURCES = \
- test_connection.c
-test_connection_nc_LDADD = \
- libgnunetutil.la
-
-test_connection_addressing_nc_SOURCES = \
- test_connection_addressing.c
-test_connection_addressing_nc_LDADD = \
- libgnunetutil.la
-
-test_connection_receive_cancel_nc_SOURCES = \
- test_connection_receive_cancel.c
-test_connection_receive_cancel_nc_LDADD = \
- libgnunetutil.la
-
-test_connection_timeout_nc_SOURCES = \
- test_connection_timeout.c
-test_connection_timeout_nc_LDADD = \
- libgnunetutil.la
-
-test_connection_timeout_no_connect_nc_SOURCES = \
- test_connection_timeout_no_connect.c
-test_connection_timeout_no_connect_nc_LDADD = \
- libgnunetutil.la
-
-test_connection_transmit_cancel_nc_SOURCES = \
- test_connection_transmit_cancel.c
-test_connection_transmit_cancel_nc_LDADD = \
- libgnunetutil.la
-
test_mq_SOURCES = \
test_mq.c
test_mq_LDADD = \
test_scheduler_delay_LDADD = \
libgnunetutil.la
-test_server_mst_interrupt_nc_SOURCES = \
- test_server_mst_interrupt.c
-test_server_mst_interrupt_nc_LDADD = \
- libgnunetutil.la
-
-test_server_nc_SOURCES = \
- test_server.c
-test_server_nc_LDADD = \
- libgnunetutil.la
-
-test_server_disconnect_nc_SOURCES = \
- test_server_disconnect.c
-test_server_disconnect_nc_LDADD = \
- libgnunetutil.la
-
-test_server_with_client_nc_SOURCES = \
- test_server_with_client.c
-test_server_with_client_nc_LDADD = \
- libgnunetutil.la
-
-test_server_with_client_unix_SOURCES = \
- test_server_with_client_unix.c
-test_server_with_client_unix_LDADD = \
- libgnunetutil.la
-
-
test_service_SOURCES = \
test_service.c
test_service_LDADD = \
test_strings_LDADD = \
libgnunetutil.la
-
test_strings_to_data_SOURCES = \
test_strings_to_data.c
test_strings_to_data_LDADD = \
test_program_data.conf \
test_resolver_api_data.conf \
test_service_data.conf \
- test_speedup_data.conf \
- gnunet-qr.py.in
+ test_speedup_data.conf
projects / oweals / gnunet.git / blobdiff