From 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 25 Oct 2013 08:48:17 +0200
Subject: fontconfig mesa git update 25 oct 2013

fontconfig       commit 65872e9e46d17e4461c3a891ef23abe156005e04
mesa             commit e8f6f244bb1963c4af81f431865355beef1b9cbb
---
 mesalib/src/mesa/drivers/dri/Makefile.am | 67 +++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 6 deletions(-)

(limited to 'mesalib/src/mesa/drivers/dri/Makefile.am')

diff --git a/mesalib/src/mesa/drivers/dri/Makefile.am b/mesalib/src/mesa/drivers/dri/Makefile.am
index 7fa0ad73d..a85a5aa91 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.am
+++ b/mesalib/src/mesa/drivers/dri/Makefile.am
@@ -1,29 +1,45 @@
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
 SUBDIRS =
+MEGADRIVERS =
+MEGADRIVERS_DEPS =
 
 SUBDIRS+=common
 
 if HAVE_I915_DRI
-SUBDIRS+=i915
+SUBDIRS += i915
+MEGADRIVERS_DEPS += i915/libi915_dri.la
+MEGADRIVERS += i915_dri.so
 endif
 
 if HAVE_I965_DRI
-SUBDIRS+=i965
+SUBDIRS += i965
+MEGADRIVERS_DEPS += i965/libi965_dri.la
+MEGADRIVERS += i965_dri.so
 endif
 
 if HAVE_NOUVEAU_DRI
-SUBDIRS+=nouveau
+SUBDIRS += nouveau
+MEGADRIVERS_DEPS += nouveau/libnouveau_dri.la
+MEGADRIVERS += nouveau_vieux_dri.so
 endif
 
 if HAVE_R200_DRI
-SUBDIRS+=r200
+SUBDIRS += r200
+MEGADRIVERS_DEPS += r200/libr200_dri.la
+MEGADRIVERS += r200_dri.so
 endif
 
 if HAVE_RADEON_DRI
-SUBDIRS+=radeon
+SUBDIRS += radeon
+MEGADRIVERS_DEPS += radeon/libradeon_dri.la
+MEGADRIVERS += radeon_dri.so
 endif
 
 if HAVE_SWRAST_DRI
-SUBDIRS+=swrast
+SUBDIRS += swrast
+MEGADRIVERS_DEPS += swrast/libswrast_dri.la
+MEGADRIVERS += swrast_dri.so
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -31,3 +47,42 @@ pkgconfig_DATA = dri.pc
 
 driincludedir = $(includedir)/GL/internal
 driinclude_HEADERS = $(top_srcdir)/include/GL/internal/dri_interface.h
+
+nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
+mesa_dri_drivers_la_SOURCES =
+mesa_dri_drivers_la_LDFLAGS = \
+        -module -avoid-version -shared \
+        -Wl,-Bsymbolic \
+        $()
+mesa_dri_drivers_la_LIBADD = \
+        ../../libmesa.la \
+        common/libmegadriver_stub.la \
+        common/libdricommon.la \
+        $(MEGADRIVERS_DEPS) \
+        $(DRI_LIB_DEPS) \
+        $()
+
+if NEED_MEGADRIVER
+dri_LTLIBRARIES = mesa_dri_drivers.la
+
+# Add a link to allow setting LD_LIBRARY_PATH/LIBGL_DRIVERS_PATH to /lib of the build tree.
+all-local: mesa_dri_drivers.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+	$(AM_V_GEN)ln -f .libs/mesa_dri_drivers.so \
+			 $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
+	$(AM_V_GEN)for i in $(MEGADRIVERS); do \
+		ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so \
+		      $(top_builddir)/$(LIB_DIR)/$$i; \
+	done;
+
+# hardlink each megadriver instance, but don't actually have
+# mesa_dri_drivers.so in the set of final installed files.
+install-data-hook:
+	for i in $(MEGADRIVERS); do \
+		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
+		      $(DESTDIR)$(dridir)/$$i; \
+	done;
+	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so
+	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.la
+
+endif
-- 
cgit v1.2.3