import Mesa 11.0.6

1 files changed, 6 insertions, 29 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am b/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am
index 718e5afad..8c8379965 100644
--- a/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am
+++ b/lib/mesa/src/gallium/auxiliary/pipe-loader/Makefile.am
@@ -5,47 +5,24 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
 	-I$(top_srcdir)/src/loader \
 	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_builddir)/src/util \
 	$(GALLIUM_PIPE_LOADER_DEFINES) \
 	$(GALLIUM_CFLAGS) \
 	$(VISIBILITY_CFLAGS)
 
-noinst_LTLIBRARIES = \
-	libpipe_loader_static.la \
-	libpipe_loader_dynamic.la
+noinst_LTLIBRARIES = libpipe_loader.la
 
-libpipe_loader_static_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DGALLIUM_STATIC_TARGETS=1
-
-libpipe_loader_dynamic_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
-
-libpipe_loader_static_la_SOURCES = \
-	$(COMMON_SOURCES)
-
-libpipe_loader_dynamic_la_SOURCES = \
+libpipe_loader_la_SOURCES = \
 	$(COMMON_SOURCES)
 
-if HAVE_LIBDRM
+if HAVE_DRM_LOADER_GALLIUM
 AM_CFLAGS += \
 	$(LIBDRM_CFLAGS)
 
-libpipe_loader_static_la_SOURCES += \
+libpipe_loader_la_SOURCES += \
 	$(DRM_SOURCES)
 
-libpipe_loader_dynamic_la_SOURCES += \
-	$(DRM_SOURCES)
+libpipe_loader_la_LIBADD = \
+	$(top_builddir)/src/loader/libloader.la
 
 endif
 
-libpipe_loader_static_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-libpipe_loader_dynamic_la_LIBADD = \
-	$(top_builddir)/src/loader/libloader.la \
-	$(top_builddir)/src/util/libxmlconfig.la
-
-EXTRA_DIST = SConscript meson.build