[Pkg-gnupg-commit] [gpgme] 315/412: qt: Ensure that current src dir is included first

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 5a92cc96da183ebb19867a2a910f53ba41e76ae9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 25 16:19:39 2016 +0200

    qt: Ensure that current src dir is included first
    
    * lang/qt/src/Makefile.am: Reorder include directives.
    
    --
    This fixes the problem that QGpgME would pick up gpgme or
    gpgme++ headers from an installed version.
---
 lang/qt/src/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 8f6d773..59206ed 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -199,8 +199,9 @@ nodist_include_HEADERS = qgpgme_version.h
 
 libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
 
-AM_CPPFLAGS = @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
-              -DBUILDING_QGPGME -I$(top_srcdir)/lang/cpp/src
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/lang/cpp/src \
+              @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
+              -DBUILDING_QGPGME
 
 libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
                        @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git