summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2014-09-17 07:41:27 +0200
committerJulien Cristau <jcristau@debian.org>2014-09-21 10:55:39 +0200
commitb501462e5da776e28a8e16d8573a6d17d7ebe15e (patch)
treebdfff82588ffeecb1db5d575e961f837215f374c
parent3ce47886c58b0640697f243a5df7060109c8346f (diff)
xwayland: always include drm.xml in tarballs
Move drm.xml out of the automake conditional so make dist includes it even if glamor-egl is disabled. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83960 Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit af40913797e6595fb5466c2ff3110e9526a37b9f)
-rw-r--r--hw/xwayland/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index dc16b8bbe..4e0e1bb00 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -39,8 +39,6 @@ nodist_Xwayland_SOURCES = \
CLEANFILES = $(nodist_Xwayland_SOURCES)
-EXTRA_DIST = drm.xml
-
xwayland-glamor.c : $(nodist_Xwayland_SOURCES)
glamor_lib = $(top_builddir)/glamor/libglamor.la
@@ -48,6 +46,8 @@ glamor_lib = $(top_builddir)/glamor/libglamor.la
Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
endif
+EXTRA_DIST = drm.xml
+
relink:
$(AM_V_at)rm -f Xwayland$(EXEEXT) && $(MAKE) Xwayland$(EXEEXT)