6 files changed, 9 insertions, 22 deletions
diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc
index 9dd1e43d54..139d95239d 100644
--- a/packages/gtkmm/gtkmm.inc
+++ b/packages/gtkmm/gtkmm.inc
@@ -7,9 +7,6 @@ DEPENDS = "atk glibmm gtk+ cairomm"
 
 inherit gnome autotools pkgconfig flow-lossage
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
-
 LIBV = "2.4.0"
 
 do_stage () {
@@ -19,3 +16,6 @@ do_stage () {
         install -m 0644 gdk/gdkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
         install -m 0644 gtk/gtkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
 }
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
diff --git a/packages/gtkmm/gtkmm_2.10.10.bb b/packages/gtkmm/gtkmm_2.10.11.bb
index b8ba69f50e..b8ba69f50e 100644
--- a/packages/gtkmm/gtkmm_2.10.10.bb
+++ b/packages/gtkmm/gtkmm_2.10.11.bb
diff --git a/packages/gnome/kanjipad_svn.bb b/packages/kanjipad/kanjipad_svn.bb
index 1e0d943da7..73c6ddba0f 100644
--- a/packages/gnome/kanjipad_svn.bb
+++ b/packages/kanjipad/kanjipad_svn.bb
@@ -1,19 +1,12 @@
-DESCRIPTION = "KanjiPad is a very simple program for handwriting recognition"
-LICENSE = "GPLv2"
-
-DEPENDS = "gtk+ perl-native"
+require kanjipad.inc
 
+DEPENDS += "perl-native"
 PV = "2.0.0+svn${SRCDATE}"
-
-inherit pkgconfig 
+PR = "r1"
 
 SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
-
 S = "${WORKDIR}/trunk"
 
 do_compile_prepend() {
 	export CFLAGS='${TARGET_CFLAGS}  -DFOR_PILOT_COMPAT -DKP_LIBDIR="${libdir}/kanjipad" -DBINDIR="${bindir}" `pkg-config --cflags gtk+-2.0` `pkg-config --cflags glib-2.0`'
 }
-
-
-
diff --git a/packages/speex/speex_1.1.12+1.2beta1.bb b/packages/speex/speex_1.1.12+1.2beta1.bb
index 5430983e36..51ad2f506e 100644
--- a/packages/speex/speex_1.1.12+1.2beta1.bb
+++ b/packages/speex/speex_1.1.12+1.2beta1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz"
 S = "${WORKDIR}/${PN}-1.2beta1"
@@ -27,8 +27,6 @@ EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point "
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
 	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
 }
 
diff --git a/packages/speex/speex_1.1.12.bb b/packages/speex/speex_1.1.12.bb
index b18151e48d..7417ce4504 100644
--- a/packages/speex/speex_1.1.12.bb
+++ b/packages/speex/speex_1.1.12.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz"
 
@@ -25,8 +25,6 @@ EXTRA_OECONF_append_arm = " --enable-fixed-point "
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
 	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
 }
 
diff --git a/packages/speex/speex_1.1.7.bb b/packages/speex/speex_1.1.7.bb
index 00b51b1c2e..ef818794de 100644
--- a/packages/speex/speex_1.1.7.bb
+++ b/packages/speex/speex_1.1.7.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.speex.org/download/speex-${PV}.tar.gz"
 
@@ -21,8 +21,6 @@ EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point"
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
 	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
 }