summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/packages/gnome/gconf-dbus-native_svn.bb30
-rw-r--r--meta/packages/gnome/gconf-dbus_svn.bb8
2 files changed, 3 insertions, 35 deletions
diff --git a/meta/packages/gnome/gconf-dbus-native_svn.bb b/meta/packages/gnome/gconf-dbus-native_svn.bb
deleted file mode 100644
index 38109634a..000000000
--- a/meta/packages/gnome/gconf-dbus-native_svn.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "intltool-native glib-2.0-native dbus-native dbus-glib-native libxml2-native popt-native gtk-doc-native"
-DESCRIPTION = "Settings daemon using DBUS for communication."
-LICENSE = "GPL"
-PROVIDES = "gconf-native"
-RPROVIDES_${PN} = "gconf-native"
-
-PV = "2.16.0+svnr${SRCREV}"
-
-SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
-
-inherit pkgconfig autotools native
-S = "${WORKDIR}/trunk"
-
-PARALLEL_MAKE = ""
-
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-
-EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
-
-
-do_configure_prepend() {
- touch gtk-doc.make
-}
-
-do_stage() {
- autotools_stage_all
- install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
-}
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index 4e587295f..61d46793b 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -10,7 +10,7 @@ PV = "2.16.0+svnr${SRCREV}"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
-inherit pkgconfig autotools
+inherit pkgconfig autotools_stage
S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
@@ -25,7 +25,5 @@ do_configure_prepend() {
touch gtk-doc.make
}
-do_stage() {
- autotools_stage_all
- install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
-}
+BBCLASSEXTEND = "native"
+