hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-11 23:43:06 +00:00
Code Issues Projects Releases Wiki Activity

test: Fix linking issues when building unit tests without the Xorg DDX

Browse source 
This allows unit tests to build and run successfully on darwin when
only the Xvfb or XQuartz DDX is built.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Jeremy Huddleston 2012-01-11 12:17:06 -08:00
commit cd89482088
2 changed files with 144 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

59
test/Makefile.am
View file

@ -50,11 +50,60 @@ libxservertest_la_LIBADD += \
$(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
endif
libxservertest_la_LIBADD += \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la \
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
@XORG_LIBS@
else
nodist_libxservertest_la_SOURCES = \
ddxstubs.c \
$(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/Xext/dpmsstubs.c \
$(top_srcdir)/Xi/stubs.c
libxservertest_la_LIBADD += \
$(top_builddir)/damageext/libdamageext.la \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/fb/libwfb.la \
$(top_builddir)/miext/damage/libdamage.la \
$(top_builddir)/miext/sync/libsync.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/Xext/libXext.la \
$(top_builddir)/Xi/libXi.la \
$(top_builddir)/xfixes/libxfixes.la \
$(top_builddir)/xkb/libxkb.la \
$(top_builddir)/xkb/libxkbstubs.la
if COMPOSITE
libxservertest_la_LIBADD += \
$(top_builddir)/composite/libcomposite.la
endif
if DBE
libxservertest_la_LIBADD += \
$(top_builddir)/dbe/libdbe.la
endif
if GLX
libxservertest_la_LIBADD += \
$(top_builddir)/glx/libglx.la
endif
if RECORD
libxservertest_la_LIBADD += \
$(top_builddir)/record/librecord.la
endif
if XQUARTZ
libxservertest_la_LIBADD += \
$(top_builddir)/miext/rootless/librootless.la
TEST_LDADD += -lXplugin
endif
if XWIN_MULTIWINDOWEXTWM
libxservertest_la_LIBADD += \
$(top_builddir)/miext/rootless/librootless.la
endif
endif
libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD)
endif