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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 2f7edd301..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,18 +17,40 @@ 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 -liconv -lstdc++ \
-  -lcomdlg32 -lgdi32
+  -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 = \
@@ -41,6 +71,7 @@ libgnunetutil_la_SOURCES = \
   crypto_crc.c \
   crypto_hash.c \
   crypto_hkdf.c \
+  crypto_kdf.c \
   crypto_ksk.c \
   crypto_random.c \
   crypto_rsa.c \
@@ -48,10 +79,10 @@ 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 \
@@ -74,23 +105,34 @@ libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
-  -lgmp -lltdl -lz $(XLIB)
+  -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
 
@@ -99,6 +141,11 @@ 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 \
@@ -127,7 +174,6 @@ 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 \
@@ -140,13 +186,15 @@ check_PROGRAMS = \
  test_server \
  test_server_disconnect \
  test_server_with_client \
+ $(SERVER_CLIENT_UNIX) \
  test_service \
  test_strings \
  test_time \
- perf_crypto_hash \
- test_os_start_process 
+ $(BENCHMARKS) \
+ test_os_start_process \
+ test_common_logging_runtime_loglevels
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -181,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 = \
@@ -219,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
@@ -291,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 = \
@@ -356,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 = \