Commit 31d212b3 authored Feb 17, 2014 by Thomas De Schampheleire Committed by Peter Korsgaard Feb 17, 2014

qtuio: correct install-target/staging when Qt library type is 'static'

If BR2_PACKAGE_QT_STATIC is set, qtuio will not build a .so file, but .a.
However, the custom INSTALL_TARGET_CMDS and INSTALL_STAGING_CMDS
unconditionally attempted to copy the .so file.

This commit checks the requested Qt library type and copies the right
library for each case, taking into account that the static .a file does not
need to be copied to the target directory.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent 8e63d54e

package/qtuio/qtuio.mk

+11 −2

Original line number	Diff line number	Diff line
		@@ -51,13 +51,22 @@ define QTUIO_INSTALL_EXAMPLES
		endef
		endif

		ifeq ($(BR2_PACKAGE_QT_STATIC),y)
		QTUIO_LIBRARY = libqTUIO.a
		else
		QTUIO_LIBRARY = libqTUIO.so*
		define QTUIO_INSTALL_TARGET_LIBRARY
		cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(TARGET_DIR)/usr/lib
		endef
		endif

		define QTUIO_INSTALL_TARGET_CMDS
		cp -dpf $(@D)/lib/libqTUIO.so* $(TARGET_DIR)/usr/lib
		$(QTUIO_INSTALL_TARGET_LIBRARY)
		$(QTUIO_INSTALL_EXAMPLES)
		endef

		define QTUIO_INSTALL_STAGING_CMDS
		cp -dpf $(@D)/lib/libqTUIO.so* $(STAGING_DIR)/usr/lib
		cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(STAGING_DIR)/usr/lib
		endef

		$(eval $(generic-package))