X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2FMakefile.am;h=44e22e390c48a977b8eee0ecd19785ee2b1d31d6;hb=72c8645af31896829b674b575c5375706f362a30;hp=9ecb3e46987d076605f16f67f1666e7ca3bee8e1;hpb=9cf5b99404c1f3694417b2e4900771398022fd23;p=oweals%2Fgnunet.git

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 9ecb3e469..44e22e390 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,64 +1,197 @@
-INCLUDES = -I$(top_srcdir)/src/include
+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 
+
+pkgcfg_DATA = \
+  resolver.conf
+
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
- WINSRC = win.cc winproc.c
+noinst_LTLIBRARIES = \
+  libgnunetutilwin.la
+libgnunetutilwin_la_SOURCES = \
+  win.c \
+  winproc.c
+libgnunetutilwin_la_LDFLAGS = \
+  -no-undefined -Wl,--export-all-symbols 
+libgnunetutilwin_la_LIBADD = \
+  -lshell32 -liconv -lstdc++ \
+  -lcomdlg32 -lgdi32 -liphlpapi
+WINLIB = libgnunetutilwin.la
+W32CAT = w32cat
+endif
+
+if !MINGW
+ SERVER_CLIENT_UNIX = test_server_with_client_unix
 endif
 
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS = --coverage -O0
+  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 = \
+ $(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 = \
+  bandwidth.c \
+  bio.c \
   client.c \
   common_allocation.c \
   common_endian.c \
-  common_gettext.c \
   common_logging.c \
   configuration.c \
+  connection.c \
   container_bloomfilter.c \
+  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 \
   crypto_ksk.c \
   crypto_random.c \
   crypto_rsa.c \
   disk.c \
+  disk.h \
   getopt.c \
   getopt_helpers.c \
+  helper.c \
+  load.c \
+  mq.c \
   network.c \
   os_installation.c \
-  os_load.c \
   os_network.c \
   os_priority.c \
+  peer.c \
   plugin.c \
   program.c \
-  pseudonym.c \
+  resolver_api.c resolver.h \
   scheduler.c \
   server.c \
+  server_mst.c \
+  server_nc.c \
   server_tc.c \
   service.c \
   signal.c \
   strings.c \
   time.c \
-  $(WINSRC)
+  speedup.c
 
+libgnunetutil_la_CPPFLAGS = \
+  $(LTDLINCL)
 
 libgnunetutil_la_LIBADD = \
-  $(GCLIBADD) \
+  $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
-  -lgmp -lltdl -lz -lextractor
+  $(LTLIBICONV) \
+  $(LTLIBINTL) \
+  $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 4:0:0
+  $(GN_LIB_LDFLAGS) \
+  -version-info 11:0:2
+
+if HAVE_TESTING
+  GNUNET_ECC = gnunet-ecc
+endif
+
 
+libexec_PROGRAMS = \
+ gnunet-service-resolver 
+
+bin_PROGRAMS = \
+ gnunet-resolver \
+ gnunet-config \
+ $(GNUNET_ECC) \
+ gnunet-rsa \
+ gnunet-uri 
+
+
+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) -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
@@ -68,8 +201,14 @@ libgnunet_plugin_test_la_SOURCES = \
 libgnunet_plugin_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+if HAVE_BENCHMARKS
+ BENCHMARKS = \
+  perf_crypto_hash \
+  perf_malloc
+endif
 
 check_PROGRAMS = \
+ test_bio \
  test_client \
  test_common_allocation \
  test_common_endian \
@@ -78,38 +217,65 @@ 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 \
  test_crypto_random \
  test_crypto_rsa \
  test_disk \
  test_getopt \
- test_network \
- test_network_addressing \
- test_network_receive_cancel \
- test_network_timeout \
- test_network_timeout_no_connect \
- test_network_transmit_cancel \
- test_os_load \
+ test_connection \
+ test_connection_addressing \
+ test_connection_receive_cancel \
+ 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 \
- perf_crypto_hash
+ test_speedup \
+ $(BENCHMARKS) \
+ test_os_start_process \
+ test_common_logging_runtime_loglevels
 
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
+endif
+
+test_bio_SOURCES = \
+ test_bio.c
+test_bio_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
+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
@@ -131,6 +297,11 @@ test_common_logging_SOURCES = \
 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 = \
@@ -144,11 +315,26 @@ test_container_bloomfilter_LDADD = \
 test_container_meta_data_SOURCES = \
  test_container_meta_data.c
 test_container_meta_data_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la -lextractor
 
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
 test_container_multihashmap_LDADD = \
+ $(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_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la   
+
+test_container_slist_SOURCES = \
+ test_container_slist.c
+test_container_slist_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_crypto_aes_SOURCES = \
@@ -159,18 +345,30 @@ test_crypto_aes_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_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 = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_crypto_hkdf_SOURCES = \
+ test_crypto_hkdf.c
+test_crypto_hkdf_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_crypto_ksk_SOURCES = \
  test_crypto_ksk.c
 test_crypto_ksk_LDADD = \
@@ -196,50 +394,55 @@ test_getopt_SOURCES = \
 test_getopt_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_network_SOURCES = \
- test_network.c
-test_network_LDADD = \
+test_connection_SOURCES = \
+ test_connection.c
+test_connection_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_network_addressing_SOURCES = \
- test_network_addressing.c
-test_network_addressing_LDADD = \
+test_connection_addressing_SOURCES = \
+ test_connection_addressing.c
+test_connection_addressing_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_network_receive_cancel_SOURCES = \
- test_network_receive_cancel.c
-test_network_receive_cancel_LDADD = \
+test_connection_receive_cancel_SOURCES = \
+ test_connection_receive_cancel.c
+test_connection_receive_cancel_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_network_timeout_SOURCES = \
- test_network_timeout.c
-test_network_timeout_LDADD = \
+test_connection_timeout_SOURCES = \
+ test_connection_timeout.c
+test_connection_timeout_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_network_timeout_no_connect_SOURCES = \
- test_network_timeout_no_connect.c
-test_network_timeout_no_connect_LDADD = \
+test_connection_timeout_no_connect_SOURCES = \
+ test_connection_timeout_no_connect.c
+test_connection_timeout_no_connect_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_network_transmit_cancel_SOURCES = \
- test_network_transmit_cancel.c
-test_network_transmit_cancel_LDADD = \
+test_connection_transmit_cancel_SOURCES = \
+ test_connection_transmit_cancel.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_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 = \
+$(top_builddir)/src/util/libgnunetutil.la
 
 test_plugin_SOURCES = \
  test_plugin.c
@@ -251,10 +454,10 @@ 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 = \
+  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_scheduler_SOURCES = \
  test_scheduler.c
@@ -266,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 = \
@@ -281,6 +489,12 @@ test_server_with_client_SOURCES = \
 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 = \
@@ -291,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_container_meta_data_image.jpg \
   test_program_data.conf \
-  test_pseudonym_data.conf \
-  test_service_data.conf
+  test_resolver_api_data.conf \
+  test_service_data.conf \
+  test_speedup_data.conf