bitbake files inheriting palmtop: don't override EXTRA_QMAKEVARS_POST, append to it

diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index e87bab1986213fd11746ae04c48ce9410a525c6a..fcba6d2f30e4672a667968f7deac7a3c9006a1b5 100644 (file)
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
 inherit palmtop
 
 QMAKE_PROFILES = "billiardz.arm.pro"
-EXTRA_QMAKEVARS_POST = "DEFINES-=FPM_INTEL" 
+EXTRA_QMAKEVARS_POST += "DEFINES-=FPM_INTEL" 
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \

diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb
index 18f12203de9f14a0f867dafa84228d100c6f7c63..1d0d598a6f585bdcb8fb2a6a0fd8416fb240d0ab 100644 (file)
--- a/packages/cumulus/cumulus_1.2.1.bb
+++ b/packages/cumulus/cumulus_1.2.1.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/cumulus_${PV}/cumulus"
 inherit opie
 
 export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=-I."
 
 #
 # nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory

diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index 9fdad829b9bbb7a7153860b605ca3dc76a3471f0..07ef0ccf1a2d60525bb1df0fcf450148fcadfb86 100644 (file)
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -17,7 +17,7 @@ inherit opie
 DEFAULT_PREFERENCE = "-1"
 
 export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=-I."
 
 #
 # nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory

diff --git a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
index b3c01194703ee92d798086e963a1f7c58ff7a1c3..eb3784d1041bbd38d998568cd788630527332e81 100644 (file)
--- a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
+++ b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/flexis-zaurus"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia"
+EXTRA_QMAKEVARS_POST += "CONFIG-=qtopia"
 
 do_install() {
        oe_libinstall libqflexis ${D}${palmtopdir}/plugins/inputmethods/

diff --git a/packages/iaimaster/iaimaster_0.5.bb b/packages/iaimaster/iaimaster_0.5.bb
index d47b81dfba1dcf6291cdcf8c93e012796933836b..371b39924a586fdf2b91d06ec7c6092f2bd2a395 100644 (file)
--- a/packages/iaimaster/iaimaster_0.5.bb
+++ b/packages/iaimaster/iaimaster_0.5.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/IaiMaster"
 
 inherit opie
 
-EXTRA_QMAKEVARS_POST = "TARGET=${PN}"
+EXTRA_QMAKEVARS_POST += "TARGET=${PN}"
 
 do_configure_prepend() {
        qmake -project

diff --git a/packages/justreader/justreader_2.0k.bb b/packages/justreader/justreader_2.0k.bb
index 70ee709436bbe53b7a8dcb01738aab9b9053470f..fc08ea61021a1ed8d660c0a187e9a7f42920dbf9 100644 (file)
--- a/packages/justreader/justreader_2.0k.bb
+++ b/packages/justreader/justreader_2.0k.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/TextReader2"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST = 'INCLUDEPATH+="${STAGING_INCDIR}/qpe" LIBS+=-lqpe'
+EXTRA_QMAKEVARS_POST += 'INCLUDEPATH+="${STAGING_INCDIR}/qpe" LIBS+=-lqpe'
 export OE_QMAKE_LINK="${CXX}"
 
 do_configure_prepend() {

diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index 4b3ef770428207b40fb140e59eeabe683b36fc48..c7d1815e447ce24d0d4a2b7d0971fed340c17e24 100644 (file)
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.g
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST = " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
+EXTRA_QMAKEVARS_POST += " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \

diff --git a/packages/qpdf2/qpdf2_2.2.1.bb b/packages/qpdf2/qpdf2_2.2.1.bb
index 6e31f40bd6b2196b76d3741097e9fa30c807d10e..c1da64f3f9af769a56b6748863e09cfb574656b6 100644 (file)
--- a/packages/qpdf2/qpdf2_2.2.1.bb
+++ b/packages/qpdf2/qpdf2_2.2.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/qpdf2_${PV}"
 inherit opie
 
 QMAKE_PROFILES = "qpdf_render-freetype.pro"
-EXTRA_QMAKEVARS_POST = "TARGET=qpdf"
+EXTRA_QMAKEVARS_POST += "TARGET=qpdf"
 export OE_QMAKE_LINK="${CXX}"
 
 do_configure_prepend() {

diff --git a/packages/qpegps/qpegps_0.9.2.3.2.bb b/packages/qpegps/qpegps_0.9.2.3.2.bb
index 1885f97855d22a3f9e09b4e176d7394b1cf4697c..073b95a96a6452ab0e92d27d4204bc293277b0be 100644 (file)
--- a/packages/qpegps/qpegps_0.9.2.3.2.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.2.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/qpegps_my"
 inherit palmtop
 
 QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
+EXTRA_QMAKEVARS_POST += "LIBS=-lqpe"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \

diff --git a/packages/qpegps/qpegps_0.9.2.3.bb b/packages/qpegps/qpegps_0.9.2.3.bb
index baa174246f0ff92bb1aaf92301afdb64ee7c370c..0b4e5e3ccd13aae17f5f6d24b5c0cf150fed067d 100644 (file)
--- a/packages/qpegps/qpegps_0.9.2.3.bb
+++ b/packages/qpegps/qpegps_0.9.2.3.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/root/qpegps_src_my/qpegps_my"
 inherit palmtop
 
 QMAKE_PROFILES = "qpegps.pro"
-EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
+EXTRA_QMAKEVARS_POST += "LIBS=-lqpe"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \

diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb
index 1ee1821539317d9a15db974ed5834cb8e998bebb..5b2172269d07c287a2bad6a863d270ea19710321 100644 (file)
--- a/packages/sidplayer/sidplayer_1.5.0.bb
+++ b/packages/sidplayer/sidplayer_1.5.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://sidplayer.sourceforge.net/sidplayer.tar.gz \
           file://gcc34.patch;patch=1"
 S = "${WORKDIR}/sidplayer"
 
-EXTRA_QMAKEVARS_PRE = "QMAKE_INCDIR=${STAGING_INCDIR}/sidplay"
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/sidplay"
 
 inherit palmtop
 

diff --git a/packages/ubahnnav/ubahnnav_0.4.1.bb b/packages/ubahnnav/ubahnnav_0.4.1.bb
index 16924681db3c53722693a374a261c08101bc530b..9d6f85889e148a3c3903baa30ca61ecb7be43714 100644 (file)
--- a/packages/ubahnnav/ubahnnav_0.4.1.bb
+++ b/packages/ubahnnav/ubahnnav_0.4.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/ubahnnav-${PV}"
 inherit opie
 
 export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/libsubwaymap LIBS+=-L${S} LIBS-=-lqtopia"
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/src/libsubwaymap LIBS+=-L${S} LIBS-=-lqtopia"
 
 do_configure_prepend() {
        find . -name "Makefile"|xargs rm -f

diff --git a/packages/visiscript/visiscript_0.3.1.bb b/packages/visiscript/visiscript_0.3.1.bb
index 948924d597c5ad0e2624e4bee878cdbfef05dcd8..4124048ea9935ef4ba7e8f2ba81a0b4d220eec2e 100644 (file)
--- a/packages/visiscript/visiscript_0.3.1.bb
+++ b/packages/visiscript/visiscript_0.3.1.bb
@@ -17,7 +17,7 @@ inherit opie
 
 QMAKE_PROFILES = "zvisiscript.pro"
 
-EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/libqscintilla.a LIBS+=-lqscintilla"
+EXTRA_QMAKEVARS_POST += "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/libqscintilla.a LIBS+=-lqscintilla"
 
 do_install() {
        install -d ${D}${palmtopdir}/pics/

diff --git a/packages/visiscript/visiscript_0.3.2.bb b/packages/visiscript/visiscript_0.3.2.bb
index 23a62cee685769f943ef167393e3fce9c43e041d..7fcdb1bdd123ca37c22da46cb54402f2a060394a 100644 (file)
--- a/packages/visiscript/visiscript_0.3.2.bb
+++ b/packages/visiscript/visiscript_0.3.2.bb
@@ -17,7 +17,7 @@ inherit opie
 
 QMAKE_PROFILES = "zvisiscript.pro"
 
-EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/lib/libqscintilla_arm.a LIBS+=-lqscintilla"
+EXTRA_QMAKEVARS_POST += "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/lib/libqscintilla_arm.a LIBS+=-lqscintilla"
 export OE_QMAKE_LINK="${CXX}"
 
 do_compile_prepend() {

diff --git a/packages/zddice/zddice_1.0.0.bb b/packages/zddice/zddice_1.0.0.bb
index f10589c80bda598004cc942ba21365a00639fc49..2a58a0a332dc1d3e3648d92d3f264c95fd69e94a 100644 (file)
--- a/packages/zddice/zddice_1.0.0.bb
+++ b/packages/zddice/zddice_1.0.0.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/zddice-src"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+EXTRA_QMAKEVARS_POST += 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
 
 do_install() {
        install -d ${D}${palmtopdir}/{bin,pics,apps/Games}

diff --git a/packages/zgscore/zgscore_1.0.2.bb b/packages/zgscore/zgscore_1.0.2.bb
index e3dc83117cd2122b950e950ca9f5ded1d2c7ce3d..262902ce2f06fc1a492bee1f21ba682f9c62b85c 100644 (file)
--- a/packages/zgscore/zgscore_1.0.2.bb
+++ b/packages/zgscore/zgscore_1.0.2.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/zgscore-src"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+EXTRA_QMAKEVARS_POST += 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \

diff --git a/packages/zlapspeed/zlapspeed_1.0.0.bb b/packages/zlapspeed/zlapspeed_1.0.0.bb
index ee0718a02c2f8878a769b1cb56c6175989e0063a..cb4b5e5d83a89311f8877024d643a3a141372efb 100644 (file)
--- a/packages/zlapspeed/zlapspeed_1.0.0.bb
+++ b/packages/zlapspeed/zlapspeed_1.0.0.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/zlaps-src"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+EXTRA_QMAKEVARS_POST += 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
 
 do_install() {
        install -d ${D}${palmtopdir}/{bin,pics,apps/Applications}

diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index b39312211392c8e11956ee336ff658629210eff5..db4906993465b47881ce4aa60862b1c48b6b9bd2 100644 (file)
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -23,7 +23,7 @@ FILES_zshopi-i18n-de = "/opt/QtPalmtop/i18n/*"
 
 inherit opie
 
-EXTRA_QMAKEVARS_POST = "DEFINES+=QTOPIA LIBS+=-lm LIBS+=-lsqlite LIBS+=-lqpe"
+EXTRA_QMAKEVARS_POST += "DEFINES+=QTOPIA LIBS+=-lm LIBS+=-lsqlite LIBS+=-lqpe"
 OE_QMAKE_CXXFLAGS = "-fno-rtti ${CXXFLAGS}"
 
 do_configure_prepend() {