merge of 1008f485c5a4815b155d1b11108fdcf704c936bf

     and 697cade2183f67dfff37e0d7896d63862e7c6b4e

6 files changed, 14 insertions, 57 deletions

diff --git a/packages/efl++/efl++-fb_0.0.2.bb b/packages/efl++/efl++-fb_0.0.2.bb
deleted file mode 100644
index b6a23d832d..0000000000
--- a/packages/efl++/efl++-fb_0.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include efl++.inc
-
-EFL_CONFIGURATION = "DEFINES-=EFL_HAVE_X11"
diff --git a/packages/efl++/efl++-fb_0.0.3.bb b/packages/efl++/efl++-fb_0.0.3.bb
new file mode 100644
index 0000000000..713c86eb16
--- /dev/null
+++ b/packages/efl++/efl++-fb_0.0.3.bb
@@ -0,0 +1 @@
+include efl++.inc
diff --git a/packages/efl++/efl++-x11_0.0.2.bb b/packages/efl++/efl++-x11_0.0.2.bb
deleted file mode 100644
index d3f37911ee..0000000000
--- a/packages/efl++/efl++-x11_0.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include efl++.inc
-
-EFL_CONFIGURATION = "DEFINES+=EFL_HAVE_X11"
diff --git a/packages/efl++/efl++-x11_0.0.3.bb b/packages/efl++/efl++-x11_0.0.3.bb
new file mode 100644
index 0000000000..d55e149d19
--- /dev/null
+++ b/packages/efl++/efl++-x11_0.0.3.bb
@@ -0,0 +1,3 @@
+include efl++.inc
+
+EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11"
diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc
index d575bfa9ee..aaf097e511 100644
--- a/packages/efl++/efl++.inc
+++ b/packages/efl++/efl++.inc
@@ -14,9 +14,7 @@ inherit qmake
 
 PARALLEL_MAKE = ""
 QMAKE_PROFILES = "efl++.pro"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/misc INCLUDEPATH+=${S}/src/common \
-			INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \
-			LIBS+=-L${S} DESTDIR=${S} ${EFL_CONFIGURATION}"
+EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
 export OE_QMAKE_LINK="${CXX}"
 export EDIR="${S}"
 
@@ -24,7 +22,16 @@ do_configure_prepend() {
 	rm include.pro
 	cat <<EOF >include.pro
 include ( common.pro )
+
+LIBS        += -L${EDIR}
+
+CONFIG      = console release eflbasic
+INCLUDEPATH += ${EDIR}/src/common ${EDIR}/src/extra ${EDIR}/src/misc
+INCLUDEPATH += ${EDIR}/src/evas ${EDIR}/src/ecore ${EDIR}/src/edje
+INCLUDEPATH += ${EDIR}/src/esmart ${EDIR}/src/ewl
+
 DEFINES += DATADIR=\"${datadir}/efl++/\"
+
 EOF
 }
 
diff --git a/packages/efl++/efl++_0.0.2.bb b/packages/efl++/efl++_0.0.2.bb
deleted file mode 100644
index 5803f5db7a..0000000000
--- a/packages/efl++/efl++_0.0.2.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries"
-SECTION = "e/libs"
-LICENSE = "LGPL"
-AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-MAINTAINER = "${AUTHOR}"
-HOMEPAGE = "http://www.Vanille.de/projects/efl++.html"
-DEPENDS = "virtual/evas virtual/ecore edje"
-
-SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2"
-S = "${WORKDIR}/efl++-${PV}"
-
-inherit qmake
-
-PARALLEL_MAKE = ""
-QMAKE_PROFILES = "efl++.pro"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \
-			LIBS+=-L${S} DESTDIR=${S}"
-export OE_QMAKE_LINK="${CXX}"
-export EDIR="${S}"
-
-do_configure_prepend() {
-	rm include.pro
-	cat <<EOF >include.pro
-include ( common.pro )
-DEFINES += DATADIR=\"${datadir}/efl++/\"
-DEFINES += EFL_HAVE_X11
-EOF
-}
-
-do_stage() {
-	for i in src/evas/*.h src/ecore/*.h src/edje/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}
-	done
-	oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_libinstall -so -C ${S} libefl++ ${D}${libdir}
-	install -d ${D}${bindir}
-	install edje-simple ${D}${bindir}
-	install -d ${D}${datadir}/efl++
-	cp -a data/* ${D}${datadir}/efl++
-}
-
-PACKAGES =+ "efl++-examples"
-FILES_${PN} = "${libdir}"
-FILES_efl++-examples = "${bindir} ${datadir}"