[PATCH 2/5] Remove wayland_protocoldir definition

[Thierry Reding]

From: Thierry Reding <treding at nvidia.com>

This is mostly useless and can be confusing in makefiles. The pattern
rules defined in the makefile snippet are generic enough to allow the
protocol sources to reside in subdirectories.

Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 wayland-scanner.m4 | 2 --
 wayland-scanner.mk | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wayland-scanner.m4 b/wayland-scanner.m4
index 4e4222ad4d2f..e7f383a4c74f 100644
--- a/wayland-scanner.m4
+++ b/wayland-scanner.m4
@@ -8,6 +8,4 @@ AC_DEFUN([WAYLAND_SCANNER_RULES], [
 
     wayland_scanner_rules=`$PKG_CONFIG --variable=pkgdatadir wayland-scanner`/wayland-scanner.mk
     AC_SUBST_FILE([wayland_scanner_rules])
-
-    AC_SUBST([wayland_protocoldir], [$1])
 ])
diff --git a/wayland-scanner.mk b/wayland-scanner.mk
index 0a72062baa59..b6e0f444aaa5 100644
--- a/wayland-scanner.mk
+++ b/wayland-scanner.mk
@@ -1,8 +1,8 @@
-%-protocol.c : $(wayland_protocoldir)/%.xml
+%-protocol.c: %.xml
 	$(AM_V_GEN)$(wayland_scanner) code < $< > $@
 
-%-server-protocol.h : $(wayland_protocoldir)/%.xml
+%-server-protocol.h: %.xml
 	$(AM_V_GEN)$(wayland_scanner) server-header < $< > $@
 
-%-client-protocol.h : $(wayland_protocoldir)/%.xml
+%-client-protocol.h: %.xml
 	$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
-- 
1.9.2