aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-03 02:06:31 +0100
committerHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-13 18:22:06 +0100
commitd60866a5dfb1a3529d40ee4c445b891c68a362c8 (patch)
treee308f3ff85590dec8ea743c300987ffd17b72f9c /src
parentdb1ae389da242b97dfe06882e9950e3b881cd378 (diff)
downloadgnunet-d60866a5dfb1a3529d40ee4c445b891c68a362c8.tar.gz
gnunet-d60866a5dfb1a3529d40ee4c445b891c68a362c8.zip
gnunet-qr: Add into Makefile.am and pofiles,
Diffstat (limited to 'src')
-rw-r--r--src/util/Makefile.am26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 645289f59..ba3c98ad1 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -204,24 +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
215bin_SCRIPTS =\
216 gnunet-qr \
217 gnunet-qr.py
218
219bin_PROGRAMS = \ 207bin_PROGRAMS = \
220 gnunet-resolver \ 208 gnunet-resolver \
221 gnunet-config \ 209 gnunet-config \
222 $(GNUNET_ECC) \ 210 $(GNUNET_ECC) \
223 $(GNUNET_SCRYPT) \ 211 $(GNUNET_SCRYPT) \
224 gnunet-uri 212 gnunet-uri
213if HAVE_ZBAR
214bin_PROGRAMS += gnunet-qr
215endif
225 216
226noinst_PROGRAMS = \ 217noinst_PROGRAMS = \
227 gnunet-config-diff \ 218 gnunet-config-diff \
@@ -281,13 +272,19 @@ gnunet_config_LDADD = \
281 libgnunetutil.la \ 272 libgnunetutil.la \
282 $(GN_LIBINTL) 273 $(GN_LIBINTL)
283 274
284
285gnunet_uri_SOURCES = \ 275gnunet_uri_SOURCES = \
286 gnunet-uri.c 276 gnunet-uri.c
287gnunet_uri_LDADD = \ 277gnunet_uri_LDADD = \
288 libgnunetutil.la \ 278 libgnunetutil.la \
289 $(GN_LIBINTL) 279 $(GN_LIBINTL)
290 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
291plugin_LTLIBRARIES = \ 288plugin_LTLIBRARIES = \
292 libgnunet_plugin_test.la 289 libgnunet_plugin_test.la
293 290
@@ -668,5 +665,4 @@ EXTRA_DIST = \
668 test_program_data.conf \ 665 test_program_data.conf \
669 test_resolver_api_data.conf \ 666 test_resolver_api_data.conf \
670 test_service_data.conf \ 667 test_service_data.conf \
671 test_speedup_data.conf \ 668 test_speedup_data.conf
672 gnunet-qr.in