ohm: Sync with OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2544 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 32 insertions, 5 deletions

diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb
index dfad988df6..ae338bf2da 100644
--- a/meta/packages/ohm/ohm_git.bb
+++ b/meta/packages/ohm/ohm_git.bb
@@ -2,19 +2,46 @@ DESCRIPTION = "Open Hardware Manager"
 HOMEPAGE = "http://freedesktop.org/Software/ohm"
 LICENSE = "LGPL"
 
-DEPENDS = "dbus-glib intltool-native hal"
-RDEPENDS += "udev hal-info"
+DEPENDS = "gtk+ dbus-glib intltool-native hal"
+RDEPENDS_${PN} += "udev hal-info"
 SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git"
 
 PV = "0.0+git${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF = "--with-distro=debian --disable-gtk-doc --with-xauth-dir=/home/root"
+
 do_configure_prepend() {
-        touch gtk-doc.make
+        touch gtk-doc.make
 }
 
-EXTRA_OECONF = "--with-distro=debian --disable-gtk-doc --with-xauth-dir=/home/root"
+do_configure_append() {
+        rm config.log
+}
+
+OE_LT_RPATH_ALLOW=":${libdir}/libohm:"
+OE_LT_RPATH_ALLOW[export]="1"
+
+PACKAGES =+ "libohm ohm-plugin-x11"
+
+FILES_${PN}-dev += "${libdir}/ohm/*.la \
+                   ${libdir}/ohm/*.a "
+
+FILES_${PN} = "${sysconfdir} \
+               ${bindir}/* \
+               ${sbindir}/* \
+               ${libdir}/ohm/*.so \
+               "
+
+FILES_libohm = "${libdir}/libohm.so.*"
+FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \
+                        ${libdir}/ohm/libohm_idle.so \ 
+                        ${sysconfdir}/ohm/plugins.d/x* \
+                        ${sysconfdir}/ohm/plugins.d/idle* \
+                        "
+
+