summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2012-07-13 11:06:32 -0400
committerKristian Høgsberg <[email protected]>2012-07-13 11:20:17 -0400
commit426a23af147720ae3b89995ffee792a29e8ae2db (patch)
tree97e355cf0e13c53ab72ee3e0e861b7ab8465cfb9 /src
parentb3ba0a7afa6311e12852fb1373452e480f89ea96 (diff)
wayland: Stop trying to use make rules from aclocal, just copy and paste
Defeated by autotool, copy and paste to the rescue. https://bugs.freedesktop.org/show_bug.cgi?id=51997 https://bugs.freedesktop.org/show_bug.cgi?id=51531 Signed-off-by: Kristian Høgsberg <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/egl/wayland/wayland-drm/Makefile.am9
-rw-r--r--src/egl/wayland/wayland-drm/wayland-drm.xml (renamed from src/egl/wayland/wayland-drm/protocol/wayland-drm.xml)0
2 files changed, 8 insertions, 1 deletions
diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am
index cf15edae83d..4b2aeb32f2d 100644
--- a/src/egl/wayland/wayland-drm/Makefile.am
+++ b/src/egl/wayland/wayland-drm/Makefile.am
@@ -12,4 +12,11 @@ BUILT_SOURCES = wayland-drm-protocol.c \
wayland-drm-server-protocol.h
CLEANFILES = $(BUILT_SOURCES)
-@wayland_scanner_rules@
+%-protocol.c : %.xml
+ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+
+%-server-protocol.h : %.xml
+ $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
+
+%-client-protocol.h : %.xml
+ $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
diff --git a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml b/src/egl/wayland/wayland-drm/wayland-drm.xml
index 265d4f892af..265d4f892af 100644
--- a/src/egl/wayland/wayland-drm/protocol/wayland-drm.xml
+++ b/src/egl/wayland/wayland-drm/wayland-drm.xml