[mutter/wayland] Don't generate sources in a subdirectory
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] Don't generate sources in a subdirectory
- Date: Wed, 19 Mar 2014 02:08:03 +0000 (UTC)
commit f0c7b518e610969b93adbf766239e2f01db23bbb
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Mar 18 22:06:20 2014 -0400
Don't generate sources in a subdirectory
This fixes srcdir != builddir issues.
src/Makefile.am | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 9130aec..a64c9a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,12 +37,12 @@ mutter_built_sources = \
$(dbus_xrandr_built_sources) \
mutter-enum-types.h \
mutter-enum-types.c \
- wayland/gtk-shell-protocol.c \
- wayland/gtk-shell-server-protocol.h \
- wayland/xdg-shell-protocol.c \
- wayland/xdg-shell-server-protocol.h \
- wayland/xserver-protocol.c \
- wayland/xserver-server-protocol.h
+ gtk-shell-protocol.c \
+ gtk-shell-server-protocol.h \
+ xdg-shell-protocol.c \
+ xdg-shell-server-protocol.h \
+ xserver-protocol.c \
+ xserver-server-protocol.h
wayland_protocols = \
wayland/protocol/gtk-shell.xml \
@@ -410,7 +410,7 @@ $(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
--c-generate-object-manager \
$(srcdir)/idle-monitor.xml
-wayland/%-protocol.c : $(srcdir)/wayland/protocol/%.xml
+%-protocol.c : $(srcdir)/wayland/protocol/%.xml
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-wayland/%-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
+%-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]