From 69558f2c0bede869a1caec70b2046a5138043c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 17 Jul 2024 12:17:55 +0200 Subject: [PATCH] build,qt: Decouple handling of include headers * lang/qt/src/Makefile.am (includeprefix): Replace with... (includeprefix5, includeprefix6): ...these. (qgpgmeincludedir): Replace with... (qgpgme5includedir, qgpgme6includedir): ...these. (qgpgmeinclude_HEADERS): Replace with... (qgpgme5include_HEADERS, qgpgme6include_HEADERS): ...these. (nodist_qgpgmeinclude_HEADERS): Replace with... (nodist_qgpgme5include_HEADERS, nodist_qgpgme6include_HEADERS): ..these. (camelcaseincludedir): Replace with... (camelcase5includedir, camelcase6includedir): ...these. (camelcaseinclude_HEADERS): Replace with... (camelcase5include_HEADERS, camelcase6include_HEADERS): ...these. -- This prepares the code for the case that WANT_QT5 and WANT_QT6 are both true. GnuPG-bug-id: 7205 --- lang/qt/src/Makefile.am | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index f812a9d9..081adfd9 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -320,16 +320,21 @@ qgpgme_moc_sources = \ qgpgmegpgcardjob.moc if WANT_QT5 -includeprefix = qgpgme-qt5 +includeprefix5 = qgpgme-qt5 +qgpgme5includedir = $(includedir)/$(includeprefix5)/qgpgme +qgpgme5include_HEADERS = $(qgpgme_headers) +nodist_qgpgme5include_HEADERS = qgpgme_version.h +camelcase5includedir = $(includedir)/$(includeprefix5)/QGpgME +camelcase5include_HEADERS = $(camelcase_headers) endif if WANT_QT6 -includeprefix = qgpgme-qt6 +includeprefix6 = qgpgme-qt6 +qgpgme6includedir = $(includedir)/$(includeprefix6)/qgpgme +qgpgme6include_HEADERS = $(qgpgme_headers) +nodist_qgpgme6include_HEADERS = qgpgme_version.h +camelcase6includedir = $(includedir)/$(includeprefix6)/QGpgME +camelcase6include_HEADERS = $(camelcase_headers) endif -qgpgmeincludedir = $(includedir)/$(includeprefix)/qgpgme -qgpgmeinclude_HEADERS = $(qgpgme_headers) -camelcaseincludedir = $(includedir)/$(includeprefix)/QGpgME -camelcaseinclude_HEADERS = $(camelcase_headers) -nodist_qgpgmeinclude_HEADERS = qgpgme_version.h if WANT_QT5 AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \