summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-03 02:06:31 +0100
committerChristian Grothoff <christian@grothoff.org>2019-04-03 13:43:15 +0200
commit4cecaf9d96ef62430ad81fe5e7a24ca68cd27095 (patch)
tree9ceee4b7e77e3f78d5574de973615d7a93af9ea3
parente35cd05d91025475e31c88eb8f46a6ef723f3dae (diff)
gnunet-qr: Add into Makefile.am and pofiles,
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/util/Makefile.am29
2 files changed, 15 insertions, 15 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe788fdae..67c22aaed 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -480,6 +480,7 @@ src/util/gnunet-config.c
src/util/gnunet-config-diff.c
src/util/gnunet-ecc.c
src/util/gnunet-helper-w32-console.c
+src/util/gnunet-qr.c
src/util/gnunet-resolver.c
src/util/gnunet-scrypt.c
src/util/gnunet-service-resolver.c
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,