projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-remove async ecc key generation, not needed
[oweals/gnunet.git]
/
src
/
util
/
Makefile.am
diff --git
a/src/util/Makefile.am
b/src/util/Makefile.am
index 756f74ec4f79b5afba894d20def3a35fc1be8658..44e22e390c48a977b8eee0ecd19785ee2b1d31d6 100644
(file)
--- a/
src/util/Makefile.am
+++ b/
src/util/Makefile.am
@@
-2,6
+2,8
@@
INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
plugindir = $(libdir)/gnunet
plugindir = $(libdir)/gnunet
+libexecdir= $(pkglibdir)/libexec/
+
pkgcfgdir= $(pkgdatadir)/config.d/
dist_pkgcfg_DATA = \
pkgcfgdir= $(pkgdatadir)/config.d/
dist_pkgcfg_DATA = \
@@
-71,6
+73,7
@@
libgnunetutil_la_SOURCES = \
container_heap.c \
container_meta_data.c \
container_multihashmap.c \
container_heap.c \
container_meta_data.c \
container_multihashmap.c \
+ container_multihashmap32.c \
container_slist.c \
crypto_aes.c \
crypto_crc.c \
container_slist.c \
crypto_aes.c \
crypto_crc.c \
@@
-87,6
+90,7
@@
libgnunetutil_la_SOURCES = \
getopt_helpers.c \
helper.c \
load.c \
getopt_helpers.c \
helper.c \
load.c \
+ mq.c \
network.c \
os_installation.c \
os_network.c \
network.c \
os_installation.c \
os_network.c \
@@
-94,7
+98,6
@@
libgnunetutil_la_SOURCES = \
peer.c \
plugin.c \
program.c \
peer.c \
plugin.c \
program.c \
- pseudonym.c \
resolver_api.c resolver.h \
scheduler.c \
server.c \
resolver_api.c resolver.h \
scheduler.c \
server.c \
@@
-107,24
+110,32
@@
libgnunetutil_la_SOURCES = \
time.c \
speedup.c
time.c \
speedup.c
+libgnunetutil_la_CPPFLAGS = \
+ $(LTDLINCL)
libgnunetutil_la_LIBADD = \
$(GCLIBADD) $(WINLIB) \
$(LIBGCRYPT_LIBS) \
$(LTLIBICONV) \
$(LTLIBINTL) \
libgnunetutil_la_LIBADD = \
$(GCLIBADD) $(WINLIB) \
$(LIBGCRYPT_LIBS) \
$(LTLIBICONV) \
$(LTLIBINTL) \
-
-lltdl -lz
-lunistring $(XLIB)
+
$(LIBLTDL) $(Z_LIBS)
-lunistring $(XLIB)
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
- -version-info 8:0:0
+ -version-info 11:0:2
+
+if HAVE_TESTING
+ GNUNET_ECC = gnunet-ecc
+endif
+libexec_PROGRAMS = \
+ gnunet-service-resolver
+
bin_PROGRAMS = \
bin_PROGRAMS = \
- gnunet-service-resolver \
gnunet-resolver \
gnunet-config \
gnunet-resolver \
gnunet-config \
-
gnunet-ecc
\
+
$(GNUNET_ECC)
\
gnunet-rsa \
gnunet-uri
gnunet-rsa \
gnunet-uri
@@
-192,7
+203,8
@@
libgnunet_plugin_test_la_LDFLAGS = \
if HAVE_BENCHMARKS
BENCHMARKS = \
if HAVE_BENCHMARKS
BENCHMARKS = \
- perf_crypto_hash
+ perf_crypto_hash \
+ perf_malloc
endif
check_PROGRAMS = \
endif
check_PROGRAMS = \
@@
-205,11
+217,13
@@
check_PROGRAMS = \
test_container_bloomfilter \
test_container_meta_data \
test_container_multihashmap \
test_container_bloomfilter \
test_container_meta_data \
test_container_multihashmap \
+ test_container_multihashmap32 \
test_container_heap \
test_container_slist \
test_crypto_aes \
test_crypto_aes_weak \
test_crypto_crc \
test_container_heap \
test_container_slist \
test_crypto_aes \
test_crypto_aes_weak \
test_crypto_crc \
+ test_crypto_ecc \
test_crypto_hash \
test_crypto_hkdf \
test_crypto_ksk \
test_crypto_hash \
test_crypto_hkdf \
test_crypto_ksk \
@@
-223,12
+237,12
@@
check_PROGRAMS = \
test_connection_timeout \
test_connection_timeout_no_connect \
test_connection_transmit_cancel \
test_connection_timeout \
test_connection_timeout_no_connect \
test_connection_transmit_cancel \
+ test_mq \
+ test_mq_client \
test_os_network \
test_os_network \
- test_os_priority \
test_peer \
test_plugin \
test_program \
test_peer \
test_plugin \
test_program \
- test_pseudonym \
test_resolver_api \
test_scheduler \
test_scheduler_delay \
test_resolver_api \
test_scheduler \
test_scheduler_delay \
@@
-239,6
+253,7
@@
check_PROGRAMS = \
$(SERVER_CLIENT_UNIX) \
test_service \
test_strings \
$(SERVER_CLIENT_UNIX) \
test_service \
test_strings \
+ test_strings_to_data \
test_time \
test_speedup \
$(BENCHMARKS) \
test_time \
test_speedup \
$(BENCHMARKS) \
@@
-305,7
+320,12
@@
test_container_meta_data_LDADD = \
test_container_multihashmap_SOURCES = \
test_container_multihashmap.c
test_container_multihashmap_LDADD = \
test_container_multihashmap_SOURCES = \
test_container_multihashmap.c
test_container_multihashmap_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_container_multihashmap32_SOURCES = \
+ test_container_multihashmap32.c
+test_container_multihashmap32_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
test_container_heap_SOURCES = \
test_container_heap.c
test_container_heap_SOURCES = \
test_container_heap.c
@@
-336,7
+356,8
@@
test_crypto_crc_LDADD = \
test_crypto_ecc_SOURCES = \
test_crypto_ecc.c
test_crypto_ecc_LDADD = \
test_crypto_ecc_SOURCES = \
test_crypto_ecc.c
test_crypto_ecc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
test_crypto_hash_SOURCES = \
test_crypto_hash.c
test_crypto_hash_SOURCES = \
test_crypto_hash.c
@@
-403,16
+424,21
@@
test_connection_transmit_cancel_SOURCES = \
test_connection_transmit_cancel_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
test_connection_transmit_cancel_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+test_mq_SOURCES = \
+ test_mq.c
+test_mq_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_mq_client_SOURCES = \
+ test_mq_client.c
+test_mq_client_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_os_network_SOURCES = \
test_os_network.c
test_os_network_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
test_os_network_SOURCES = \
test_os_network.c
test_os_network_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
-test_os_priority_SOURCES = \
- test_os_priority.c
-test_os_priority_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
test_peer_SOURCES = \
test_peer.c
test_peer_LDADD = \
test_peer_SOURCES = \
test_peer.c
test_peer_LDADD = \
@@
-428,11
+454,6
@@
test_program_SOURCES = \
test_program_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
test_program_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
-test_pseudonym_SOURCES = \
- test_pseudonym.c
-test_pseudonym_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
test_resolver_api_SOURCES = \
test_resolver_api.c
test_resolver_api_LDADD = \
test_resolver_api_SOURCES = \
test_resolver_api.c
test_resolver_api_LDADD = \
@@
-484,6
+505,13
@@
test_strings_SOURCES = \
test_strings_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
test_strings_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+
+test_strings_to_data_SOURCES = \
+ test_strings_to_data.c
+test_strings_to_data_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
test_time_SOURCES = \
test_time.c
test_time_LDADD = \
test_time_SOURCES = \
test_time.c
test_time_LDADD = \
@@
-499,11
+527,15
@@
perf_crypto_hash_SOURCES = \
perf_crypto_hash_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
perf_crypto_hash_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+perf_malloc_SOURCES = \
+ perf_malloc.c
+perf_malloc_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
EXTRA_DIST = \
test_configuration_data.conf \
test_program_data.conf \
EXTRA_DIST = \
test_configuration_data.conf \
test_program_data.conf \
- test_pseudonym_data.conf \
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