summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/r600
diff options
context:
space:
mode:
authorJohannes Obermayr <[email protected]>2013-09-17 18:09:02 +0100
committerTom Stellard <[email protected]>2013-10-01 07:29:49 -0700
commitcb1febb074ca5a9d4674c953106b467f175c4c0f (patch)
tree35cb219d35acbf414e0fca4177d1a7afbc9b8204 /src/gallium/targets/r600
parenteb0a57acaa7026b3212742a30f4ada3271d95616 (diff)
gallium/targets: Make use of prebuilt libdricommon.la.
libdricommon.la is available whenever a non swrast driver is built. All the classic dri drivers make use of the prebuild library but all of the gallium ones rebuild it explicitly. While we're here gallium/{llvm,soft}pipe does not require HAVE_COMMON_DRI thus do not set in during configure. v2: [Emil] Add commit message and drop HAVE_COMMON_DRI from configure.ac v3: [Emil] Rebase and resolve targets/r*/dri conflicts Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/targets/r600')
-rw-r--r--src/gallium/targets/r600/dri/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am
index 423ad0ea60e..5a1600ca8a1 100644
--- a/src/gallium/targets/r600/dri/Makefile.am
+++ b/src/gallium/targets/r600/dri/Makefile.am
@@ -40,14 +40,12 @@ dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = r600_dri.la
r600_dri_la_SOURCES = \
- ../drm_target.c \
- $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
- $(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
- $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
+ ../drm_target.c
r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
r600_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \