[Pkg-gnupg-commit] [gpgme] 201/412: Qt: Fix include order when buildin test

[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 4934893e27a50f5715dcd4d2907ecbe629921b32
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 6 11:28:11 2016 +0200

    Qt: Fix include order when buildin test
    
    * lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include cpp before
    gpgme src directory.
    
    --
    This fixes a problem where context.h would be picked up from gpgme/src
    instead of including the context.h from gpgme++.
---
 lang/qt/tests/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index c228000..379abb3 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -34,10 +34,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
         ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
         @GPGME_QTTEST_LIBS@ -lstdc++
 
-AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \
-              @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
-              @GPGME_QTTEST_CFLAGS@ -DBUILDING_QGPGME \
-              -I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
+              @GPG_ERROR_CFLAGS@ @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ \
+              @LIBASSUAN_CFLAGS@ @GPGME_QTTEST_CFLAGS@ -DBUILDING_QGPGME \
+              -I$(top_srcdir)/lang/qt/src \
               -DTOP_SRCDIR="$(top_srcdir)"
 
 check-local: ./pubring-stamp

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