diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
| commit | 4a991716ac65d28a68f9943d54c4b74ad0b58f65 (patch) | |
| tree | c037c3fe64bb15ea67dbf03a96783a8b04085371 /xserver/test/Makefile.am | |
| parent | 549cb8bcb6bdd3a7d44f3b9fdc003df777b2b0d2 (diff) | |
Update to xserver 1.18.3. Tested by shadchin@ and naddy@.
Note that indirect GLX is now disbled by default.
Diffstat (limited to 'xserver/test/Makefile.am')
| -rw-r--r-- | xserver/test/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xserver/test/Makefile.am b/xserver/test/Makefile.am index 82578d977..9f13e269d 100644 --- a/xserver/test/Makefile.am +++ b/xserver/test/Makefile.am @@ -16,7 +16,7 @@ TESTS=$(noinst_PROGRAMS) TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ -AM_CPPFLAGS = $(XORG_INCS) -I$(top_srcdir)/miext/cw +AM_CPPFLAGS = $(XORG_INCS) if XORG AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \ -I$(top_srcdir)/hw/xfree86/ddc \ @@ -49,13 +49,14 @@ libxservertest_la_LIBADD += \ $(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/parser/libxf86config.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)/Xext/libXvidmode.la \ @XORG_LIBS@ BUILT_SOURCES = sdksyms.c @@ -91,6 +92,7 @@ libxservertest_la_LIBADD += \ $(top_builddir)/render/librender.la \ $(top_builddir)/Xext/libXext.la \ $(top_builddir)/Xext/libXextdpmsstubs.la \ + $(top_builddir)/Xext/libXvidmode.la \ $(top_builddir)/Xi/libXi.la \ $(top_builddir)/Xi/libXistubs.la \ $(top_builddir)/xfixes/libxfixes.la \ |