diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-10-06 22:13:07 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-10-27 14:25:42 +0100 |
| commit | 03d99ef729178dd99268f185fb45320a29382091 (patch) | |
| tree | 460e5f2216025994fe1db259914487b9484bc4f6 | |
| parent | 5cb328338684d8e5b03913c47475bfcd7acffec4 (diff) | |
glx/dri2: Don't build DRI loader if DRI2 isn't enabled
This partially reverts 501d8e2b.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | glx/Makefile.am | 11 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/glx/Makefile.am b/glx/Makefile.am index fc0b76a4b..699de63b8 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -1,4 +1,8 @@ -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) diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index be43e8f80..d534c789b 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -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) |