-fix time assertion introduce in last patch

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 851b4b521a753252138e2834624b698dcae19a2e..d4b0bb2e9f06ac59511445303c4fa5a946467fd8 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -25,6 +25,7 @@ libgnunetutilwin_la_LIBADD = \
   -lcomdlg32 -lgdi32 -liphlpapi
 WINLIB = libgnunetutilwin.la
 W32CAT = w32cat
+W32CONSOLEHELPER = gnunet-helper-w32-console
 endif
 
 if !MINGW
@@ -38,6 +39,14 @@ endif
 
 w32cat_SOURCES = w32cat.c
 
+gnunet_helper_w32_console_SOURCES = \
+  gnunet-helper-w32-console.c \
+  gnunet-helper-w32-console.h
+gnunet_helper_w32_console_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+gnunet_helper_w32_console_DEPENDENCIES = \
+ libgnunetutil.la
+
 noinst_PROGRAMS = \
  gnunet-config-diff \
  $(W32CAT) \
@@ -64,6 +73,7 @@ libgnunetutil_la_SOURCES = \
   bandwidth.c \
   bio.c \
   client.c \
+  client_manager.c \
   common_allocation.c \
   common_endian.c \
   common_logging.c \
@@ -82,6 +92,8 @@ libgnunetutil_la_SOURCES = \
   crypto_hash.c \
   crypto_hkdf.c \
   crypto_kdf.c \
+  crypto_mpi.c \
+  crypto_paillier.c \
   crypto_random.c \
   disk.c \
   disk.h \
@@ -107,7 +119,7 @@ libgnunetutil_la_SOURCES = \
   signal.c \
   strings.c \
   time.c \
-  speedup.c
+  speedup.c speedup.h
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
@@ -118,15 +130,17 @@ libgnunetutil_la_LIBADD = \
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 11:0:2
+  -version-info 12:0:0
 
 if HAVE_TESTING
   GNUNET_ECC = gnunet-ecc
+  GNUNET_SCRYPT = gnunet-scrypt
 endif
 
 
 libexec_PROGRAMS = \
- gnunet-service-resolver
+ gnunet-service-resolver \
+ $(W32CONSOLEHELPER)
 
 bin_SCRIPTS =\
  gnunet-qr
@@ -135,8 +149,14 @@ bin_PROGRAMS = \
  gnunet-resolver \
  gnunet-config \
  $(GNUNET_ECC) \
+ $(GNUNET_SCRYPT) \
  gnunet-uri
 
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+gnunet-qr: gnunet-qr.py.in Makefile
+       $(do_subst) < gnunet-qr.py.in > gnunet-qr
+       chmod +x gnunet-qr
 
 gnunet_service_resolver_SOURCES = \
  gnunet-service-resolver.c
@@ -164,6 +184,14 @@ gnunet_ecc_LDADD = \
 gnunet_ecc_DEPENDENCIES = \
   libgnunetutil.la
 
+gnunet_scrypt_SOURCES = \
+ gnunet-scrypt.c
+gnunet_scrypt_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL) -lgcrypt
+gnunet_scrypt_DEPENDENCIES = \
+  libgnunetutil.la
+
 
 gnunet_config_SOURCES = \
  gnunet-config.c
@@ -218,6 +246,7 @@ check_PROGRAMS = \
  test_crypto_ecdhe \
  test_crypto_hash \
  test_crypto_hkdf \
+ test_crypto_paillier \
  test_crypto_random \
  test_disk \
  test_getopt \
@@ -251,6 +280,7 @@ check_PROGRAMS = \
  test_common_logging_runtime_loglevels
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -370,6 +400,12 @@ test_crypto_hkdf_SOURCES = \
 test_crypto_hkdf_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_crypto_paillier_SOURCES = \
+ test_crypto_paillier.c
+test_crypto_paillier_LDADD = \
+ $(LIBGCRYPT_LIBS) \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_crypto_random_SOURCES = \
  test_crypto_random.c
 test_crypto_random_LDADD = \
@@ -534,4 +570,5 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
-  test_speedup_data.conf
+  test_speedup_data.conf \
+  gnunet-qr.py.in