diff options
| author | Andre Heinecke <[email protected]> | 2016-08-25 14:19:39 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-08-25 14:20:42 +0000 |
| commit | 5a92cc96da183ebb19867a2a910f53ba41e76ae9 (patch) | |
| tree | fd314a4a0d3f5e1c696de8e02262fa4990cf0807 | |
| parent | cpp: Add WithTofu Keylist Mode (diff) | |
| download | gpgme-5a92cc96da183ebb19867a2a910f53ba41e76ae9.tar.gz gpgme-5a92cc96da183ebb19867a2a910f53ba41e76ae9.zip | |
qt: Ensure that current src dir is included first
* lang/qt/src/Makefile.am: Reorder include directives.
--
This fixes the problem that QGpgME would pick up gpgme or
gpgme++ headers from an installed version.
| -rw-r--r-- | lang/qt/src/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index 8f6d773b..59206ed8 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -199,8 +199,9 @@ nodist_include_HEADERS = qgpgme_version.h libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers) -AM_CPPFLAGS = @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ - -DBUILDING_QGPGME -I$(top_srcdir)/lang/cpp/src +AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/lang/cpp/src \ + @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ + -DBUILDING_QGPGME libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \ @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@ |