-code deduplication in rsa sign/verify code

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index ec3884dc8817b97fc95bc0fd6a6b237d609a1163..28d3d6a3e5a399c4638841b09474c380e1609895 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -5,13 +5,16 @@ plugindir = $(libdir)/gnunet
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 dist_pkgcfg_DATA = \
-  util.conf resolver.conf
+  util.conf 
+
+pkgcfg_DATA = \
+  resolver.conf
 
 if MINGW
 noinst_LTLIBRARIES = \
   libgnunetutilwin.la
 libgnunetutilwin_la_SOURCES = \
-  win.cc \
+  win.c \
   winproc.c
 libgnunetutilwin_la_LDFLAGS = \
   -no-undefined -Wl,--export-all-symbols 
@@ -19,6 +22,7 @@ libgnunetutilwin_la_LIBADD = \
   -lshell32 -liconv -lstdc++ \
   -lcomdlg32 -lgdi32 -liphlpapi
 WINLIB = libgnunetutilwin.la
+W32CAT = w32cat
 endif
 
 if !MINGW
@@ -30,10 +34,14 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+w32cat_SOURCES = w32cat.c
+
 noinst_PROGRAMS = \
  gnunet-config-diff \
+ $(W32CAT) \
  test_common_logging_dummy
 
+
 gnunet_config_diff_SOURCES = \
  gnunet-config-diff.c
 gnunet_config_diff_LDADD = \
@@ -66,6 +74,7 @@ libgnunetutil_la_SOURCES = \
   container_slist.c \
   crypto_aes.c \
   crypto_crc.c \
+  crypto_ecc.c \
   crypto_hash.c \
   crypto_hkdf.c \
   crypto_kdf.c \
@@ -95,23 +104,29 @@ libgnunetutil_la_SOURCES = \
   service.c \
   signal.c \
   strings.c \
-  time.c
+  time.c \
+  speedup.c
 
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
-  -lltdl -lz $(XLIB) 
+  $(LTLIBINTL) \
+  -lltdl -lz -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 6:0:1
+  -version-info 8:0:0
 
 
 bin_PROGRAMS = \
  gnunet-service-resolver \
- gnunet-resolver
+ gnunet-resolver \
+ gnunet-config \
+ gnunet-rsa \
+ gnunet-uri 
+
 
 gnunet_service_resolver_SOURCES = \
  gnunet-service-resolver.c         
@@ -130,6 +145,33 @@ gnunet_resolver_LDADD = \
 gnunet_resolver_DEPENDENCIES = \
   libgnunetutil.la
 
+
+gnunet_rsa_SOURCES = \
+ gnunet-rsa.c         
+gnunet_rsa_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL) -lgcrypt
+gnunet_rsa_DEPENDENCIES = \
+  libgnunetutil.la
+
+
+gnunet_config_SOURCES = \
+ gnunet-config.c         
+gnunet_config_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_config_DEPENDENCIES = \
+  libgnunetutil.la
+
+
+gnunet_uri_SOURCES = \
+ gnunet-uri.c         
+gnunet_uri_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_uri_DEPENDENCIES = \
+  libgnunetutil.la
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -180,6 +222,7 @@ check_PROGRAMS = \
  test_resolver_api \
  test_scheduler \
  test_scheduler_delay \
+ test_server_mst_interrupt \
  test_server \
  test_server_disconnect \
  test_server_with_client \
@@ -187,6 +230,7 @@ check_PROGRAMS = \
  test_service \
  test_strings \
  test_time \
+ test_speedup \
  $(BENCHMARKS) \
  test_os_start_process \
  test_common_logging_runtime_loglevels
@@ -205,6 +249,8 @@ test_os_start_process_SOURCES = \
  test_os_start_process.c
 test_os_start_process_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
+test_os_start_process_DEPENDENCIES = \
+ $(WINCAT)
 
 test_client_SOURCES = \
  test_client.c
@@ -387,6 +433,11 @@ test_scheduler_delay_SOURCES = \
 test_scheduler_delay_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_server_mst_interrupt_SOURCES = \
+ test_server_mst_interrupt.c
+test_server_mst_interrupt_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_server_SOURCES = \
  test_server.c
 test_server_LDADD = \
@@ -423,6 +474,11 @@ test_time_SOURCES = \
 test_time_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_speedup_SOURCES = \
+ test_speedup.c
+test_speedup_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 perf_crypto_hash_SOURCES = \
  perf_crypto_hash.c
 perf_crypto_hash_LDADD = \
@@ -434,4 +490,5 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_pseudonym_data.conf \
   test_resolver_api_data.conf \
-  test_service_data.conf
+  test_service_data.conf \
+  test_speedup_data.conf