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 548af6305fb5aac44a26483889d3d4cf67dbac0b..0e799b5531b87f63907f0754ff0e6b698288eb72 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -280,10 +280,12 @@ gnunet_uri_LDADD = \
 
 
 gnunet_qr_SOURCES = \
-  gnunet-qr.c \
-  gnunet-qr-utils.h
-gnunet_qr_LDFLAGS= $(libzbar_LIBS)
-gnunet_qr_CFLAGS = $(libzbar_CFLAGS) -DBINDIR=\"@bindir@/\"
+  gnunet-qr.c
+gnunet_qr_LDADD = \
+  libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_qr_LDFLAGS= \
+  -lzbar
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
@@ -665,10 +667,4 @@ 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,