diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /xorg-server/test/Makefile.am | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/test/Makefile.am')
| -rw-r--r-- | xorg-server/test/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index 48393d39a..ba8932c5d 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -1,6 +1,6 @@ if ENABLE_UNIT_TESTS SUBDIRS= . -noinst_PROGRAMS = list string +noinst_PROGRAMS = list string touch 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 @@ -35,6 +35,7 @@ list_LDADD=$(TEST_LDADD) misc_LDADD=$(TEST_LDADD) fixes_LDADD=$(TEST_LDADD) xfree86_LDADD=$(TEST_LDADD) +touch_LDADD=$(TEST_LDADD) libxservertest_la_LIBADD = $(XSERVER_LIBS) if XORG |