diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:03:18 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:31:01 -0700 |
| commit | 9a953e0e9dcb8a8e43cc27ffaef460268fbe1916 (patch) | |
| tree | 25b7a4f67b67b3740a9646df569fe7dc100a62a5 /test | |
| parent | b8a3267c36e2e335b888bd4f2ef2f2c477cdfdce (diff) | |
Move DRI2 from external module to built-in
Instead of keeping a tiny amount of code in an external module, just man
up and build it into the core server.
v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
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 b388888cf..aa018c962 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -18,7 +18,8 @@ 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/dri + -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \ + -I$(top_srcdir)/hw/xfree86/dri2 endif TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) @@ -61,6 +62,10 @@ if DRI libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la endif +if DRI2 +libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la +endif + else nodist_libxservertest_la_SOURCES = \ ddxstubs.c \ |