xserver: Branch 'master'

[Keith Packard]

 test/Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 23229c7ce5970516b97a1cc12e65257ff65ab9a7
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Oct 13 16:28:14 2010 -0700

    test: Fix make distcheck when not building unit tests
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index 7c44671..456221e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -33,10 +33,9 @@ libxservertest_la_LIBADD = \
             $(top_builddir)/mi/libmi.la \
             $(top_builddir)/os/libos.la \
             @XORG_LIBS@
+endif
 
 CLEANFILES=libxservertest.c
 
 libxservertest.c:
 	touch $@
-
-endif