[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 07/30: gnunet-qr: Add into Makefile.am and pofiles
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 07/30: gnunet-qr: Add into Makefile.am and pofiles, |
Date: |
Wed, 03 Apr 2019 13:53:48 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit d60866a5dfb1a3529d40ee4c445b891c68a362c8
Author: Hartmut Goebel <address@hidden>
AuthorDate: Sun Mar 3 02:06:31 2019 +0100
gnunet-qr: Add into Makefile.am and pofiles,
---
po/POTFILES.in | 1 +
src/util/Makefile.am | 26 +++++++++++---------------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09e4c533d..deeffe180 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -480,6 +480,7 @@ src/util/gnunet-config-diff.c
src/util/gnunet-config.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 645289f59..ba3c98ad1 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -204,24 +204,15 @@ libexec_PROGRAMS = \
gnunet-timeout \
$(W32CONSOLEHELPER)
-do_subst = $(SED) -e 's,address@hidden@],$(prefix),g'
-
-gnunet-qr: gnunet-qr.in Makefile
- $(do_subst) < $(srcdir)/gnunet-qr.in > gnunet-qr
- chmod +x gnunet-qr
-
-CLEANFILES = gnunet-qr
-
-bin_SCRIPTS =\
- gnunet-qr \
- gnunet-qr.py
-
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 \
@@ -281,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
@@ -668,5 +665,4 @@ EXTRA_DIST = \
test_program_data.conf \
test_resolver_api_data.conf \
test_service_data.conf \
- test_speedup_data.conf \
- gnunet-qr.in
+ test_speedup_data.conf
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (65c86ea8d -> f256a930e), gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 04/30: gnunet-qr: Actually run gnunet-uri., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 06/30: configure.ac: Add check for libzbar (using pkgconfig)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 02/30: gnunet-qr: Simplify verbose messaging., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 05/30: Add Hartmut Goebel to the AUTHORS file., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 10/30: gnunet-qr: Use GNUNET_PROGRAM_run to simplify the code., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 03/30: Add helper lib "gnunet-qr-utils.h"., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 07/30: gnunet-qr: Add into Makefile.am and pofiles,,
gnunet <=
- [GNUnet-SVN] [gnunet] 01/30: gnunet-qr: Reimplement in C - yet only a proof of concept., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 25/30: contrib/guix: Add zbar as dependency for package gnunet., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 17/30: gnunet-qr: Actually run gnunet-uri., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 15/30: gnunet-qr: Simplify verbose messaging., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 18/30: Add Hartmut Goebel to the AUTHORS file., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 08/30: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 12/30: contrib/guix: Add zbar as dependency for package gnunet., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 09/30: gnunet-qr: Update documentation and scripts to changed dependencies., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 19/30: configure.ac: Add check for libzbar (using pkgconfig)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 20/30: gnunet-qr: Add into Makefile.am and pofiles,, gnunet, 2019/04/03