mx: move to autotools instead of autotools-brokensep

Now that MX inherits gtk-doc we can also remove fix-build-dir.patch.

(From OE-Core rev: e8d4e80e5cc98e2e0470c85f3c08574d30d466c1)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2016-04-22 15:16:11 +01:00 committed by Richard Purdie
parent c4ee663afb
commit 860dfafeed
3 changed files with 1 additions and 48 deletions

View File

@ -1,46 +0,0 @@
Fix build for S != B
This patch is specific to version 1.4.x
Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
--
Index: git/docs/reference/libmx-gtk/Makefile.am
===================================================================
--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
@@ -1,3 +1,6 @@
+EXTRA_DIST=
+CLEANFILES=
+
## Process this file with automake to produce Makefile.in
# We require automake 1.6 at least.
@@ -77,7 +80,7 @@
GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
+include $(top_builddir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += version.xml.in
Index: git/docs/reference/libmx/Makefile.am
===================================================================
--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
@@ -1,3 +1,6 @@
+EXTRA_DIST=
+CLEANFILES=
+
## Process this file with automake to produce Makefile.in
# We require automake 1.6 at least.
@@ -106,7 +109,7 @@
GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
+include $(top_builddir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += version.xml.in

View File

@ -8,7 +8,6 @@ PV = "1.4.7+git${SRCPV}"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)"
SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
file://fix-build-dir.patch \
file://fix-test-includes.patch \
"
S = "${WORKDIR}/git"

View File

@ -1,7 +1,7 @@
SUMMARY = "Clutter based UI widget library"
LICENSE = "LGPLv2.1"
inherit clutter autotools-brokensep distro_features_check gobject-introspection gtk-doc
inherit clutter autotools distro_features_check gobject-introspection gtk-doc
# depends on clutter-1.0 which depends on cogl-1.0
REQUIRED_DISTRO_FEATURES = "opengl"