Qt: Fix include order when buildin test
authorAndre Heinecke <aheinecke@intevation.de>
Wed, 6 Jul 2016 09:28:11 +0000 (11:28 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Wed, 6 Jul 2016 09:28:11 +0000 (11:28 +0200)
* 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

index c228000..379abb3 100644 (file)
@@ -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