xserver: Branch 'master' - 2 commits

[Keith Packard]

 Makefile.am        |    2 +-
 config/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72237e0908527e9261b91c7db99f32d895947d8d
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Feb 13 15:25:56 2014 -0800

    DIST_SUBDIRS needs to include glamor, even if it isn't built
    
    Otherwise, glamor won't get cleaned for 'make distclean'
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Makefile.am b/Makefile.am
index 7c93d8d..f0fa2d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,7 @@ DIST_SUBDIRS = \
 	composite \
 	glx \
 	exa \
-	$(GLAMOR_DIR) \
+	glamor \
 	config \
 	dri3 \
 	present \
commit 783991b1beeb71d91068601789d179d10eb8b544
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Feb 13 17:36:34 2014 -0500

    config: fails to create tarball as xorg-server.conf file removed
    
    Just need to update EXTRA_DIST
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/config/Makefile.am b/config/Makefile.am
index e0f0a8d..c6350be 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -38,4 +38,4 @@ endif # !CONFIG_HAL
 
 endif # !CONFIG_UDEV
 
-EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf non-seat0.conf.multi-seat fdi2iclass.py 10-quirks.conf
+EXTRA_DIST = x11-input.fdi 10-evdev.conf non-seat0.conf.multi-seat fdi2iclass.py 10-quirks.conf