From 18ad98a7eb439dfdedf98f1fcca7fd85d17d8023 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 16 May 2013 16:31:37 +0200 Subject: gtkmm: merge gtkmm.inc into recipe - and cleanup a bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- meta-oe/recipes-gnome/gtk+/gtkmm.inc | 29 ----------------------------- meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb | 28 ++++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 meta-oe/recipes-gnome/gtk+/gtkmm.inc (limited to 'meta-oe/recipes-gnome/gtk+') diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm.inc b/meta-oe/recipes-gnome/gtk+/gtkmm.inc deleted file mode 100644 index fe72a7391d..0000000000 --- a/meta-oe/recipes-gnome/gtk+/gtkmm.inc +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "C++ bindings for the GTK+ toolkit." -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" - -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ - file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "atk pangomm glibmm gtk+ cairomm" - -inherit gnome autotools pkgconfig - -INC_PR = "r0" - -EXTRA_OECONF = " --disable-documentation " - -LIBV = "2.4.0" - -do_install_append () { - install -d ${D}${includedir}/gtkmm-2.4 - install -m 0644 gdk/gdkmmconfig.h ${D}${includedir}/gtkmm-2.4 - install -m 0644 gtk/gtkmmconfig.h ${D}${includedir}/gtkmm-2.4 -} - -PACKAGES =+ "${PN}-demo" - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" -FILES_${PN}-demo += "${datadir}/*/demo/" diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb index 05d71087d3..340657ef36 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.20.0.bb @@ -1,7 +1,31 @@ -require gtkmm.inc +DESCRIPTION = "C++ bindings for the GTK+ toolkit." +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" -PR = "${INC_PR}.2" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +PR = "r1" + +DEPENDS = "atk pangomm glibmm gtk+ cairomm" + +inherit gnome autotools pkgconfig SRC_URI[archive.md5sum] = "c0cb0ea5bc1ab511d9b2461083f0445f" SRC_URI[archive.sha256sum] = "c1199bbee423d6f0ef9b5e88973c5620a1e1c52f9f1298dffcfa36284a7fd91a" +EXTRA_OECONF = " --disable-documentation " + +do_install_append () { + install -d ${D}${includedir}/gtkmm-2.4 + install -m 0644 gdk/gdkmmconfig.h ${D}${includedir}/gtkmm-2.4 + install -m 0644 gtk/gtkmmconfig.h ${D}${includedir}/gtkmm-2.4 +} + +PACKAGES =+ "${PN}-demo" + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" +FILES_${PN}-demo += "${datadir}/*/demo/" + -- cgit 1.2.3-korg