[Pkg-gnupg-commit] [gpgme] 320/412: qt: Include cpp before core directory

[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 e3a4697894cc5a93c295e84bb10c743bc7fdc87e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 5 10:42:02 2016 +0200

    qt: Include cpp before core directory
    
    * lang/qt/src/Makefile.am (AM_CPPFLAGS): Include cpp before core.
    
    --
    Both core and cpp have headers that have the same names, this
    can lead to the wrong headers beeing included when qt bindings
    are built.
---
 lang/qt/src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 59206ed..f63b295 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -199,7 +199,7 @@ nodist_include_HEADERS = qgpgme_version.h
 
 libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
 
-AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/lang/cpp/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
               @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
               -DBUILDING_QGPGME
 

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