diff options
| author | Emil Velikov <[email protected]> | 2016-02-25 16:53:06 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-02-29 10:51:45 +0000 |
| commit | 0b6157e9713c662a6635fc0d79a393d95550c4ad (patch) | |
| tree | 912d7cf4ba436661a7c569bdf242188619283156 | |
| parent | 51b22bd46888c972eb8c80ee5524d94f6f0b8996 (diff) | |
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" <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | install-gallium-links.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/install-gallium-links.mk b/install-gallium-links.mk index f45f1b42ba9..4010cad15c0 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 |