diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
| commit | 3015123fd2904d907896b1aefbe32c267baa2dc2 (patch) | |
| tree | 3adc12a65779305c5fb676be577667ff7e33c389 /xorg-server/test | |
| parent | 0d9293f57738117231d77df831b6569d4f0739f2 (diff) | |
| parent | 0b9b391c5a7acb31e5d8061169649043a38d6d0e (diff) | |
| download | vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.gz vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.bz2 vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/test')
| -rw-r--r-- | xorg-server/test/Makefile.am | 4 | ||||
| -rw-r--r-- | xorg-server/test/xi2/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index ea886a961..bf091d41d 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -2,10 +2,10 @@ if ENABLE_UNIT_TESTS if HAVE_GLIB
if HAVE_LD_WRAP
SUBDIRS= . xi2
-check_PROGRAMS = xkb input xtest list
+noinst_PROGRAMS = xkb input xtest list
check_LTLIBRARIES = libxservertest.la
-TESTS=$(check_PROGRAMS)
+TESTS=$(noinst_PROGRAMS)
AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
INCLUDES = @XORG_INCS@
diff --git a/xorg-server/test/xi2/Makefile.am b/xorg-server/test/xi2/Makefile.am index b7948b151..c2d0b6e7c 100644 --- a/xorg-server/test/xi2/Makefile.am +++ b/xorg-server/test/xi2/Makefile.am @@ -1,7 +1,7 @@ if ENABLE_UNIT_TESTS
if HAVE_GLIB
if HAVE_LD_WRAP
-check_PROGRAMS = \
+noinst_PROGRAMS = \
protocol-xiqueryversion \
protocol-xiquerydevice \
protocol-xiselectevents \
@@ -12,7 +12,7 @@ check_PROGRAMS = \ protocol-xiwarppointer \
protocol-eventconvert
-TESTS=$(check_PROGRAMS)
+TESTS=$(noinst_PROGRAMS)
AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
INCLUDES = @XORG_INCS@
|