1 files changed, 14 insertions, 15 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index cd14fb4ca..02dede372 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -204,26 +204,15 @@ libexec_PROGRAMS = \
  gnunet-timeout \
  $(W32CONSOLEHELPER)
 
-do_subst = $(SED) -e 's,[@]PREFIX[@],$(prefix),g'
-
-gnunet-qr: gnunet-qr.in Makefile
-        $(do_subst) < $(srcdir)/gnunet-qr.in > gnunet-qr
-        chmod +x gnunet-qr
-
-CLEANFILES = gnunet-qr
-
-pkgdata_DATA = \
-  gnunet-qr.py
-
-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 \
@@ -283,13 +272,19 @@ 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-utils.h
+gnunet_qr_LDFLAGS= $(libzbar_LIBS)
+gnunet_qr_CFLAGS = $(libzbar_CFLAGS)
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -670,6 +665,10 @@ EXTRA_DIST = \
   test_program_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
+<<<<<<< HEAD
   test_speedup_data.conf \
   gnunet-qr.in \
   gnunet-qr.py
+=======
+  test_speedup_data.conf
+>>>>>>> gnunet-qr: Add into Makefile.am and pofiles,