From patchwork Sun Sep 18 11:23:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-opie,09/17] opie: drop MOC and UIC overrides on command line Date: Sun, 18 Sep 2011 11:23:11 -0000 From: lumag X-Patchwork-Id: 11641 Message-Id: <1316344999-26642-10-git-send-email-dbaryshkov@gmail.com> To: openembedded-devel@lists.openembedded.org Cc: Dmitry Eremin-Solenikov We do already provide our OE values for MOC and UIC via qmake.bbclass/linux-oe-g++ qmake config. Don't override MOC/UIC on command line. Signed-off-by: Dmitry Eremin-Solenikov --- recipes-opie/libopie/libopie2.inc | 2 +- recipes-opie/libqpe/libqpe-opie.inc | 2 +- recipes-opie/libqtaux/libqtaux2.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-opie/libopie/libopie2.inc b/recipes-opie/libopie/libopie2.inc index 67cae32..f64742d 100644 --- a/recipes-opie/libopie/libopie2.inc +++ b/recipes-opie/libopie/libopie2.inc @@ -59,7 +59,7 @@ do_compile() { ln -sf ../../../opiepim/private/$header ${S}/include/opie2/private done - oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S} + oe_runmake DESTDIR=${S} } do_install() { diff --git a/recipes-opie/libqpe/libqpe-opie.inc b/recipes-opie/libqpe/libqpe-opie.inc index 7ddc40c..34854b3 100644 --- a/recipes-opie/libqpe/libqpe-opie.inc +++ b/recipes-opie/libqpe/libqpe-opie.inc @@ -45,7 +45,7 @@ do_compile() { install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` done rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia - oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic + oe_runmake } do_install() { diff --git a/recipes-opie/libqtaux/libqtaux2.inc b/recipes-opie/libqtaux/libqtaux2.inc index 2955ab8..81a8f4b 100644 --- a/recipes-opie/libqtaux/libqtaux2.inc +++ b/recipes-opie/libqtaux/libqtaux2.inc @@ -12,7 +12,7 @@ S = "${WORKDIR}/libqtaux" inherit opie do_compile() { - oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S} + oe_runmake DESTDIR=${S} } do_install() {