package/qt-webkit-kiosk: convert to qmake infrastructure
authorAndreas Naumann <anaumann@ultratronik.de>
Mon, 17 Feb 2020 21:23:37 +0000 (22:23 +0100)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Wed, 11 Mar 2020 22:03:42 +0000 (23:03 +0100)
Convert but keep the slightly complicated custom install step for now.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/qt-webkit-kiosk/qt-webkit-kiosk.mk

index a714fca9c9614caf8d189997440c4a31cefc6c45..cd1c21e28a8218d03290409c5101ad062c099e5d 100644 (file)
@@ -11,13 +11,7 @@ QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia
 QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0
 QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html
 
-define QT_WEBKIT_KIOSK_CONFIGURE_CMDS
-       (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr)
-endef
-
-define QT_WEBKIT_KIOSK_BUILD_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
+QT_WEBKIT_KIOSK_CONF_OPTS = PREFIX=/usr
 
 define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src -f Makefile.qt-webkit-kiosk \
@@ -29,4 +23,4 @@ define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS
                $(if $(BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS),install_sound)
 endef
 
-$(eval $(generic-package))
+$(eval $(qmake-package))