endif
if ENABLE_BENCHMARK
- BENCHMARK = benchmark.c
+ BENCHMARK = benchmark.c benchmark.h
PTHREAD = -lpthread
endif
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 $(LIBIDN) $(LIBIDN2) $(Z_LIBS) -lunistring $(XLIB) $(PTHREAD)
+ -lltdl \
+ $(LIBIDN) $(LIBIDN2) \
+ $(Z_LIBS) \
+ -lunistring \
+ $(XLIB) \
+ $(PTHREAD)
libgnunetutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
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 \
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 = \
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
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