fixup "qt5: avoid build of qt libs as target dep" (lib/mk -> src/qt5)

Issue #5325

repos/libports/lib/import/import-qt5_cmake.mk

@@ -1,10 +1,12 @@
 #
 # The following externally defined variables are evaluated:
 #
-# CMAKE_LISTS_DIR:      path to the CMakeLists.txt file
-# CMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories
-# QT5_PORT_LIBS:        Qt5 libraries used from port (for example libQt5Core)
-# QT5_COMPONENT_LIB_SO: if defined empty, disables linking with qt5_component.lib.so
+# CMAKE_LISTS_DIR:       path to the CMakeLists.txt file
+# CMAKE_TARGET_BINARIES  binaries to be stripped and linked into 'bin' and 'debug' directories
+# QT5_PORT_LIBS:         Qt5 libraries used from port (for example libQt5Core)
+# QT5_COMPONENT_LIB_SO:  if defined empty, disables linking with qt5_component.lib.so
+# QT5_TARGET_DEPS:       default is 'build_with_cmake'
+# QT5_EXTRA_TARGET_DEPS: additional target dependencies
 #
 
 include $(call select_from_repositories,lib/import/import-qt5.inc)
@@ -147,8 +149,11 @@ endif
 BUILD_ARTIFACTS += $(notdir $(CMAKE_TARGET_BINARIES))
 
 #
-# build applications with CMake
+# build with CMake by default
 #
+
+QT5_TARGET_DEPS ?= build_with_cmake
+
 TARGET ?= $(CMAKE_LISTS_DIR).cmake_target
 .PHONY: $(TARGET)
-$(TARGET): build_with_cmake $(QT5_EXTRA_TARGET_DEPS)
+$(TARGET): $(QT5_TARGET_DEPS) $(QT5_EXTRA_TARGET_DEPS)

repos/libports/lib/import/import-qt5_qmake.mk

@@ -1,10 +1,12 @@
 #
 # The following externally defined variables are evaluated:
 #
-# QMAKE_PROJECT_FILE:   path to the qmake project file (for applications with target.mk)
-# QMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories
-# QT5_PORT_LIBS:        Qt5 libraries used from port (for example libQt5Core)
-# QT5_COMPONENT_LIB_SO: if defined empty, disables linking with qt5_component.lib.so
+# QMAKE_PROJECT_FILE:    path to the qmake project file (for applications with target.mk)
+# QMAKE_TARGET_BINARIES  binaries to be stripped and linked into 'bin' and 'debug' directories
+# QT5_PORT_LIBS:         Qt5 libraries used from port (for example libQt5Core)
+# QT5_COMPONENT_LIB_SO:  if defined empty, disables linking with qt5_component.lib.so
+# QT5_TARGET_DEPS:       default is 'build_with_qmake'
+# QT5_EXTRA_TARGET_DEPS: additional target dependencies
 #
 
 include $(call select_from_repositories,lib/import/import-qt5.inc)
@@ -160,8 +162,11 @@ build_with_qmake: qmake_prepared.tag qt5_so_files
 BUILD_ARTIFACTS += $(notdir $(QMAKE_TARGET_BINARIES))
 
 #
-# build applications with qmake
+# build with qmake by default
 #
+
+QT5_TARGET_DEPS ?= build_with_qmake
+
 TARGET ?= $(notdir $(QMAKE_PROJECT_FILE)).qmake_target
 .PHONY: $(TARGET)
-$(TARGET): build_with_qmake $(QT5_EXTRA_TARGET_DEPS)
+$(TARGET): $(QT5_TARGET_DEPS) $(QT5_EXTRA_TARGET_DEPS)

repos/libports/lib/mk/libqgenode.mk

@@ -1,6 +0,0 @@
-#
-# This individual library description file is needed to get the abi
-# library generated when building Qt5 packages.
-#
-
-LIBS = qt5_base

repos/libports/recipes/src/libqgenodeviewwidget/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/libqgenodeviewwidget.mk \
+MIRROR_FROM_REP_DIR := src/qt5/qgenodeviewwidget/target.mk \
                        src/lib/qgenodeviewwidget
 
 content: $(MIRROR_FROM_REP_DIR) LICENSE

repos/libports/recipes/src/qt5_base/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_base.mk
+MIRROR_FROM_REP_DIR := src/qt5/base/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/recipes/src/qt5_declarative/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_declarative.mk
+MIRROR_FROM_REP_DIR := src/qt5/declarative/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/recipes/src/qt5_graphicaleffects/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_graphicaleffects.mk
+MIRROR_FROM_REP_DIR := src/qt5/graphicaleffects/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/recipes/src/qt5_quickcontrols/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols.mk
+MIRROR_FROM_REP_DIR := src/qt5/quickcontrols/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/recipes/src/qt5_quickcontrols2/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk
+MIRROR_FROM_REP_DIR := src/qt5/quickcontrols2/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/recipes/src/qt5_svg/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk
+MIRROR_FROM_REP_DIR := src/qt5/svg/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/recipes/src/qt5_virtualkeyboard/content.mk

@@ -1,4 +1,4 @@
-MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk
+MIRROR_FROM_REP_DIR := src/qt5/virtualkeyboard/target.mk
 
 content: $(MIRROR_FROM_REP_DIR)
 

repos/libports/src/qt5/base/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_base.qmake_target
+
 LIBS = qt5_qmake base ldso_so_support libc libm stdcxx qt5_component egl mesa qoost
 
 INSTALL_LIBS = lib/libQt5Core.lib.so \
@@ -82,6 +84,4 @@ build: qmake_prepared.tag build_dependencies/lib/ld.lib.so
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build

repos/libports/src/qt5/declarative/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_declarative.qmake_target
+
 QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Sql libQt5Test libQt5Widgets
 
 LIBS = qt5_qmake ldso_so_support libc libm mesa stdcxx
@@ -80,6 +82,4 @@ build: qmake_prepared.tag qt5_so_files
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build

repos/libports/src/qt5/graphicaleffects/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_graphicaleffects.qmake_target
+
 QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network
 QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick
 
@@ -56,6 +58,4 @@ build: qmake_prepared.tag qt5_so_files
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build

repos/libports/src/qt5/qgenodeviewwidget/target.mk

@@ -10,7 +10,3 @@ build_dependencies/include/qgenodeviewwidget: build_dependencies/include
 	ln -snf $(call select_from_repositories,include/qgenodeviewwidget) $@
 
 qmake_prepared.tag: build_dependencies/include/qgenodeviewwidget
-
-ifeq ($(called_from_lib_mk),yes)
-all: build_with_qmake
-endif

repos/libports/src/qt5/quickcontrols/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_quickcontrols.qmake_target
+
 QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network libQt5Widgets
 QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick
 
@@ -55,6 +57,4 @@ build: qmake_prepared.tag qt5_so_files
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build

repos/libports/src/qt5/quickcontrols2/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_quickcontrols2.qmake_target
+
 QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network libQt5Widgets
 QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick
 
@@ -64,6 +66,4 @@ build: qmake_prepared.tag qt5_so_files
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build

repos/libports/src/qt5/svg/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_svg.qmake_target
+
 QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets
 
 LIBS = qt5_qmake libc libm mesa stdcxx
@@ -55,6 +57,4 @@ build: qmake_prepared.tag qt5_so_files
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build

repos/libports/src/qt5/virtualkeyboard/target.mk

@@ -1,3 +1,5 @@
+TARGET = qt5_virtualkeyboard.qmake_target
+
 QT5_PORT_LIBS  = libQt5Core libQt5Gui libQt5Network libQt5Widgets
 QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick
 QT5_PORT_LIBS += libQt5Svg
@@ -62,6 +64,4 @@ build: qmake_prepared.tag qt5_so_files
 
 .PHONY: build
 
-ifeq ($(called_from_lib_mk),yes)
-all: build
-endif
+QT5_TARGET_DEPS = build