do not compile in a different way depending on conditional dependencies, as this fails in some situations and the saved build time isn't worth the maintanance

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22263 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mirko
2010-07-17 17:43:36 +00:00
parent f6f5af5e92
commit cf6fe21f5e

View File

@ -240,30 +240,29 @@ define Build/Configure
-system-libjpeg \ -system-libjpeg \
-system-freetype \ -system-freetype \
-system-sqlite \ -system-sqlite \
$(if $(CONFIG_PACKAGE_qt4-sqlite),-plugin-sql-sqlite,) \ -plugin-sql-sqlite \
$(if $(CONFIG_PACKAGE_qt4-mysql),-plugin-sql-mysql,) \ -plugin-sql-mysql \
-no-decoration-styled \ -no-decoration-styled \
-no-decoration-windows \ -no-decoration-windows \
-no-decoration-default \ -no-decoration-default \
-verbose \ -verbose \
-$(if $(CONFIG_PACKAGE_qt4-multimedia),multimedia,no-multimedia) \ -no-multimedia \
-$(if $(CONFIG_PACKAGE_qt4-audio-backend),audio-backend,no-audio-backend) \ -no-audio-backend \
-$(if $(CONFIG_PACKAGE_qt4-phonon),phonon,no-phonon) \ -phonon \
-$(if $(CONFIG_PACKAGE_qt4-phonon-backend),phonon-backend,no-phonon-backend) \ -no-phonon-backend \
-svg \ -svg \
-$(if $(CONFIG_PACKAGE_qt4-webkit),webkit,no-webkit) \ -webkit \
-no-javascript-jit \ -no-javascript-jit \
-$(if $(CONFIG_PACKAGE_qt4-script),script,no-script) \ -script \
-$(if $(CONFIG_PACKAGE_qt4-scripttools),scripttools,no-scripttools) \ -scripttools \
-$(if $(CONFIG_PACKAGE_qt4-accessibility),accessibility,no-accessibility) \ -no-accessibility \
-$(if $(CONFIG_PACKAGE_qt4-declarative),declarative,no-declarative) \ -declarative \
-no-openssl \ -no-openssl \
-no-nis \ -no-nis \
$(if $(CONFIG_PACKAGE_qt4-gui),,-no-gui) \ -no-cups \
-$(if $(CONFIG_PACKAGE_qt4-cups),cups,no-cups) \
-no-iconv \ -no-iconv \
-$(if $(CONFIG_PACKAGE_qt4-dbus),dbus,no-dbus) \ -dbus \
-$(if $(CONFIG_PACKAGE_qt4-gtkstyle),gtkstyle,no-gtkstyle) \ -no-gtkstyle \
-no-nas-sound \ -no-nas-sound \
-no-opengl \ -no-opengl \
-no-openvg \ -no-openvg \
@ -279,9 +278,9 @@ define Build/Configure
-no-fontconfig \ -no-fontconfig \
-no-xinput \ -no-xinput \
-no-xkb \ -no-xkb \
-$(if $(CONFIG_PACKAGE_qt4-glib),glib,no-glib) \ -no-glib \
-$(if $(CONFIG_PACKAGE_qt4-qt3support),qt3support,no-qt3support) \ -qt3support \
-$(if $(CONFIG_FEATURE_drawing-backend_DirectFB),qt-gfx-directfb,) \ -qt-gfx-directfb \
-qt-gfx-linuxfb \ -qt-gfx-linuxfb \
-no-gfx-multiscreen \ -no-gfx-multiscreen \
) )