diff options
| author | Rob Bradford <rob@linux.intel.com> | 2013-09-03 13:58:58 +0100 |
|---|---|---|
| committer | Rob Bradford <rob@linux.intel.com> | 2013-09-20 16:36:47 +0100 |
| commit | 5569b1538eb756a827d3178e8a1cedcd2000e93a (patch) | |
| tree | 006927a0ac156332fa33256b24084f75d1cb63b9 | |
| parent | 9610e895e0049473b3ed30f86520dc3313cc4afb (diff) | |
| download | clutter-gtk-5569b1538eb756a827d3178e8a1cedcd2000e93a.tar.gz | |
wayland: Generate client side binding for the subsurface protocol
This adds a non-optional dependency on Clutter Wayland and GTK Wayland
as well as the Wayland client library itself.
v1: Integrate fix from Bastien to use $(builddir)
https://bugzilla.gnome.org/show_bug.cgi?id=695737
| -rw-r--r-- | clutter-gtk/Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am index 9a35919..4e132ab 100644 --- a/clutter-gtk/Makefile.am +++ b/clutter-gtk/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent NULL = -CLEANFILES = +CLEANFILES = subsurface-client-protocol.h subsurface-protocol.c DISTCLEANFILES = EXTRA_DIST = @@ -21,7 +21,8 @@ AM_CFLAGS = $(MAINTAINER_CFLAGS) $(CLUTTER_GTK_DEPS_CFLAGS) lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la -source_c = \ +source_c = $(builddir)/subsurface-protocol.c $(builddir)/subsurface-client-protocol.h +source_c += \ $(srcdir)/gtk-clutter-actor.c \ $(srcdir)/gtk-clutter-embed.c \ $(srcdir)/gtk-clutter-offscreen.c \ @@ -61,6 +62,9 @@ cluttergtkheaders_HEADERS = \ EXTRA_DIST += gtk-clutter-version.h.in + +@wayland_scanner_rules@ + -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = diff --git a/configure.ac b/configure.ac index f45802c..0506d78 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,7 @@ m4_define([gtk_req_version], [3.6.0]) PKG_CHECK_MODULES([CLUTTER_GTK_DEPS], [clutter-1.0 >= clutter_req_version gtk+-3.0 >= gtk_req_version]) AC_SUBST([CLUTTER_GTK_DEPS_CFLAGS]) AC_SUBST([CLUTTER_GTK_DEPS_LIBS]) +PKG_CHECK_MODULES([WAYLAND_DEPS], [wayland-client gtk+-wayland-3.0 clutter-wayland-1.0]) m4_define([deprecated_default], [m4_if(m4_eval(clutter_gtk_minor % 2), [1], @@ -202,6 +203,8 @@ GTK_DOC_CHECK([1.14], [--flavour=no-tmpl]) GOBJECT_INTROSPECTION_CHECK([0.9.12]) +WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) + AC_CONFIG_FILES([ Makefile build/Makefile |