From 4934893e27a50f5715dcd4d2907ecbe629921b32 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Wed, 6 Jul 2016 11:28:11 +0200 Subject: 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 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 -- cgit v1.2.3