From ce24bcd39409f5d734dd5ea845539e4b5b70eaf0 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 2 Mar 2014 21:03:24 +0000 Subject: [PATCH] targets/dri: use install-gallium-links.mk Drop the duplication across all dri targets. Signed-off-by: Emil Velikov Reviewed-by: Jon TURNEY --- src/gallium/targets/dri-freedreno/Makefile.am | 7 +------ src/gallium/targets/dri-i915/Makefile.am | 6 +----- src/gallium/targets/dri-ilo/Makefile.am | 7 +------ src/gallium/targets/dri-nouveau/Makefile.am | 6 +----- src/gallium/targets/dri-swrast/Makefile.am | 6 +----- src/gallium/targets/dri-vmwgfx/Makefile.am | 6 +----- src/gallium/targets/r300/dri/Makefile.am | 6 +----- src/gallium/targets/r600/dri/Makefile.am | 6 +----- src/gallium/targets/radeonsi/dri/Makefile.am | 6 +----- 9 files changed, 9 insertions(+), 47 deletions(-) diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am index 94500b0..f71fd32 100644 --- a/src/gallium/targets/dri-freedreno/Makefile.am +++ b/src/gallium/targets/dri-freedreno/Makefile.am @@ -63,9 +63,4 @@ msm_dri_la_SOURCES = target-msm.c msm_dri_la_LDFLAGS = $(COMMON_LDFLAGS) msm_dri_la_LIBADD = $(COMMON_LIBADD) -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: kgsl_dri.la msm_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/kgsl_dri.so $(top_builddir)/$(LIB_DIR)/gallium/kgsl_dri.so - ln -f .libs/msm_dri.so $(top_builddir)/$(LIB_DIR)/gallium/msm_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am index 3f8468f..bba0886 100644 --- a/src/gallium/targets/dri-i915/Makefile.am +++ b/src/gallium/targets/dri-i915/Makefile.am @@ -59,8 +59,4 @@ AM_CPPFLAGS += -DGALLIUM_LLVMPIPE i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: i915_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i915_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am index 418e2ea..18d3c44 100644 --- a/src/gallium/targets/dri-ilo/Makefile.am +++ b/src/gallium/targets/dri-ilo/Makefile.am @@ -59,9 +59,4 @@ ilo_dri_la_LDFLAGS += $(LLVM_LDFLAGS) ilo_dri_la_LIBADD += $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: ilo_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/ilo_dri.so - ln -sf ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i965_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am index f34acf8..d14796e 100644 --- a/src/gallium/targets/dri-nouveau/Makefile.am +++ b/src/gallium/targets/dri-nouveau/Makefile.am @@ -57,8 +57,4 @@ nouveau_dri_la_LDFLAGS += $(LLVM_LDFLAGS) nouveau_dri_la_LIBADD += $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: nouveau_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/nouveau_dri.so $(top_builddir)/$(LIB_DIR)/gallium/nouveau_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index ec1576b..e05e99d 100644 --- a/src/gallium/targets/dri-swrast/Makefile.am +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -62,8 +62,4 @@ swrast_dri_la_LDFLAGS += $(LLVM_LDFLAGS) swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: swrast_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/gallium/swrast_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am index 712e570..85b02da 100644 --- a/src/gallium/targets/dri-vmwgfx/Makefile.am +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am @@ -58,8 +58,4 @@ vmwgfx_dri_la_LDFLAGS += $(LLVM_LDFLAGS) vmwgfx_dri_la_LIBADD += $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: vmwgfx_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/vmwgfx_dri.so $(top_builddir)/$(LIB_DIR)/gallium/vmwgfx_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am index e2becdb..1e4fe9d 100644 --- a/src/gallium/targets/r300/dri/Makefile.am +++ b/src/gallium/targets/r300/dri/Makefile.am @@ -59,8 +59,4 @@ r300_dri_la_LDFLAGS += $(LLVM_LDFLAGS) r300_dri_la_LIBADD += $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r300_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/r300_dri.so $(top_builddir)/$(LIB_DIR)/gallium/r300_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am index f0a1b7b..6dd3448 100644 --- a/src/gallium/targets/r600/dri/Makefile.am +++ b/src/gallium/targets/r600/dri/Makefile.am @@ -61,8 +61,4 @@ r600_dri_la_LDFLAGS += $(LLVM_LDFLAGS) r600_dri_la_LIBADD += $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r600_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/r600_dri.so $(top_builddir)/$(LIB_DIR)/gallium/r600_dri.so +include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am index c49e5fc..32897e0 100644 --- a/src/gallium/targets/radeonsi/dri/Makefile.am +++ b/src/gallium/targets/radeonsi/dri/Makefile.am @@ -59,8 +59,4 @@ radeonsi_dri_la_LDFLAGS += $(LLVM_LDFLAGS) radeonsi_dri_la_LIBADD += $(LLVM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: radeonsi_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/radeonsi_dri.so $(top_builddir)/$(LIB_DIR)/gallium/radeonsi_dri.so +include $(top_srcdir)/install-gallium-links.mk -- 2.7.4