diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:03:15 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:30:40 -0700 |
| commit | 459c6da0f907ba33d733c7e62a116184ba2f14e5 (patch) | |
| tree | e262554b4119e2ffc272c8ab0f2d7e7ea641cc5e /test | |
| parent | b905d87ba0a9b045ea41bb1ad36a4f9f1170a1b8 (diff) | |
Move DRI1 from external module to built-in
Rather than building the tiny amount of code required for XFree86-DRI as
an external module, build it in if it's enabled at configure time.
v2: Fix test/Makefile.am to only link libdri.la if DRI is set
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
fixup for DRI1 move
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 15c51ed22..b388888cf 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -18,7 +18,7 @@ if XORG INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \ -I$(top_srcdir)/hw/xfree86/ddc \ -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \ - -I$(top_srcdir)/hw/xfree86/ramdac + -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri endif TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) @@ -42,6 +42,7 @@ os_LDADD=$(TEST_LDADD) libxservertest_la_LIBADD = $(XSERVER_LIBS) if XORG + nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c libxservertest_la_LIBADD += \ $(top_builddir)/hw/xfree86/loader/libloader.la \ @@ -56,6 +57,10 @@ libxservertest_la_LIBADD += \ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ @XORG_LIBS@ +if DRI +libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la +endif + else nodist_libxservertest_la_SOURCES = \ ddxstubs.c \ |