Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 381771
Collapse All | Expand All

(-)a/test/Makefile.am (-7 / +21 lines)
Lines 1-21 Link Here
1
if ENABLE_UNIT_TESTS
1
if ENABLE_UNIT_TESTS
2
if HAVE_LD_WRAP
2
if HAVE_LD_WRAP
3
SUBDIRS= . xi2
3
SUBDIRS= .
4
noinst_PROGRAMS = xkb input xtest list misc fixes
4
noinst_PROGRAMS = list
5
if XORG
6
# Tests that require at least some DDX functions in order to fully link
7
# For now, requires xf86 ddx, could be adjusted to use another
8
SUBDIRS += xi2
9
noinst_PROGRAMS += xkb input xtest misc fixes
10
endif
5
check_LTLIBRARIES = libxservertest.la
11
check_LTLIBRARIES = libxservertest.la
6
12
7
TESTS=$(noinst_PROGRAMS)
13
TESTS=$(noinst_PROGRAMS)
8
14
9
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
15
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
10
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
16
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
11
	-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
17
if XORG
18
INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
19
	-I$(top_srcdir)/hw/xfree86/ddc \
12
	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
20
	-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
13
	-I$(top_srcdir)/hw/xfree86/ramdac
21
	-I$(top_srcdir)/hw/xfree86/ramdac
22
endif
14
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
23
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
15
24
25
if XORG
16
if SPECIAL_DTRACE_OBJECTS
26
if SPECIAL_DTRACE_OBJECTS
17
TEST_LDADD += $(OS_LIB) $(DIX_LIB)
27
TEST_LDADD += $(OS_LIB) $(DIX_LIB)
18
endif
28
endif
29
endif
19
30
20
xkb_LDADD=$(TEST_LDADD)
31
xkb_LDADD=$(TEST_LDADD)
21
input_LDADD=$(TEST_LDADD)
32
input_LDADD=$(TEST_LDADD)
Lines 24-32 Link Here
24
misc_LDADD=$(TEST_LDADD)
35
misc_LDADD=$(TEST_LDADD)
25
fixes_LDADD=$(TEST_LDADD)
36
fixes_LDADD=$(TEST_LDADD)
26
37
38
libxservertest_la_LIBADD = $(XSERVER_LIBS)
39
if XORG
27
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
40
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
28
libxservertest_la_LIBADD = \
41
libxservertest_la_LIBADD += \
29
            $(XSERVER_LIBS) \
30
            $(top_builddir)/hw/xfree86/loader/libloader.la \
42
            $(top_builddir)/hw/xfree86/loader/libloader.la \
31
            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
43
            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
32
            $(top_builddir)/hw/xfree86/common/libcommon.la \
44
            $(top_builddir)/hw/xfree86/common/libcommon.la \
Lines 36-42 Link Here
36
            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
48
            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
37
            $(top_builddir)/hw/xfree86/ddc/libddc.la \
49
            $(top_builddir)/hw/xfree86/ddc/libddc.la \
38
            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
50
            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
39
            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
51
            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
52
endif
53
libxservertest_la_LIBADD += \
40
            $(top_builddir)/mi/libmi.la \
54
            $(top_builddir)/mi/libmi.la \
41
            $(top_builddir)/os/libos.la \
55
            $(top_builddir)/os/libos.la \
42
            @XORG_LIBS@
56
            @XORG_LIBS@

Return to bug 381771