From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 25 Feb 2016 16:53:06 +0000 (+0000)
Subject: install-gallium-links: port changes from install-lib-links
X-Git-Tag: upstream/17.1.0~12263
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b6157e9713c662a6635fc0d79a393d95550c4ad;p=platform%2Fupstream%2Fmesa.git

install-gallium-links: port changes from install-lib-links

Namely:
b662d5282f7 mesa: Add clean-local rule to remove .lib links.
5c1aac17adf install-lib-links: don't depend on .libs directory
fece147be53 install-lib-links: remove the .install-lib-links file

With these in place, make distcheck now passes and a race condition has
been avoided.

Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/install-gallium-links.mk b/install-gallium-links.mk
index f45f1b4..4010cad 100644
--- a/install-gallium-links.mk
+++ b/install-gallium-links.mk
@@ -3,9 +3,9 @@
 
 if BUILD_SHARED
 if HAVE_COMPAT_SYMLINKS
-all-local : .libs/install-gallium-links
+all-local : .install-gallium-links
 
-.libs/install-gallium-links : $(dri_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES)
+.install-gallium-links : $(dri_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES)
 	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);	\
 	link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
 	if test x$(egl_LTLIBRARIES) != x; then			\
@@ -23,4 +23,15 @@ all-local : .libs/install-gallium-links
 		fi;						\
 	done && touch $@
 endif
+
+clean-local:
+	for f in $(notdir $(dri_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)) \
+		 $(notdir $(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)) \
+		 $(notdir $(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)); do \
+		echo $$f; \
+		$(RM) $(top_builddir)/$(LIB_DIR)/gallium/$$f;   \
+	done;
+	rmdir $(top_builddir)/$(LIB_DIR)/gallium || true
+	$(RM) .install-gallium-links
+
 endif