Commit 356db234 authored by Keith Packard's avatar Keith Packard

Merge remote-tracking branch 'jturney/master'

parents 9ed5b263 03d99ef7
noinst_LTLIBRARIES = libglx.la libglxdri.la
if DRI2
GLXDRI_LIBRARY = libglxdri.la
endif
noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
AM_CFLAGS = \
@DIX_CFLAGS@ \
......@@ -16,11 +20,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/dri \
-I$(top_srcdir)/hw/xfree86/dri2 \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/present
AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/dri2
indirect_sources = \
indirect_dispatch.c \
indirect_dispatch.h \
......@@ -33,7 +36,9 @@ indirect_sources = \
indirect_table.c
libglxdri_la_SOURCES =
if DRI2
libglxdri_la_SOURCES += glxdri2.c
endif
libglxdri_la_LIBADD = $(DLOPEN_LIBS)
......
......@@ -29,10 +29,12 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS)
if DRI2
libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la
if NO_UNDEFINED
libglx_la_LIBADD += $(LIBDRM_LIBS) $(PIXMAN_LIBS)
endif
endif
libglx_la_SOURCES = glxmodule.c
libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment