aboutsummaryrefslogtreecommitdiff
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)
downloadgnunet-4cecaf9d96ef62430ad81fe5e7a24ca68cd27095.tar.gz
gnunet-4cecaf9d96ef62430ad81fe5e7a24ca68cd27095.zip
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
480src/util/gnunet-config-diff.c 480src/util/gnunet-config-diff.c
481src/util/gnunet-ecc.c 481src/util/gnunet-ecc.c
482src/util/gnunet-helper-w32-console.c 482src/util/gnunet-helper-w32-console.c
483src/util/gnunet-qr.c
483src/util/gnunet-resolver.c 484src/util/gnunet-resolver.c
484src/util/gnunet-scrypt.c 485src/util/gnunet-scrypt.c
485src/util/gnunet-service-resolver.c 486src/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 = \
204 gnunet-timeout \ 204 gnunet-timeout \
205 $(W32CONSOLEHELPER) 205 $(W32CONSOLEHELPER)
206 206
207do_subst = $(SED) -e 's,[@]PREFIX[@],$(prefix),g'
208
209gnunet-qr: gnunet-qr.in Makefile
210 $(do_subst) < $(srcdir)/gnunet-qr.in > gnunet-qr
211 chmod +x gnunet-qr
212
213CLEANFILES = gnunet-qr
214
215pkgdata_DATA = \
216 gnunet-qr.py
217
218bin_SCRIPTS =\
219 gnunet-qr
220
221bin_PROGRAMS = \ 207bin_PROGRAMS = \
222 gnunet-resolver \ 208 gnunet-resolver \
223 gnunet-config \ 209 gnunet-config \
224 $(GNUNET_ECC) \ 210 $(GNUNET_ECC) \
225 $(GNUNET_SCRYPT) \ 211 $(GNUNET_SCRYPT) \
226 gnunet-uri 212 gnunet-uri
213if HAVE_ZBAR
214bin_PROGRAMS += gnunet-qr
215endif
227 216
228noinst_PROGRAMS = \ 217noinst_PROGRAMS = \
229 gnunet-config-diff \ 218 gnunet-config-diff \
@@ -283,13 +272,19 @@ gnunet_config_LDADD = \
283 libgnunetutil.la \ 272 libgnunetutil.la \
284 $(GN_LIBINTL) 273 $(GN_LIBINTL)
285 274
286
287gnunet_uri_SOURCES = \ 275gnunet_uri_SOURCES = \
288 gnunet-uri.c 276 gnunet-uri.c
289gnunet_uri_LDADD = \ 277gnunet_uri_LDADD = \
290 libgnunetutil.la \ 278 libgnunetutil.la \
291 $(GN_LIBINTL) 279 $(GN_LIBINTL)
292 280
281
282gnunet_qr_SOURCES = \
283 gnunet-qr.c \
284 gnunet-qr-utils.h
285gnunet_qr_LDFLAGS= $(libzbar_LIBS)
286gnunet_qr_CFLAGS = $(libzbar_CFLAGS)
287
293plugin_LTLIBRARIES = \ 288plugin_LTLIBRARIES = \
294 libgnunet_plugin_test.la 289 libgnunet_plugin_test.la
295 290
@@ -670,6 +665,10 @@ EXTRA_DIST = \
670 test_program_data.conf \ 665 test_program_data.conf \
671 test_resolver_api_data.conf \ 666 test_resolver_api_data.conf \
672 test_service_data.conf \ 667 test_service_data.conf \
668<<<<<<< HEAD
673 test_speedup_data.conf \ 669 test_speedup_data.conf \
674 gnunet-qr.in \ 670 gnunet-qr.in \
675 gnunet-qr.py 671 gnunet-qr.py
672=======
673 test_speedup_data.conf
674>>>>>>> gnunet-qr: Add into Makefile.am and pofiles,