[PATCH weston 6/7] Makefile: handle also stable wayland-protocols

Pekka Paalanen ppaalanen at gmail.com
Mon Feb 22 13:34:45 UTC 2016


From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Fix the protostability function to handle stable protocol files
correctly. Stable protocol XML file names do not have 'stable' in their
name, nor do we want to write that in the prerequisite lists in the
Makefile.

Function 'protoname' does not need fixing, because for stable protocol
prerequisites, the sed pattern will not match, and it passes stem
through as is, which is correct.

Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index e365396..505d40a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1423,7 +1423,7 @@ doc: $(DOXYGEN_INDICES)
 .SECONDEXPANSION:
 
 define protostability
-$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/')
+$(if $(findstring unstable,$1),unstable,stable)
 endef
 
 define protoname
-- 
2.4.10



More information about the wayland-devel mailing list