bugfix

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 240c862472ec165559a17619949b55daa5495d9b..c85a2cd758811a1dac8aa5f2b56811fa3038d14e 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -3,8 +3,17 @@ 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
- WINSRC = win.cc winproc.c
+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
@@ -27,6 +36,7 @@ libgnunetutil_la_SOURCES = \
   container_heap.c \
   container_meta_data.c \
   container_multihashmap.c \
+  container_slist.c \
   crypto_aes.c \
   crypto_crc.c \
   crypto_hash.c \
@@ -46,6 +56,7 @@ libgnunetutil_la_SOURCES = \
   plugin.c \
   program.c \
   pseudonym.c \
+  resolver_api.c \
   scheduler.c \
   server.c \
   server_tc.c \
@@ -57,15 +68,25 @@ libgnunetutil_la_SOURCES = \
 
 
 libgnunetutil_la_LIBADD = \
-  $(GCLIBADD) \
+  $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   -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
 
@@ -76,6 +97,7 @@ libgnunet_plugin_test_la_LDFLAGS = \
 
 
 check_PROGRAMS = \
+ test_bio \
  test_client \
  test_common_allocation \
  test_common_endian \
@@ -85,6 +107,7 @@ check_PROGRAMS = \
  test_container_meta_data \
  test_container_multihashmap \
  test_container_heap \
+ test_container_slist \
  test_crypto_aes \
  test_crypto_aes_weak \
  test_crypto_crc \
@@ -103,9 +126,11 @@ check_PROGRAMS = \
  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 \
@@ -118,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 = \
@@ -157,12 +189,17 @@ test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
 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 = \
@@ -253,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 = \
@@ -268,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 = \
@@ -315,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