-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
plugindir = $(libdir)/gnunet
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+dist_pkgcfg_DATA = \
+ util.conf
+
+pkgcfg_DATA = \
+ resolver.conf
+
if MINGW
noinst_LTLIBRARIES = \
libgnunetutilwin.la
win.cc \
winproc.c
libgnunetutilwin_la_LDFLAGS = \
- -Wl,--no-undefined -Wl,--export-all-symbols
+ -no-undefined -Wl,--export-all-symbols
libgnunetutilwin_la_LIBADD = \
-lshell32 -liconv -lstdc++ \
- -lcomdlg32 -lgdi32
+ -lcomdlg32 -lgdi32 -liphlpapi
WINLIB = libgnunetutilwin.la
endif
+if !MINGW
+ SERVER_CLIENT_UNIX = test_server_with_client_unix
+endif
+
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIB = -lgcov
endif
+noinst_PROGRAMS = \
+ gnunet-config-diff \
+ test_common_logging_dummy
+
+
+gnunet_config_diff_SOURCES = \
+ gnunet-config-diff.c
+gnunet_config_diff_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+gnunet_config_diff_DEPENDENCIES = \
+ libgnunetutil.la
+
+test_common_logging_dummy_SOURCES = \
+ test_common_logging_dummy.c
+test_common_logging_dummy_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_common_logging_dummy_DEPENDENCIES = \
+ libgnunetutil.la
+
lib_LTLIBRARIES = libgnunetutil.la
libgnunetutil_la_SOURCES = \
crypto_crc.c \
crypto_hash.c \
crypto_hkdf.c \
+ crypto_kdf.c \
crypto_ksk.c \
crypto_random.c \
crypto_rsa.c \
disk.h \
getopt.c \
getopt_helpers.c \
+ helper.c \
+ load.c \
network.c \
os_installation.c \
- os_load.c \
os_network.c \
os_priority.c \
peer.c \
libgnunetutil_la_LIBADD = \
$(GCLIBADD) $(WINLIB) \
$(LIBGCRYPT_LIBS) \
- -lgmp -lltdl -lz $(XLIB)
+ $(LTLIBICONV) \
+ -lltdl -lz -lunistring $(XLIB)
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 4:0:0
+ -version-info 7:0:0
bin_PROGRAMS = \
- gnunet-service-resolver
+ gnunet-service-resolver \
+ gnunet-resolver \
+ gnunet-rsa
+
gnunet_service_resolver_SOURCES = \
gnunet-service-resolver.c
gnunet_service_resolver_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
+gnunet_service_resolver_DEPENDENCIES = \
+ libgnunetutil.la
+gnunet_resolver_SOURCES = \
+ gnunet-resolver.c
+gnunet_resolver_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_resolver_DEPENDENCIES = \
+ libgnunetutil.la
+
+
+gnunet_rsa_SOURCES = \
+ gnunet-rsa.c
+gnunet_rsa_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_rsa_DEPENDENCIES = \
+ libgnunetutil.la
+
plugin_LTLIBRARIES = \
libgnunet_plugin_test.la
libgnunet_plugin_test_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+if HAVE_BENCHMARKS
+ BENCHMARKS = \
+ perf_crypto_hash
+endif
+
check_PROGRAMS = \
test_bio \
test_client \
test_connection_timeout \
test_connection_timeout_no_connect \
test_connection_transmit_cancel \
- test_os_load \
test_os_network \
test_os_priority \
test_peer \
test_server \
test_server_disconnect \
test_server_with_client \
+ $(SERVER_CLIENT_UNIX) \
test_service \
test_strings \
test_time \
- perf_crypto_hash \
- test_os_start_process
+ $(BENCHMARKS) \
+ test_os_start_process \
+ test_common_logging_runtime_loglevels
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
TESTS = $(check_PROGRAMS)
endif
test_common_logging_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+test_common_logging_runtime_loglevels_SOURCES = \
+ test_common_logging_runtime_loglevels.c
+test_common_logging_runtime_loglevels_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_configuration_SOURCES = \
test_configuration.c
test_configuration_LDADD = \
test_crypto_aes_weak_SOURCES = \
test_crypto_aes_weak.c
test_crypto_aes_weak_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
test_crypto_crc_SOURCES = \
test_crypto_crc.c
test_connection_transmit_cancel_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
-test_os_load_SOURCES = \
- test_os_load.c
-test_os_load_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
test_os_network_SOURCES = \
test_os_network.c
test_os_network_LDADD = \
test_server_with_client_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+test_server_with_client_unix_SOURCES = \
+ test_server_with_client_unix.c
+test_server_with_client_unix_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
test_service_SOURCES = \
test_service.c
test_service_LDADD = \