[packages/qt4] some Qt-internal paths are magically getting appended to TARGET_{INC...

[packages.git] / Xorg / lib / qt4 / files / qmake.mk

diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk
index d7921d9..f6da582 100644 (file)
--- a/Xorg/lib/qt4/files/qmake.mk
+++ b/Xorg/lib/qt4/files/qmake.mk
@@ -5,10 +5,20 @@
 # See /LICENSE for more information.
 #
 
-QMAKE_SPECFILE:=$(STAGING_DIR)/usr/share/mkspecs/qws/linux-openwrt-g++
+QMAKE_PLATFORM_PREFIX:=$(if $(CONFIG_QT4_WS_QWS),qws/)
+QMAKE_SPECFILE:=$(STAGING_DIR)/usr/share/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++
 
-TARGET_INCDIRS+=$(STAGING_DIR)/include $(STAGING_DIR)/usr/include $(TOOLCHAIN_DIR)/include $(TOOLCHAIN_DIR)/usr/include
-TARGET_LIBDIRS+=$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib $(TOOLCHAIN_DIR)/lib $(TOOLCHAIN_DIR)/usr/lib
+TARGET_INCDIRS +=\
+       $(TOOLCHAIN_DIR)/include \
+       $(STAGING_DIR)/include \
+       $(TOOLCHAIN_DIR)/usr/include \
+       $(STAGING_DIR)/usr/include
+
+TARGET_LIBDIRS += \
+       $(TOOLCHAIN_DIR)/lib \
+       $(STAGING_DIR)/lib \
+       $(TOOLCHAIN_DIR)/usr/lib \
+       $(STAGING_DIR)/usr/lib 
 
 define Build/Configure/Qmake
        TARGET_CC="$(TARGET_CROSS)gcc" \
@@ -21,9 +31,16 @@ define Build/Configure/Qmake
        TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
        TARGET_INCDIRS="$(TARGET_INCDIRS)" \
        TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \
+       TARGET_LIBS="$(TARGET_LIBS)" \
        STAGING_DIR_HOST="$(STAGING_DIR)/../host" \
+       STAGING_DIR="$(STAGING_DIR)" \
        qmake \
                -spec $(QMAKE_SPECFILE) \
                -o $(PKG_BUILD_DIR)/Makefile \
                $(PKG_BUILD_DIR)/$(1).pro
 endef
+
+define Build/Compile/Default
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+               $(1);
+endef