mesa: add no error support to teximage()

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

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index c0f79475361e9238cf68430c95cb0024de7999cd..340b335ca9b948918fe86b56e5bc36b94e331003 100644 (file)
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -23,48 +23,45 @@ include Makefile.sources
 
 EXTRA_DIST = SConscript
 
-noinst_LTLIBRARIES = libloader.la libloader_dri3_helper.la
+noinst_LTLIBRARIES = libloader.la
 
-libloader_la_CPPFLAGS = \
+AM_CPPFLAGS = \
        $(DEFINES) \
        -I$(top_srcdir)/include \
        -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/drivers/dri/common/ \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/mapi/ \
        -DUSE_DRICONF
 
- libloader_la_LIBADD += \
+libloader_la_LIBADD += \
        $(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
 
 endif
 
 if HAVE_LIBDRM
-libloader_la_CPPFLAGS += \
-       $(LIBDRM_CFLAGS)
-
 libloader_la_LIBADD += \
        $(LIBDRM_LIBS)
 endif
 
+if HAVE_PLATFORM_X11
 if HAVE_DRI3
-libloader_dri3_helper_la_CPPFLAGS = \
-       $(DEFINES) \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src \
-       $(LIBDRM_CFLAGS)
+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
+endif