X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2FMakefile.am;h=0e799b5531b87f63907f0754ff0e6b698288eb72;hb=0778ffa854d2bb626ebedfe3c1e8ca6a1209e42e;hp=755f91a11fe0b265713f1a231c40e2fd4eae8346;hpb=e81f832a8c0b83c6ea7ec66773e848389f3bfb32;p=oweals%2Fgnunet.git

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 755f91a11..0e799b553 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -121,7 +121,7 @@ libgnunetutil_la_SOURCES = \
   time.c \
   tun.c \
   speedup.c speedup.h \
-	proc_compat.c
+  proc_compat.c
 
 if HAVE_LIBATOMIC
 if DARWIN
@@ -204,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 \
@@ -236,18 +236,6 @@ gnunet_timeout_SOURCES = \
  gnunet-timeout-w32.c
 endif
 
-# This is horrible, but compared to the alternatives and the solution
-# which preceded this it is a good compromise and good enough for one
-# file. Everyone else is invited to patch it locally.
-
-xENV=$(shell which env)
-
-do_subst = $(SED) -e 's,[@]ENV[@],${xENV},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 = \
@@ -284,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
 
@@ -671,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