diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-20 14:23:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-20 17:52:43 +0200 |
| commit | c726262ca9f1ced15858c99085cec97f9896072a (patch) | |
| tree | 5ad604e0adb14ca98414e2fe90abd7f6101eb9fb | |
| parent | 9c793897d63c38916786cceaf41b5956bb3dbcec (diff) | |
| download | ptxdist-c726262ca9f1ced15858c99085cec97f9896072a.tar.gz ptxdist-c726262ca9f1ced15858c99085cec97f9896072a.tar.xz | |
qt4: webkit needs script headers, but not the lib
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/qt4.make | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rules/qt4.make b/rules/qt4.make index 1d4f1a2c1..d4cf26498 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -198,7 +198,8 @@ QT4_AUTOCONF-$(call ptx/qt-no, EGL) += egl QT4_AUTOCONF-$(call ptx/qt-no, BUILD_QTXMLPATTERNS) += xmlpatterns exceptions QT4_AUTOCONF-$(call ptx/qt-no, BUILD_MULTIMEDIA) += multimedia audio-backend QT4_AUTOCONF-$(call ptx/qt-no, BUILD_PHONON) += phonon phonon-backend -QT4_AUTOCONF-$(call ptx/qt-no, BUILD_WEBKIT) += webkit +# QtWebKit need QtScript headers but not the lib. +QT4_AUTOCONF-$(call ptx/qt-no, BUILD_WEBKIT) += webkit script QT4_AUTOCONF-$(call ptx/qt-no, BUILD_SCRIPTTOOLS) += scripttools QT4_AUTOCONF-$(call ptx/qt-no, BUILD_SVG) += svg QT4_AUTOCONF-$(call ptx/qt-no, BUILD_SCRIPT) += script @@ -206,6 +207,8 @@ QT4_AUTOCONF-$(call ptx/qt-no, BUILD_DECLARATIVE) += declarative QT4_AUTOCONF-$(call ptx/qt-plugin, SQLITE) += sql-sqlite +QT4_AUTOCONF-no := $(filter-out $(QT4_AUTOCONF-y),$(QT4_AUTOCONF-no)) + QT4_AUTOCONF += $(foreach opt,$(QT4_AUTOCONF-y),-$(opt)) QT4_AUTOCONF += $(foreach opt,$(QT4_AUTOCONF-qt),-qt-$(opt)) QT4_AUTOCONF += $(foreach opt,$(QT4_AUTOCONF-plugin),-plugin-$(opt)) @@ -274,7 +277,7 @@ QT4_BUILD-$(PTXCONF_QT4_BUILD_DECLARATIVE) += declarative imports QT4_BUILD-$(PTXCONF_QT4_BUILD_QTXMLPATTERNS) += xmlpatterns QT4_BUILD-$(PTXCONF_QT4_BUILD_MULTIMEDIA) += multimedia QT4_BUILD-$(PTXCONF_QT4_BUILD_PHONON) += phonon -QT4_BUILD-$(PTXCONF_QT4_BUILD_WEBKIT) += webkit +QT4_BUILD-$(PTXCONF_QT4_BUILD_WEBKIT) += webkit script ifdef PTXCONF_QT4_BUILD_DECLARATIVE QT4_BUILD-$(PTXCONF_QT4_BUILD_WEBKIT) += webkitdeclarative endif |