X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2FMakefile.am;h=44e22e390c48a977b8eee0ecd19785ee2b1d31d6;hb=72c8645af31896829b674b575c5375706f362a30;hp=c62fc4246fa0e8b36dc92b8ccf3ee33e7563234a;hpb=b8fb774718de49d5a96e6cfa5b38a42b9f3f0e6a;p=oweals%2Fgnunet.git diff --git a/src/util/Makefile.am b/src/util/Makefile.am index c62fc4246..44e22e390 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -2,23 +2,29 @@ INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include plugindir = $(libdir)/gnunet +libexecdir= $(pkglibdir)/libexec/ + pkgcfgdir= $(pkgdatadir)/config.d/ dist_pkgcfg_DATA = \ - util.conf resolver.conf + util.conf + +pkgcfg_DATA = \ + resolver.conf if MINGW noinst_LTLIBRARIES = \ libgnunetutilwin.la libgnunetutilwin_la_SOURCES = \ - win.cc \ + win.c \ winproc.c libgnunetutilwin_la_LDFLAGS = \ -no-undefined -Wl,--export-all-symbols libgnunetutilwin_la_LIBADD = \ -lshell32 -liconv -lstdc++ \ - -lcomdlg32 -lgdi32 + -lcomdlg32 -lgdi32 -liphlpapi WINLIB = libgnunetutilwin.la +W32CAT = w32cat endif if !MINGW @@ -30,10 +36,14 @@ if USE_COVERAGE XLIB = -lgcov endif +w32cat_SOURCES = w32cat.c + noinst_PROGRAMS = \ gnunet-config-diff \ + $(W32CAT) \ test_common_logging_dummy + gnunet_config_diff_SOURCES = \ gnunet-config-diff.c gnunet_config_diff_LDADD = \ @@ -63,9 +73,11 @@ libgnunetutil_la_SOURCES = \ container_heap.c \ container_meta_data.c \ container_multihashmap.c \ + container_multihashmap32.c \ container_slist.c \ crypto_aes.c \ crypto_crc.c \ + crypto_ecc.c \ crypto_hash.c \ crypto_hkdf.c \ crypto_kdf.c \ @@ -76,7 +88,9 @@ libgnunetutil_la_SOURCES = \ disk.h \ getopt.c \ getopt_helpers.c \ + helper.c \ load.c \ + mq.c \ network.c \ os_installation.c \ os_network.c \ @@ -84,7 +98,6 @@ libgnunetutil_la_SOURCES = \ peer.c \ plugin.c \ program.c \ - pseudonym.c \ resolver_api.c resolver.h \ scheduler.c \ server.c \ @@ -94,23 +107,38 @@ libgnunetutil_la_SOURCES = \ service.c \ signal.c \ strings.c \ - time.c + time.c \ + speedup.c +libgnunetutil_la_CPPFLAGS = \ + $(LTDLINCL) libgnunetutil_la_LIBADD = \ $(GCLIBADD) $(WINLIB) \ $(LIBGCRYPT_LIBS) \ $(LTLIBICONV) \ - -lltdl -lz $(XLIB) + $(LTLIBINTL) \ + $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) libgnunetutil_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 4:0:0 + -version-info 11:0:2 + +if HAVE_TESTING + GNUNET_ECC = gnunet-ecc +endif + +libexec_PROGRAMS = \ + gnunet-service-resolver bin_PROGRAMS = \ - gnunet-service-resolver \ - gnunet-resolver + gnunet-resolver \ + gnunet-config \ + $(GNUNET_ECC) \ + gnunet-rsa \ + gnunet-uri + gnunet_service_resolver_SOURCES = \ gnunet-service-resolver.c @@ -129,6 +157,42 @@ gnunet_resolver_LDADD = \ gnunet_resolver_DEPENDENCIES = \ libgnunetutil.la + +gnunet_rsa_SOURCES = \ + gnunet-rsa.c +gnunet_rsa_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(GN_LIBINTL) -lgcrypt +gnunet_rsa_DEPENDENCIES = \ + libgnunetutil.la + + +gnunet_ecc_SOURCES = \ + gnunet-ecc.c +gnunet_ecc_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(GN_LIBINTL) -lgcrypt +gnunet_ecc_DEPENDENCIES = \ + libgnunetutil.la + + +gnunet_config_SOURCES = \ + gnunet-config.c +gnunet_config_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(GN_LIBINTL) +gnunet_config_DEPENDENCIES = \ + libgnunetutil.la + + +gnunet_uri_SOURCES = \ + gnunet-uri.c +gnunet_uri_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(GN_LIBINTL) +gnunet_uri_DEPENDENCIES = \ + libgnunetutil.la + plugin_LTLIBRARIES = \ libgnunet_plugin_test.la @@ -139,7 +203,8 @@ libgnunet_plugin_test_la_LDFLAGS = \ if HAVE_BENCHMARKS BENCHMARKS = \ - perf_crypto_hash + perf_crypto_hash \ + perf_malloc endif check_PROGRAMS = \ @@ -152,11 +217,13 @@ check_PROGRAMS = \ 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_crypto_ecc \ test_crypto_hash \ test_crypto_hkdf \ test_crypto_ksk \ @@ -170,22 +237,25 @@ check_PROGRAMS = \ test_connection_timeout \ test_connection_timeout_no_connect \ test_connection_transmit_cancel \ + test_mq \ + test_mq_client \ test_os_network \ - test_os_priority \ test_peer \ test_plugin \ test_program \ - test_pseudonym \ test_resolver_api \ test_scheduler \ test_scheduler_delay \ + test_server_mst_interrupt \ test_server \ test_server_disconnect \ test_server_with_client \ $(SERVER_CLIENT_UNIX) \ test_service \ test_strings \ + test_strings_to_data \ test_time \ + test_speedup \ $(BENCHMARKS) \ test_os_start_process \ test_common_logging_runtime_loglevels @@ -204,6 +274,8 @@ test_os_start_process_SOURCES = \ test_os_start_process.c test_os_start_process_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la +test_os_start_process_DEPENDENCIES = \ + $(WINCAT) test_client_SOURCES = \ test_client.c @@ -248,7 +320,12 @@ test_container_meta_data_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 @@ -276,6 +353,12 @@ test_crypto_crc_SOURCES = \ test_crypto_crc_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la +test_crypto_ecc_SOURCES = \ + test_crypto_ecc.c +test_crypto_ecc_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LIBGCRYPT_LIBS) + test_crypto_hash_SOURCES = \ test_crypto_hash.c test_crypto_hash_LDADD = \ @@ -341,16 +424,21 @@ test_connection_transmit_cancel_SOURCES = \ 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_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 = \ @@ -366,11 +454,6 @@ test_program_SOURCES = \ 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 = \ @@ -386,6 +469,11 @@ test_scheduler_delay_SOURCES = \ test_scheduler_delay_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la +test_server_mst_interrupt_SOURCES = \ + test_server_mst_interrupt.c +test_server_mst_interrupt_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la + test_server_SOURCES = \ test_server.c test_server_LDADD = \ @@ -417,20 +505,37 @@ test_strings_SOURCES = \ 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 = \ $(top_builddir)/src/util/libgnunetutil.la +test_speedup_SOURCES = \ + test_speedup.c +test_speedup_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la + perf_crypto_hash_SOURCES = \ perf_crypto_hash.c 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 \ - test_pseudonym_data.conf \ test_resolver_api_data.conf \ - test_service_data.conf + test_service_data.conf \ + test_speedup_data.conf