X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2FMakefile.am;h=7f2e0cd48f02b77fd84de1f31583de34612da366;hb=f491ac4fab469421986f77df0bbf79fefc417786;hp=d58d80bac05647aca2eed367454884c4d2f594c3;hpb=3b7b7b388b7968c11556ba92060a17a964c46451;p=oweals%2Fgnunet.git

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index d58d80bac..7f2e0cd48 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,10 +1,31 @@
-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
- 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.cc \
+  winproc.c
+libgnunetutilwin_la_LDFLAGS = \
+  -no-undefined -Wl,--export-all-symbols 
+libgnunetutilwin_la_LIBADD = \
+  -lshell32 -liconv -lstdc++ \
+  -lcomdlg32 -lgdi32 -liphlpapi
+WINLIB = libgnunetutilwin.la
+endif
+
+if !MINGW
+ SERVER_CLIENT_UNIX = test_server_with_client_unix
 endif
 
 if USE_COVERAGE
@@ -12,23 +33,45 @@ if USE_COVERAGE
   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 = \
+  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_vector.c \
+  container_slist.c \
   crypto_aes.c \
   crypto_crc.c \
   crypto_hash.c \
+  crypto_hkdf.c \
+  crypto_kdf.c \
   crypto_ksk.c \
   crypto_random.c \
   crypto_rsa.c \
@@ -36,35 +79,60 @@ libgnunetutil_la_SOURCES = \
   disk.h \
   getopt.c \
   getopt_helpers.c \
+  helper.c \
+  load.c \
   network.c \
-  network_socket.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)
+  time.c
 
 
 libgnunetutil_la_LIBADD = \
-  $(GCLIBADD) \
+  $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
-  -lgmp -lltdl -lz -lextractor $(XLIB)
+  $(LTLIBICONV) \
+  -lltdl -lz $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 4:0:0
+  $(GN_LIB_LDFLAGS) \
+  -version-info 6:0:1
+
+
+bin_PROGRAMS = \
+ gnunet-service-resolver \
+ gnunet-resolver
+
+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
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -73,8 +141,13 @@ libgnunet_plugin_test_la_SOURCES = \
 libgnunet_plugin_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+if HAVE_BENCHMARKS
+ BENCHMARKS = \
+  perf_crypto_hash 
+endif
 
 check_PROGRAMS = \
+ test_bio \
  test_client \
  test_common_allocation \
  test_common_endian \
@@ -83,39 +156,58 @@ check_PROGRAMS = \
  test_container_bloomfilter \
  test_container_meta_data \
  test_container_multihashmap \
- test_container_vector \
+ test_container_heap \
+ test_container_slist \
  test_crypto_aes \
  test_crypto_aes_weak \
  test_crypto_crc \
  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_os_network \
  test_os_priority \
+ test_peer \
  test_plugin \
  test_program \
  test_pseudonym \
+ test_resolver_api \
  test_scheduler \
  test_scheduler_delay \
  test_server \
  test_server_disconnect \
  test_server_with_client \
+ $(SERVER_CLIENT_UNIX) \
  test_service \
  test_strings \
  test_time \
- perf_crypto_hash
+ $(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_client_SOURCES = \
  test_client.c
@@ -137,6 +229,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 = \
@@ -150,16 +247,21 @@ 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_vector_SOURCES = \
- test_container_vector.c
-test_container_vector_LDADD = \
+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 = \
@@ -170,7 +272,8 @@ 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
@@ -182,6 +285,11 @@ test_crypto_hash_SOURCES = \
 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 = \
@@ -207,39 +315,34 @@ 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 = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
-test_os_load_SOURCES = \
- test_os_load.c
-test_os_load_LDADD = \
+test_connection_transmit_cancel_SOURCES = \
+ test_connection_transmit_cancel.c
+test_connection_transmit_cancel_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_os_network_SOURCES = \
@@ -252,6 +355,11 @@ test_os_priority_SOURCES = \
 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
 test_plugin_LDADD = \
@@ -267,6 +375,11 @@ test_pseudonym_SOURCES = \
 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
 test_scheduler_LDADD = \
@@ -292,6 +405,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 = \
@@ -315,7 +434,7 @@ perf_crypto_hash_LDADD = \
 
 EXTRA_DIST = \
   test_configuration_data.conf \
-  test_container_meta_data_image.jpg \
   test_program_data.conf \
   test_pseudonym_data.conf \
+  test_resolver_api_data.conf \
   test_service_data.conf