X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2FMakefile.am;h=eff85af42da5700548fe9f8a3ade28fb791a153d;hb=b98542588cd27ebcd403ea8130ef04b440661cb0;hp=3d32279ea26da64e1d809cbc45fa29d86e858150;hpb=80c5bd7ef0319d14cd0362a763d9d15e9ba2c946;p=mesa.git

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