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 f45f1b42ba982429daed184ca790db07dd06989a..4010cad15c0987af3fd75f1d4595f125e285e4ae 100644 (file)
--- 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