diff options
| author | Johannes Obermayr <[email protected]> | 2013-09-17 18:09:02 +0100 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-10-01 07:29:49 -0700 |
| commit | cb1febb074ca5a9d4674c953106b467f175c4c0f (patch) | |
| tree | 35cb219d35acbf414e0fca4177d1a7afbc9b8204 /src/gallium/targets/dri-nouveau | |
| parent | eb0a57acaa7026b3212742a30f4ada3271d95616 (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/dri-nouveau')
| -rw-r--r-- | src/gallium/targets/dri-nouveau/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am index 9cc5455b8fa..a02394e42d3 100644 --- a/src/gallium/targets/dri-nouveau/Makefile.am +++ b/src/gallium/targets/dri-nouveau/Makefile.am @@ -39,15 +39,12 @@ dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = nouveau_dri.la nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp -nouveau_dri_la_SOURCES = \ - 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 +nouveau_dri_la_SOURCES = target.c nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined nouveau_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/state_trackers/dri/drm/libdridrm.la \ |