aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-07-06 09:28:11 +0000
committerAndre Heinecke <[email protected]>2016-07-06 09:28:11 +0000
commit4934893e27a50f5715dcd4d2907ecbe629921b32 (patch)
tree24a8198c8aea8b9fdcd2f0bf2573d5f5c5e97400
parentRevert "Qt: More robust lookup of Cpp's context.h" (diff)
downloadgpgme-4934893e27a50f5715dcd4d2907ecbe629921b32.tar.gz
gpgme-4934893e27a50f5715dcd4d2907ecbe629921b32.zip
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++.
-rw-r--r--lang/qt/tests/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index c2280006..379abb3e 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