bugfix

[oweals/gnunet.git] / src / util / Makefile.am

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a90b2b7934c48ce3af0b2b04b6b75cc66b788b28..c85a2cd758811a1dac8aa5f2b56811fa3038d14e 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -3,25 +3,40 @@ INCLUDES = -I$(top_srcdir)/src/include
 plugindir = $(libdir)/gnunet
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
+noinst_LTLIBRARIES = \
+  libgnunetutilwin.la
+libgnunetutilwin_la_SOURCES = \
+  win.cc \
+  winproc.c
+libgnunetutilwin_la_LDFLAGS = \
+  -Wl,--no-undefined -Wl,--export-all-symbols 
+libgnunetutilwin_la_LIBADD = \
+  -lshell32 -luuid -liconv -lstdc++ \
+  -lcomdlg32 -lgdi32
+WINLIB = libgnunetutilwin.la
 endif
 
 if USE_COVERAGE
-  AM_CFLAGS = --coverage
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
 endif
 
 lib_LTLIBRARIES = libgnunetutil.la
 
 libgnunetutil_la_SOURCES = \
+  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_slist.c \
   crypto_aes.c \
   crypto_crc.c \
   crypto_hash.c \
@@ -29,6 +44,7 @@ libgnunetutil_la_SOURCES = \
   crypto_random.c \
   crypto_rsa.c \
   disk.c \
+  disk.h \
   getopt.c \
   getopt_helpers.c \
   network.c \
@@ -36,28 +52,41 @@ libgnunetutil_la_SOURCES = \
   os_load.c \
   os_network.c \
   os_priority.c \
+  peer.c \
   plugin.c \
   program.c \
   pseudonym.c \
+  resolver_api.c \
   scheduler.c \
   server.c \
   server_tc.c \
   service.c \
   signal.c \
   strings.c \
-  time.c
+  time.c \
+  $(WINSRC)
 
 
 libgnunetutil_la_LIBADD = \
-  $(GCLIBADD) \
+  $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
-  -lgmp -lltdl -lz -lextractor
+  -lgmp -lltdl -lz -lextractor $(XLIB)
 
 libgnunetutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  $(GN_LIB_LDFLAGS) \
   -version-info 4:0:0
 
 
+bin_PROGRAMS = \
+ gnunet-service-resolver
+
+gnunet_service_resolver_SOURCES = \
+ gnunet-service-resolver.c         
+gnunet_service_resolver_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -68,6 +97,7 @@ libgnunet_plugin_test_la_LDFLAGS = \
 
 
 check_PROGRAMS = \
+ test_bio \
  test_client \
  test_common_allocation \
  test_common_endian \
@@ -76,6 +106,8 @@ check_PROGRAMS = \
  test_container_bloomfilter \
  test_container_meta_data \
  test_container_multihashmap \
+ test_container_heap \
+ test_container_slist \
  test_crypto_aes \
  test_crypto_aes_weak \
  test_crypto_crc \
@@ -85,18 +117,20 @@ check_PROGRAMS = \
  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_connection \
+ test_connection_addressing \
+ test_connection_receive_cancel \
+ 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 \
+ test_resolver_api \
  test_scheduler \
  test_scheduler_delay \
  test_server \
@@ -109,6 +143,13 @@ check_PROGRAMS = \
 
 TESTS = $(check_PROGRAMS)
 
+
+test_bio_SOURCES = \
+ test_bio.c
+test_bio_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
 test_client_SOURCES = \
  test_client.c
 test_client_LDADD = \
@@ -149,6 +190,16 @@ test_container_multihashmap_SOURCES = \
 test_container_multihashmap_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 = \
  test_crypto_aes.c
 test_crypto_aes_LDADD = \
@@ -194,34 +245,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 = \
+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 = \
@@ -239,6 +290,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 = \
@@ -254,6 +310,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 = \
@@ -301,8 +362,10 @@ perf_crypto_hash_LDADD = \
 
 
 EXTRA_DIST = \
+  program_lib_argz.c \
   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