Mercurial > hg > syntilista

diff Makefile @ 290:755fe3f8c08f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor build system cleanups in preparation for Qt6 support.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 09 May 2023 12:04:24 +0300
parents f05e9c74a022
children 10748e9d54c4
line wrap: on
line diff
--- a/Makefile	Tue May 09 11:44:58 2023 +0300
+++ b/Makefile	Tue May 09 12:04:24 2023 +0300
@@ -7,8 +7,7 @@
 
 # Miscellaneous
 QT_VERSION_PREFIX = Qt5
-QT_MODULES = Core Gui Widgets Sql PrintSupport
-QT_PREFIX = 
+QT_TOOL_PREFIX = /usr/lib/qt5/bin/
 BINTOOL_PREFIX =
 
 PREFIX = /usr/local
@@ -16,6 +15,8 @@
 OBJPATH = obj/unix/
 BINEXT =
 
+QT_MODULES = Core Gui Widgets Sql PrintSupport
+
 # Compiler flags and linker flags
 ifeq ($(USE_QTHTTP),yes)
 QT_MODULES += Network
@@ -33,12 +34,8 @@
 APP_DEPS = 
 
 # Qt tools
-QT_RCC = rcc
-
-QT_MOC = moc
 QT_MOC_FLAGS =
-
-QT_UIC = uic
+QT_MOC_RULES =
 QT_UIC_FLAGS =
 
 include Makefile.gen