diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | clients/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/xwayland/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | wayland-scanner.mk | 8 |
7 files changed, 19 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 88428deb..e9ecc380 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,4 +6,4 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install -EXTRA_DIST = weston.ini +EXTRA_DIST = weston.ini wayland-scanner.mk diff --git a/clients/Makefile.am b/clients/Makefile.am index 1f7d9dc8..87b3a0ea 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -254,7 +254,8 @@ endif endif -@wayland_scanner_rules@ +wayland_protocoldir = $(top_srcdir)/protocol +include $(top_srcdir)/wayland-scanner.mk if HAVE_POPPLER poppler_programs = weston-view diff --git a/configure.ac b/configure.ac index fab0b48b..e305ab05 100644 --- a/configure.ac +++ b/configure.ac @@ -423,9 +423,8 @@ if test "x$have_lcms" = xyes; then fi AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) -m4_ifndef([WAYLAND_SCANNER_RULES], - [m4_fatal([WAYLAND_SCANNER_RULES not found. Point ACLOCAL to wayland-scanner.m4 before running autoconf/autogen])]) -WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) +AC_PATH_PROG([wayland_scanner], [wayland-scanner], + [AC_MSG_ERROR("wayland-scanner is needed to compile weston")]) AC_CONFIG_FILES([Makefile shared/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 929de314..80c4b874 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -314,4 +314,5 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -@wayland_scanner_rules@ +wayland_protocoldir = $(top_srcdir)/protocol +include $(top_srcdir)/wayland-scanner.mk diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am index 82ad53df..d4a7988a 100644 --- a/src/xwayland/Makefile.am +++ b/src/xwayland/Makefile.am @@ -35,4 +35,5 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -@wayland_scanner_rules@ +wayland_protocoldir = $(top_srcdir)/protocol +include $(top_srcdir)/wayland-scanner.mk diff --git a/tests/Makefile.am b/tests/Makefile.am index d4aa9098..82bf630d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -139,4 +139,5 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -@wayland_scanner_rules@ +wayland_protocoldir = $(top_srcdir)/protocol +include $(top_srcdir)/wayland-scanner.mk diff --git a/wayland-scanner.mk b/wayland-scanner.mk new file mode 100644 index 00000000..0a72062b --- /dev/null +++ b/wayland-scanner.mk @@ -0,0 +1,8 @@ +%-protocol.c : $(wayland_protocoldir)/%.xml + $(AM_V_GEN)$(wayland_scanner) code < $< > $@ + +%-server-protocol.h : $(wayland_protocoldir)/%.xml + $(AM_V_GEN)$(wayland_scanner) server-header < $< > $@ + +%-client-protocol.h : $(wayland_protocoldir)/%.xml + $(AM_V_GEN)$(wayland_scanner) client-header < $< > $@ |