tolerate additional IPv4 address now available for gnunet.org

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 4ae073c2ccb5210a07a1348dea6a9883955d492a..0e799b5531b87f63907f0754ff0e6b698288eb72 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -40,6 +40,11 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+if ENABLE_BENCHMARK
+  BENCHMARK = benchmark.c benchmark.h
+  PTHREAD = -lpthread
+endif
+
 w32cat_SOURCES = w32cat.c
 
 gnunet_helper_w32_console_SOURCES = \
@@ -60,6 +65,7 @@ test_common_logging_dummy_LDADD = \
 
 libgnunetutil_la_SOURCES = \
   bandwidth.c \
+  $(BENCHMARK) \
   bio.c \
   client.c \
   common_allocation.c \
@@ -114,14 +120,43 @@ libgnunetutil_la_SOURCES = \
   strings.c \
   time.c \
   tun.c \
-  speedup.c speedup.h
+  speedup.c speedup.h \
+  proc_compat.c
+
+if HAVE_LIBATOMIC
+if DARWIN
+       LIBATOMIC=
+else
+  LIBATOMIC= -latomic
+endif
+else
+  LIBATOMIC=
+endif
+
+if HAVE_LIBIDN
+  LIBIDN= -lidn
+else
+  LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+  LIBIDN2= -lidn2
+else
+  LIBIDN2=
+endif
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
+  $(LIBATOMIC) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  -lltdl -lidn $(Z_LIBS) -lunistring $(XLIB)
+  -lltdl \
+  $(LIBIDN) $(LIBIDN2) \
+  $(Z_LIBS) \
+  -lunistring \
+  $(XLIB) \
+  $(PTHREAD)
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
@@ -169,15 +204,15 @@ libexec_PROGRAMS = \
  gnunet-timeout \
  $(W32CONSOLEHELPER)
 
-bin_SCRIPTS =\
- gnunet-qr
-
 bin_PROGRAMS = \
  gnunet-resolver \
  gnunet-config \
  $(GNUNET_ECC) \
  $(GNUNET_SCRYPT) \
  gnunet-uri
+if HAVE_ZBAR
+bin_PROGRAMS += gnunet-qr
+endif
 
 noinst_PROGRAMS = \
  gnunet-config-diff \
@@ -201,13 +236,6 @@ gnunet_timeout_SOURCES = \
  gnunet-timeout-w32.c
 endif
 
-
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
-
-gnunet-qr: gnunet-qr.py.in Makefile
-       $(do_subst) < $(top_srcdir)/src/util/gnunet-qr.py.in > gnunet-qr
-       chmod +x gnunet-qr
-
 gnunet_service_resolver_SOURCES = \
  gnunet-service-resolver.c
 gnunet_service_resolver_LDADD = \
@@ -244,13 +272,21 @@ gnunet_config_LDADD = \
   libgnunetutil.la \
   $(GN_LIBINTL)
 
-
 gnunet_uri_SOURCES = \
  gnunet-uri.c
 gnunet_uri_LDADD = \
   libgnunetutil.la \
   $(GN_LIBINTL)
 
+
+gnunet_qr_SOURCES = \
+  gnunet-qr.c
+gnunet_qr_LDADD = \
+  libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_qr_LDFLAGS= \
+  -lzbar
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -631,5 +667,4 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
-  test_speedup_data.conf \
-  gnunet-qr.py.in
+  test_speedup_data.conf