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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index b616de4d1..7f2e0cd48 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,7 +1,15 @@
-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
@@ -9,26 +17,48 @@ libgnunetutilwin_la_SOURCES = \
   win.cc \
   winproc.c
 libgnunetutilwin_la_LDFLAGS = \
-  -Wl,--no-undefined -Wl,--export-all-symbols 
+  -no-undefined -Wl,--export-all-symbols 
 libgnunetutilwin_la_LIBADD = \
-  -lshell32 -luuid -liconv -lstdc++ \
-  -lcomdlg32 -lgdi32
+  -lshell32 -liconv -lstdc++ \
+  -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 = \
+  bandwidth.c \
   bio.c \
   client.c \
   common_allocation.c \
   common_endian.c \
-  common_gettext.c \
   common_logging.c \
   configuration.c \
   connection.c \
@@ -40,6 +70,8 @@ libgnunetutil_la_SOURCES = \
   crypto_aes.c \
   crypto_crc.c \
   crypto_hash.c \
+  crypto_hkdf.c \
+  crypto_kdf.c \
   crypto_ksk.c \
   crypto_random.c \
   crypto_rsa.c \
@@ -47,46 +79,60 @@ libgnunetutil_la_SOURCES = \
   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 \
   plugin.c \
   program.c \
   pseudonym.c \
-  resolver_api.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) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
-  -lgmp -lltdl -lz -lextractor $(XLIB)
+  $(LTLIBICONV) \
+  -lltdl -lz $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 4:0:0
+  -version-info 6:0:1
 
 
 bin_PROGRAMS = \
- gnunet-service-resolver
+ 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
 
@@ -95,6 +141,10 @@ 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 \
@@ -112,6 +162,7 @@ check_PROGRAMS = \
  test_crypto_aes_weak \
  test_crypto_crc \
  test_crypto_hash \
+ test_crypto_hkdf \
  test_crypto_ksk \
  test_crypto_random \
  test_crypto_rsa \
@@ -123,9 +174,9 @@ check_PROGRAMS = \
  test_connection_timeout \
  test_connection_timeout_no_connect \
  test_connection_transmit_cancel \
- test_os_load \
  test_os_network \
  test_os_priority \
+ test_peer \
  test_plugin \
  test_program \
  test_pseudonym \
@@ -135,13 +186,17 @@ check_PROGRAMS = \
  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
@@ -149,6 +204,11 @@ 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
 test_client_LDADD = \
@@ -169,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 = \
@@ -182,7 +247,7 @@ 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
@@ -207,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
@@ -219,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 = \
@@ -274,11 +345,6 @@ test_connection_transmit_cancel_SOURCES = \
 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 = \
@@ -289,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 = \
@@ -334,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 = \
@@ -357,7 +434,6 @@ 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 \