frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Remove obsolete libxservertest.la 

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
This commit is contained in:
Mihail Konev 2017-01-12 13:21:12 +05:00 committed by Adam Jackson
parent 23f6dbc96e
commit 704a867f8f
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
test/Makefile.am
View File

@ -14,7 +14,6 @@ RES_SRCS = hashtabletest.c
AM_CPPFLAGS += -DRES_TESTS AM_CPPFLAGS += -DRES_TESTS
endif endif
endif endif
check_LTLIBRARIES = libxservertest.la
noinst_PROGRAMS = simple-xinit tests noinst_PROGRAMS = simple-xinit tests
@ -65,11 +64,7 @@ tests_LDFLAGS = \
-Wl,-wrap,GrabButton \ -Wl,-wrap,GrabButton \
$() $()
tests_LDADD = libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) tests_LDADD = $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
if SPECIAL_DTRACE_OBJECTS
tests_LDADD += $(OS_LIB) $(DIX_LIB)
endif
tests_SOURCES = \ tests_SOURCES = \
tests-common.c \ tests-common.c \
@ -127,14 +122,16 @@ xi2-tests:
endif !HAVE_LD_WRAP endif !HAVE_LD_WRAP
libxservertest_la_LIBADD = $(XSERVER_LIBS) tests_LDADD += $(XSERVER_LIBS)
if XORG if XORG
nodist_libxservertest_la_SOURCES = sdksyms.c nodist_tests_SOURCES = sdksyms.c
libxservertest_la_LIBADD += \
tests_LDADD += \
$(top_builddir)/hw/xfree86/loader/libloader.la \ $(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/common/libcommon.la \
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
$(top_builddir)/hw/xfree86/parser/libxf86config.la \ $(top_builddir)/hw/xfree86/parser/libxf86config.la \
$(top_builddir)/hw/xfree86/dixmods/libdixmods.la \ $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
$(top_builddir)/hw/xfree86/modes/libxf86modes.la \ $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
@ -152,19 +149,24 @@ sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c
$(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c $(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c
if DRI if DRI
libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la tests_LDADD += $(top_builddir)/hw/xfree86/dri/libdri.la
endif endif
if DRI2 if DRI2
libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la tests_LDADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la
endif endif
else if DRI3
nodist_libxservertest_la_SOURCES = \ tests_LDADD += $(top_builddir)/dri3/libdri3.la
endif
else !XORG
nodist_tests_SOURCES = \
ddxstubs.c \ ddxstubs.c \
$(top_srcdir)/mi/miinitext.c $(top_srcdir)/mi/miinitext.c
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/damageext/libdamageext.la \ $(top_builddir)/damageext/libdamageext.la \
$(top_builddir)/fb/libfb.la \ $(top_builddir)/fb/libfb.la \
$(top_builddir)/fb/libwfb.la \ $(top_builddir)/fb/libwfb.la \
@ -182,44 +184,45 @@ libxservertest_la_LIBADD += \
$(top_builddir)/xkb/libxkbstubs.la $(top_builddir)/xkb/libxkbstubs.la
if COMPOSITE if COMPOSITE
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/composite/libcomposite.la $(top_builddir)/composite/libcomposite.la
endif endif
if DBE if DBE
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/dbe/libdbe.la $(top_builddir)/dbe/libdbe.la
endif endif
if GLX if GLX
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglx.la
endif endif
if RECORD if RECORD
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/record/librecord.la $(top_builddir)/record/librecord.la
endif endif
if DRI3 if DRI3
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/dri3/libdri3.la $(top_builddir)/dri3/libdri3.la
endif endif
if XQUARTZ if XQUARTZ
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/miext/rootless/librootless.la $(top_builddir)/miext/rootless/librootless.la
tests_LDADD += -lXplugin tests_LDADD += -lXplugin
endif endif
if XWIN_MULTIWINDOWEXTWM if XWIN_MULTIWINDOWEXTWM
libxservertest_la_LIBADD += \ tests_LDADD += \
$(top_builddir)/miext/rootless/librootless.la $(top_builddir)/miext/rootless/librootless.la
endif endif
endif
libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD) endif !XORG
endif
tests_DEPENDENCIES = $(tests_LDADD)
endif ENABLE_UNIT_TESTS
EXTRA_DIST = \ EXTRA_DIST = \
scripts/xvfb-piglit.sh \ scripts/xvfb-piglit.sh \