scons: wait on subprocess' completion

[mesa.git] / install-gallium-links.mk

diff --git a/install-gallium-links.mk b/install-gallium-links.mk
index 49264639e708905d649748e9d52d8949e8dddc4b..fc2f75db5e837b76892a46fe840c94b8cf464986 100644 (file)
--- a/install-gallium-links.mk
+++ b/install-gallium-links.mk
@@ -1,19 +1,20 @@
 # 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 : .libs/install-gallium-links
+if BUILD_SHARED
+if HAVE_COMPAT_SYMLINKS
+all-local : .install-gallium-links
 
-.libs/install-gallium-links : $(dri_LTLIBRARIES) $(vdpau_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                  \
                link_dir=$(top_builddir)/$(LIB_DIR)/egl;        \
        fi;                                                     \
        $(MKDIR_P) $$link_dir;                                  \
-       file_list=$(dri_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*);  \
-       file_list+=$(vdpau_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
-       file_list+=$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
-       file_list+=$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
+       file_list="$(dri_LTLIBRARIES:%.la=.libs/%.so)";         \
+       file_list="$$file_list$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";     \
+       file_list="$$file_list$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";     \
        for f in $$file_list; do                                \
                if test -h .libs/$$f; then                      \
                        cp -d $$f $$link_dir;                   \
@@ -21,3 +22,16 @@ all-local : .libs/install-gallium-links
                        ln -f $$f $$link_dir;                   \
                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