diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
| commit | 579eaaac4679bf78b1d987a56f4a24e7cf616368 (patch) | |
| tree | 53977d03cd6af212b3605ae3906d5e499e6d960e /xorg-server/test | |
| parent | bc5113fca69c8b05861a011426a4611985495cfe (diff) | |
| parent | d621ea397a3d181e7a0bf07d72bd21e116fccdb8 (diff) | |
| download | vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.gz vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.bz2 vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/test')
| -rw-r--r-- | xorg-server/test/Makefile.am | 83 |
1 files changed, 41 insertions, 42 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index 7c4467161..8bb3a0688 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -1,42 +1,41 @@ -if UNITTESTS -SUBDIRS= . xi2 -check_PROGRAMS = xkb input xtest -check_LTLIBRARIES = libxservertest.la - -TESTS=$(check_PROGRAMS) - -AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@ -INCLUDES = @XORG_INCS@ -TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS) - -if SPECIAL_DTRACE_OBJECTS -TEST_LDADD += $(OS_LIB) $(DIX_LIB) -endif - -xkb_LDADD=$(TEST_LDADD) -input_LDADD=$(TEST_LDADD) -xtest_LDADD=$(TEST_LDADD) - -libxservertest_la_LIBADD = \ - $(XSERVER_LIBS) \ - $(top_builddir)/hw/xfree86/loader/libloader.la \ - $(top_builddir)/hw/xfree86/os-support/libxorgos.la \ - $(top_builddir)/hw/xfree86/common/libcommon.la \ - $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \ - $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \ - $(top_builddir)/hw/xfree86/modes/libxf86modes.la \ - $(top_builddir)/hw/xfree86/ramdac/libramdac.la \ - $(top_builddir)/hw/xfree86/ddc/libddc.la \ - $(top_builddir)/hw/xfree86/i2c/libi2c.la \ - $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ - $(top_builddir)/hw/xfree86/libxorg.la \ - $(top_builddir)/mi/libmi.la \ - $(top_builddir)/os/libos.la \ - @XORG_LIBS@ - -CLEANFILES=libxservertest.c - -libxservertest.c: - touch $@ - -endif +if UNITTESTS
+SUBDIRS= . xi2
+check_PROGRAMS = xkb input xtest
+check_LTLIBRARIES = libxservertest.la
+
+TESTS=$(check_PROGRAMS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@
+TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
+
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
+xkb_LDADD=$(TEST_LDADD)
+input_LDADD=$(TEST_LDADD)
+xtest_LDADD=$(TEST_LDADD)
+
+libxservertest_la_LIBADD = \
+ $(XSERVER_LIBS) \
+ $(top_builddir)/hw/xfree86/loader/libloader.la \
+ $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+ $(top_builddir)/hw/xfree86/common/libcommon.la \
+ $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+ $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
+ $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
+ $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+ $(top_builddir)/hw/xfree86/ddc/libddc.la \
+ $(top_builddir)/hw/xfree86/i2c/libi2c.la \
+ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
+ $(top_builddir)/hw/xfree86/libxorg.la \
+ $(top_builddir)/mi/libmi.la \
+ $(top_builddir)/os/libos.la \
+ @XORG_LIBS@
+endif
+
+CLEANFILES=libxservertest.c
+
+libxservertest.c:
+ touch $@
|