diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-02-01 00:33:04 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-02-01 00:33:04 -0800 |
| commit | 24be8379e018d40a0f5750db9c5089eea40b1575 (patch) | |
| tree | dec233abc51b0ec4861e85bc20194f4b797a48dd | |
| parent | 58a2238f11be7858c41058afb5c6ef4ba90f0614 (diff) | |
build: Drop wayland-scanner.mknon-recursive-build
We now only have one Makefile.am so we don't need to keep these rules
in a separate file for sharing.
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | wayland-scanner.mk | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index a00debc4..b14fbf68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -945,4 +945,12 @@ CLEANFILES += $(man_MANS) wayland_protocoldir = $(top_srcdir)/protocol -include $(top_srcdir)/wayland-scanner.mk + +%-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 < $< > $@ diff --git a/wayland-scanner.mk b/wayland-scanner.mk deleted file mode 100644 index 0a72062b..00000000 --- a/wayland-scanner.mk +++ /dev/null @@ -1,8 +0,0 @@ -%-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 < $< > $@ |