diff options
| author | Ingo Klöcker <[email protected]> | 2024-07-18 09:43:24 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2024-07-18 12:42:30 +0000 |
| commit | 42e151b34ba1e8c07b1ed2e4e1f6299466e499a1 (patch) | |
| tree | add3288f95c8004ab37f3e0e537f8d4133a31b81 /lang/qt/src/Makefile.am | |
| parent | build,qt: Decouple generation of moc files (diff) | |
| download | gpgme-42e151b34ba1e8c07b1ed2e4e1f6299466e499a1.tar.gz gpgme-42e151b34ba1e8c07b1ed2e4e1f6299466e499a1.zip | |
build,qt: Allow building Qt 5 bindings and Qt 6 bindings
* configure.ac: Remove "qt" from default_languages. Add "qt5 qt6" to
default_languages. Remove "qt" from help for --enable-languages. Don't
fail anymore if "qt5" and "qt6" are enabled. Warn that "qt" is
deprecated if it was enabled.
* lang/qt/src/Makefile.am (libqgpgme_la, libqgpgmeqt6_la): New.
(lib_LTLIBRARIES): Set Qt 5 and/or Qt 6 variant of libqgpgme.
(AM_CPPFLAGS): Replace with libqgpgme_la_CPPFLAGS for Qt 5 and
libqgpgmeqt6_la_CPPFLAGS for Qt 6.
--
This makes it possible to build QGpgME simultaneously for Qt 5 and Qt 6.
By default, QGpgME is now built for all versions of Qt that are found.
Specifying "qt" as language is deprecated.
GnuPG-bug-id: 7205
Diffstat (limited to '')
| -rw-r--r-- | lang/qt/src/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index e98e31e4..eb7ff948 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -20,11 +20,12 @@ # 02111-1307, USA if WANT_QT5 -lib_LTLIBRARIES = libqgpgme.la +libqgpgme_la = libqgpgme.la endif if WANT_QT6 -lib_LTLIBRARIES = libqgpgmeqt6.la +libqgpgmeqt6_la = libqgpgmeqt6.la endif +lib_LTLIBRARIES = $(libqgpgme_la) $(libqgpgmeqt6_la) EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \ qgpgme_debug.h qgpgme_version.h.in \ @@ -373,7 +374,7 @@ $(qgpgme_moc6_forward_headers): Makefile.am | $(moc6_dir) endif if WANT_QT5 -AM_CPPFLAGS = -I./$(moc5_dir) -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \ +libqgpgme_la_CPPFLAGS = -I./moc5 -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ -DBUILDING_QGPGME -Wsuggest-override \ -Wzero-as-null-pointer-constant @@ -388,7 +389,7 @@ libqgpgme_la_LDFLAGS = -no-undefined -version-info \ @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@ endif if WANT_QT6 -AM_CPPFLAGS = -I./$(moc6_dir) -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \ +libqgpgmeqt6_la_CPPFLAGS = -I./moc6 -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ -DBUILDING_QGPGME -Wsuggest-override \ -Wzero-as-null-pointer-constant |