qtuio: correct install-target/staging when Qt library type is 'static'
authorThomas De Schampheleire <patrickdepinguin@gmail.com>
Mon, 17 Feb 2014 09:51:03 +0000 (10:51 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 17 Feb 2014 10:36:11 +0000 (11:36 +0100)
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>
package/qtuio/qtuio.mk

index 652dbc2af36e12dbc4f81d770783683ec447459c..fe23230b2c533ea409303c70b237d462c44f2318 100644 (file)
@@ -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))