-remove async ecc key generation, not needed

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 06cd283c8968a3e058eb2542a7be41f4b0bd4ac1..44e22e390c48a977b8eee0ecd19785ee2b1d31d6 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -110,18 +110,24 @@ libgnunetutil_la_SOURCES = \
   time.c \
   speedup.c
 
+libgnunetutil_la_CPPFLAGS = \
+  $(LTDLINCL)
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  -lltdl $(Z_LIBS) -lunistring $(XLIB) 
+  $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 11:0:2
 
+if HAVE_TESTING
+  GNUNET_ECC = gnunet-ecc
+endif
+
 
 libexec_PROGRAMS = \
  gnunet-service-resolver 
@@ -129,7 +135,7 @@ libexec_PROGRAMS = \
 bin_PROGRAMS = \
  gnunet-resolver \
  gnunet-config \
- gnunet-ecc \
+ $(GNUNET_ECC) \
  gnunet-rsa \
  gnunet-uri 
 
@@ -234,7 +240,6 @@ check_PROGRAMS = \
  test_mq \
  test_mq_client \
  test_os_network \
- test_os_priority \
  test_peer \
  test_plugin \
  test_program \
@@ -434,11 +439,6 @@ test_os_network_SOURCES = \
 test_os_network_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_os_priority_SOURCES = \
- test_os_priority.c
-test_os_priority_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_peer_SOURCES = \
  test_peer.c
 test_peer_LDADD = \