don't bypass GNUnet IO

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 9c9802847c0e0903c5c62002511afafa1c4485d0..a8031d9156a08cd648f4cf092c47ae78f8df6692 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 -liconv -lstdc++ \
+  -lcomdlg32 -lgdi32
+WINLIB = libgnunetutilwin.la
 endif
 
 if USE_COVERAGE
@@ -15,6 +24,7 @@ endif
 lib_LTLIBRARIES = libgnunetutil.la
 
 libgnunetutil_la_SOURCES = \
+  bandwidth.c \
   bio.c \
   client.c \
   common_allocation.c \
@@ -47,24 +57,24 @@ libgnunetutil_la_SOURCES = \
   plugin.c \
   program.c \
   pseudonym.c \
-  resolver_api.c \
+  resolver_api.c resolver.h \
   scheduler.c \
   server.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)
 
 libgnunetutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  $(GN_LIB_LDFLAGS) \
   -version-info 4:0:0
 
 
@@ -86,7 +96,6 @@ libgnunet_plugin_test_la_SOURCES = \
 libgnunet_plugin_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-
 check_PROGRAMS = \
  test_bio \
  test_client \
@@ -117,6 +126,7 @@ check_PROGRAMS = \
  test_os_load \
  test_os_network \
  test_os_priority \
+ test_peer \
  test_plugin \
  test_program \
  test_pseudonym \
@@ -129,7 +139,8 @@ check_PROGRAMS = \
  test_service \
  test_strings \
  test_time \
- perf_crypto_hash
+ perf_crypto_hash \
+ test_os_start_process 
 
 TESTS = $(check_PROGRAMS)
 
@@ -140,6 +151,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 = \
@@ -280,6 +296,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 = \
@@ -347,6 +368,10 @@ perf_crypto_hash_LDADD = \
 
 
 EXTRA_DIST = \
+  program_lib_argz.c \
+  program_lib_strndup.c \
+  program_lib_strnlen.c \
+  program_lib_mempcpy.c \
   test_configuration_data.conf \
   test_container_meta_data_image.jpg \
   test_program_data.conf \