diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
| commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
| tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /xorg-server/test/Makefile.am | |
| parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
| parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
| download | vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2 vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xcb-proto mesa xserver git update 15 nov 2013
Conflicts:
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/test/Makefile.am')
| -rw-r--r-- | xorg-server/test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index e59c412ee..2852bb3e0 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -1,11 +1,11 @@ if ENABLE_UNIT_TESTS SUBDIRS= . -noinst_PROGRAMS = list string touch +noinst_PROGRAMS = list string if XORG # Tests that require at least some DDX functions in order to fully link # For now, requires xf86 ddx, could be adjusted to use another SUBDIRS += xi2 -noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging +noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch endif check_LTLIBRARIES = libxservertest.la |