From: Andreas Naumann Date: Mon, 17 Feb 2020 21:23:35 +0000 (+0100) Subject: package/qt5/qt5webkit-examples: convert to qmake infrastructure X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6d7d95522398f6184f355128b660ba91f032192;p=buildroot.git package/qt5/qt5webkit-examples: convert to qmake infrastructure Straightforward conversion. Only conditional dependencies have to remain. Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 6dab61d913..84bc291739 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -7,7 +7,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5base qt5webkit +QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 @@ -19,29 +19,8 @@ ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns endif -define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) -endef - -define QT5WEBKIT_EXAMPLES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative -define QT5WEBKIT_EXAMPLES_INSTALL_QML - cp -dpfr $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples -endef endif -define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib/qt/examples - cp -dpfr $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples - $(QT5WEBKIT_EXAMPLES_INSTALL_QML) -endef - -$(eval $(generic-package)) +$(eval $(qmake-package))