X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2FMakefile.am;h=fbefdaee5dacba970c46cba352a74ea27154b58c;hb=d53b1b621587bbdbc90f12eadf504888ab023b58;hp=ba2e65c371866a59be8d13acaf0f34681454033d;hpb=b421fec95804a9d33cc8d40d313ad7bd629f3178;p=mesa.git

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index ba2e65c3718..fbefdaee5da 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -21,11 +21,14 @@
 
 include Makefile.sources
 
-EXTRA_DIST = SConscript
+EXTRA_DIST = SConscript meson.build
 
 noinst_LTLIBRARIES = libloader.la
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/src/util/ \
+	-DUSE_DRICONF \
+	-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
 	$(DEFINES) \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src \
@@ -37,24 +40,12 @@ 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/ \
-	-I$(top_srcdir)/src/mapi/ \
-	-DUSE_DRICONF
-
-libloader_la_LIBADD += \
-	$(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
-
-endif
-
 if HAVE_LIBDRM
 libloader_la_LIBADD += \
 	$(LIBDRM_LIBS)
 endif
 
+if HAVE_PLATFORM_X11
 if HAVE_DRI3
 noinst_LTLIBRARIES += libloader_dri3_helper.la
 
@@ -63,3 +54,4 @@ libloader_dri3_helper_la_SOURCES = \
 	loader_dri3_helper.h
 libloader_dri3_helper_la_LIBADD = $(XCB_DRI3_LIBS)
 endif
+endif