[Mesa-dev] [PATCH] install-lib-links: don't depend on .libs directory

2015-02-19 Thread Lucas Stach
This snippet can be included in Makefiles that may, depending on the
project configuration, not actually build any installable libraries.

In that case we don't have anything to depend on and this part of
the makefile may be executed before the .libs directory is created,
so do not depend on it being there.

Signed-off-by: Lucas Stach l.st...@pengutronix.de
Cc: 10.3 10.4 mesa-sta...@lists.freedesktop.org
---
 install-lib-links.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install-lib-links.mk b/install-lib-links.mk
index 6976ca4911ab..3545b268ebd1 100644
--- a/install-lib-links.mk
+++ b/install-lib-links.mk
@@ -3,9 +3,9 @@
 
 if BUILD_SHARED
 if HAVE_COMPAT_SYMLINKS
-all-local : .libs/install-mesa-links
+all-local : .install-mesa-links
 
-.libs/install-mesa-links : $(lib_LTLIBRARIES)
+.install-mesa-links : $(lib_LTLIBRARIES)
$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);   \
for f in $(join $(addsuffix .libs/,$(dir $(lib_LTLIBRARIES))),$(notdir 
$(lib_LTLIBRARIES:%.la=%.$(LIB_EXT)*))); do \
if test -h .libs/$$f; then  \
-- 
2.1.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] install-lib-links: don't depend on .libs directory

2015-02-19 Thread Matt Turner
On Thu, Feb 19, 2015 at 5:52 AM, Lucas Stach l.st...@pengutronix.de wrote:
 This snippet can be included in Makefiles that may, depending on the
 project configuration, not actually build any installable libraries.

 In that case we don't have anything to depend on and this part of
 the makefile may be executed before the .libs directory is created,
 so do not depend on it being there.

 Signed-off-by: Lucas Stach l.st...@pengutronix.de
 Cc: 10.3 10.4 mesa-sta...@lists.freedesktop.org
 ---
  install-lib-links.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/install-lib-links.mk b/install-lib-links.mk
 index 6976ca4911ab..3545b268ebd1 100644
 --- a/install-lib-links.mk
 +++ b/install-lib-links.mk
 @@ -3,9 +3,9 @@

  if BUILD_SHARED
  if HAVE_COMPAT_SYMLINKS
 -all-local : .libs/install-mesa-links
 +all-local : .install-mesa-links

 -.libs/install-mesa-links : $(lib_LTLIBRARIES)
 +.install-mesa-links : $(lib_LTLIBRARIES)
 $(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);   \
 for f in $(join $(addsuffix .libs/,$(dir 
 $(lib_LTLIBRARIES))),$(notdir $(lib_LTLIBRARIES:%.la=%.$(LIB_EXT)*))); do \
 if test -h .libs/$$f; then  \
 --
 2.1.4


Thanks a bunch Lucas.

Reviewed-by: Matt Turner matts...@gmail.com

I'll commit this and tag it for 10.5 as well.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev