dri3: For 1.2, use root window instead of pixmap drawable

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

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 36ddba82bd39daf57312ce86779615d8e8ae34cc..76252564281957edb9c7f1438e7bd91925091983 100644 (file)
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -21,44 +21,37 @@
 
 include Makefile.sources
 
-EXTRA_DIST = SConscript
+EXTRA_DIST = SConscript meson.build
 
 noinst_LTLIBRARIES = libloader.la
 
-libloader_la_CPPFLAGS = \
+AM_CPPFLAGS = \
+       -I$(top_builddir)/src/util/ \
+       -DUSE_DRICONF \
        $(DEFINES) \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/include/drm-uapi \
        -I$(top_srcdir)/src \
        $(VISIBILITY_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/ \
-       -I$(top_srcdir)/src/mapi/ \
-       -DUSE_DRICONF \
-       $(EXPAT_CFLAGS)
-
-libloader_la_SOURCES += \
-       $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
-
+if HAVE_LIBDRM
 libloader_la_LIBADD += \
-       -lm \
-       $(EXPAT_LIBS)
+       $(LIBDRM_LIBS)
 endif
 
-if !HAVE_LIBDRM
-libloader_la_CPPFLAGS += \
-       -D__NOT_HAVE_DRM_H
-else
-libloader_la_CPPFLAGS += \
-       $(LIBDRM_CFLAGS)
+if HAVE_PLATFORM_X11
+if HAVE_DRI3
+noinst_LTLIBRARIES += libloader_dri3_helper.la
 
-libloader_la_LIBADD += \
-       $(LIBDRM_LIBS)
+libloader_dri3_helper_la_SOURCES = \
+       loader_dri3_helper.c \
+       loader_dri3_helper.h
+libloader_dri3_helper_la_LIBADD = $(XCB_DRI3_LIBS)
+endif
 endif