From af40913797e6595fb5466c2ff3110e9526a37b9f Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 17 Sep 2014 07:41:27 +0200 Subject: [PATCH] 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 Reviewed-by: Eric Anholt Signed-off-by: Keith Packard --- hw/xwayland/Makefile.am | 4 ++-- 1 file 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)