[PATCH 4/5] Dogfood wayland-scanner makefile snippet

Thierry Reding thierry.reding at gmail.com
Mon May 19 08:12:42 PDT 2014


From: Thierry Reding <treding at nvidia.com>

To reduce code duplication and make sure it receives at minimum amount
of testing, use the wayland-scanner makefile snippet in this package.

Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 Makefile.am | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 028d0d4837b5..fdec789cbaed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,14 +67,7 @@ wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
 $(BUILT_SOURCES) : wayland-scanner
 pkgconfig_DATA += src/wayland-scanner.pc
 
-protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(WAYLAND_SCANNER) code < $< > $@
-
-protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(WAYLAND_SCANNER) server-header < $< > $@
-
-protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(WAYLAND_SCANNER) client-header < $< > $@
+include wayland-scanner.mk
 
 BUILT_SOURCES =					\
 	$(nodist_libwayland_server_la_SOURCES)	\
-- 
1.9.2



More information about the wayland-devel mailing list