automake: loader: honour the XCB_DRI3 cflags

[mesa.git] / src / loader / Makefile.am

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 3d32279ea26da64e1d809cbc45fa29d86e858150..5daa42edd4134d06746f02cb3d0ef6d43cf74583 100644 (file)
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -23,43 +23,42 @@ include Makefile.sources
 
 EXTRA_DIST = SConscript
 
-noinst_LTLIBRARIES = libloader.la
+noinst_LTLIBRARIES = libloader.la libloader_dri3_helper.la
 
-libloader_la_CPPFLAGS = \
+AM_CPPFLAGS = \
        $(DEFINES) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS) \
+       $(XCB_DRI3_CFLAGS) \
+       $(LIBDRM_CFLAGS) \
        $(LIBUDEV_CFLAGS)
 
 libloader_la_SOURCES = $(LOADER_C_FILES)
 libloader_la_LIBADD =
 
 if HAVE_DRICOMMON
-libloader_la_CPPFLAGS += \
+libloader_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
        -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
        -I$(top_builddir)/src/mesa/drivers/dri/common/ \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/mapi/ \
-       -DUSE_DRICONF \
-       $(EXPAT_CFLAGS)
+       -DUSE_DRICONF
 
-libloader_la_SOURCES += \
-       $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
+ libloader_la_LIBADD += \
+       $(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
 
-libloader_la_LIBADD += \
-       -lm \
-       $(EXPAT_LIBS)
 endif
 
-if !HAVE_LIBDRM
-libloader_la_CPPFLAGS += \
-       -D__NOT_HAVE_DRM_H
-else
-libloader_la_CPPFLAGS += \
-       $(LIBDRM_CFLAGS)
-
+if HAVE_LIBDRM
 libloader_la_LIBADD += \
        $(LIBDRM_LIBS)
 endif
+
+if HAVE_DRI3
+libloader_dri3_helper_la_SOURCES = \
+       loader_dri3_helper.c \
+       loader_dri3_helper.h
+libloader_dri3_helper_la_LIBADD = $(XCB_DRI3_LIBS)
+endif