qt5base: restructure Makefile a bit (only cosmetics)

This commit is contained in:
Mirko Vogt
2021-08-09 15:19:48 +00:00
parent 10cefd1467
commit af2dc0b0d4

View File

@@ -85,11 +85,11 @@ define Package/qt5base/Default
MAINTAINER:=Mirko Vogt <mirko-openwrt@nanl.de> MAINTAINER:=Mirko Vogt <mirko-openwrt@nanl.de>
endef endef
# define Package/qt5base define Package/qt5base-core
# $(call Package/qt5base/Default) $(call Package/qt5base/Default)
# DEPENDS:= TITLE+=core
# MENU:=1 DEPENDS+=+libpthread +zlib +libzstd +libpcre2-16 +libstdcpp +librt +libdouble-conversion $(ICONV_DEPENDS) +PACKAGE_icu:icu #FIXME: do not include ICONV_DEPENDS if ICU is selected (though, that's only an issue when using GNU iconv)
# endef endef
define Package/qt5base-concurrent define Package/qt5base-concurrent
$(call Package/qt5base/Default) $(call Package/qt5base/Default)
@@ -103,12 +103,6 @@ define Package/qt5base-gl
DEPENDS+=+qt5base-core +qt5base-gui +qt5base-widgets @BROKEN DEPENDS+=+qt5base-core +qt5base-gui +qt5base-widgets @BROKEN
endef endef
define Package/qt5base-core
$(call Package/qt5base/Default)
TITLE+=core
DEPENDS+=+libpthread +zlib +libzstd +libpcre2-16 +libstdcpp +librt +libdouble-conversion $(ICONV_DEPENDS) +PACKAGE_icu:icu #FIXME: do not include ICONV_DEPENDS if ICU is selected (though, that's only an issue when using GNU iconv)
endef
define Package/qt5base-gui define Package/qt5base-gui
$(call Package/qt5base/Default) $(call Package/qt5base/Default)
TITLE+=gui TITLE+=gui
@@ -537,6 +531,10 @@ define Package/qt5base-core/install
$(call Build/Install/Libs,$(1),libQt5Core) $(call Build/Install/Libs,$(1),libQt5Core)
endef endef
define Package/qt5base-concurrent/install
$(call Build/Install/Libs,$(1),libQt5Concurrent)
endef
define Package/qt5base-gl/install define Package/qt5base-gl/install
$(call Build/Install/Libs,$(1),libQt5OpenGL) $(call Build/Install/Libs,$(1),libQt5OpenGL)
endef endef
@@ -642,8 +640,8 @@ define Package/qt5base-examples/install
endef endef
# $(eval $(call BuildPackage,qt5base)) # $(eval $(call BuildPackage,qt5base))
$(eval $(call BuildPackage,qt5base-concurrent))
$(eval $(call BuildPackage,qt5base-core)) $(eval $(call BuildPackage,qt5base-core))
$(eval $(call BuildPackage,qt5base-concurrent))
$(eval $(call BuildPackage,qt5base-gui)) $(eval $(call BuildPackage,qt5base-gui))
$(eval $(call BuildPackage,qt5base-gl)) $(eval $(call BuildPackage,qt5base-gl))
$(eval $(call BuildPackage,qt5base-network)) $(eval $(call BuildPackage,qt5base-network))