From 880063f5bc8d74f5a7ce87c464f946e910447ecf Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Tue, 4 Sep 2012 21:57:28 -0700
Subject: build: Update drivers/Makefile.am to use LTLIBRARIES

---
 src/gallium/drivers/Makefile.am | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'src/gallium/drivers/Makefile.am')

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index dc808f47d9b..3652a6650a9 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -9,17 +9,17 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 
-noinst_LIBRARIES =
+noinst_LTLIBRARIES =
 
-SUBDIRS =
+SUBDIRS = .
 
 ################################################################################
 
 if HAVE_GALAHAD_GALLIUM
 
-noinst_LIBRARIES+= galahad/libgalahad.a
+noinst_LTLIBRARIES += galahad/libgalahad.la
 
-galahad_libgalahad_a_SOURCES = \
+galahad_libgalahad_la_SOURCES = \
 	galahad/glhd_objects.c \
 	galahad/glhd_context.c \
 	galahad/glhd_screen.c
@@ -30,9 +30,9 @@ endif
 
 if HAVE_IDENTITY_GALLIUM
 
-noinst_LIBRARIES+= identity/libidentity.a
+noinst_LTLIBRARIES += identity/libidentity.la
 
-identity_libidentity_a_SOURCES = \
+identity_libidentity_la_SOURCES = \
 	identity/id_objects.c \
 	identity/id_context.c \
 	identity/id_screen.c
@@ -46,9 +46,9 @@ if HAVE_NOOP_GALLIUM
 # Meta-driver which combines whichever software rasterizers have been
 # built into a single convenience library.
 
-noinst_LIBRARIES+= noop/libnoop.a
+noinst_LTLIBRARIES += noop/libnoop.la
 
-noop_libnoop_a_SOURCES = \
+noop_libnoop_la_SOURCES = \
 	noop/noop_pipe.c \
 	noop/noop_state.c
 
@@ -58,14 +58,24 @@ endif
 
 if NEED_RADEON_GALLIUM
 
-SUBDIRS+= radeon
+SUBDIRS += radeon
 
 endif
 
 ################################################################################
 
-SUBDIRS+= $(GALLIUM_MAKE_DIRS)
+SUBDIRS += $(GALLIUM_MAKE_DIRS)
 
 # FIXME: Remove when the rest of Gallium is converted to automake.
 default: all
 
+all-local: $(noinst_LTLIBRARIES)
+if HAVE_GALAHAD_GALLIUM
+	ln -f $(builddir)/galahad/.libs/libgalahad.a $(builddir)/galahad/libgalahad.a
+endif
+if HAVE_IDENTITY_GALLIUM
+	ln -f $(builddir)/identity/.libs/libidentity.a $(builddir)/identity/libidentity.a
+endif
+if HAVE_NOOP_GALLIUM
+	ln -f $(builddir)/noop/.libs/libnoop.a $(builddir)/noop/libnoop.a
+endif
-- 
cgit v1.2.3