Mesa (master): Avoid mesa_dri_drivers import lib being installed

Jon TURNEY jturney at kemper.freedesktop.org
Sun Jul 13 15:08:12 UTC 2014


Module: Mesa
Branch: master
Commit: 923f78440c29644f31d745d6fbd4eaad8676973f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=923f78440c29644f31d745d6fbd4eaad8676973f

Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sat Apr  5 19:20:15 2014 +0100

Avoid mesa_dri_drivers import lib being installed

On Cygwin and MinGW, linking a shared library also generates an import library

Use a wildcard which also matches the name of the megadriver import lib,
mesa_dri_drivers.dll.a, so that is also removed after megadriver symlinks are
created

(This then matches src/gallium/targets/dri/Makefile.am, which already does
things this way)

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/mesa/drivers/dri/Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index 70039f9..2009da9 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -85,7 +85,6 @@ install-data-hook:
 		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
 		      $(DESTDIR)$(dridir)/$$i; \
 	done;
-	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so
-	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.la
+	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.*
 
 endif




More information about the mesa-commit mailing list