From 22c133546a5b4bec399d4e20cf63455b1c4b0959 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 9 Mar 2014 11:50:44 +0000 Subject: [PATCH] automake: create compat symlinks only for linux systems MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The primary users of these are linux developers, although it can be extended for *BSD and others if needed. Fixes make install for Cygwin and OpenBSD at least. v2: - Wrap vdpau targets as well. v3: - Fold HAVE_COMPAT_SYMLINKS conditional within install*links.mk Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63269 Signed-off-by: Emil Velikov Reviewed-by: Jon TURNEY (v1) Reviewed-by: Christian König --- configure.ac | 12 ++++++++++++ install-gallium-links.mk | 2 ++ install-lib-links.mk | 2 ++ src/mesa/drivers/dri/Makefile.am | 2 ++ 4 files changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac index 5e1d09166ec..0735a76c46d 100644 --- a/configure.ac +++ b/configure.ac @@ -316,6 +316,18 @@ if test "x$enable_debug" = xyes; then fi fi +dnl +dnl compatibility symlinks +dnl +case "$host_os" in +linux* ) + HAVE_COMPAT_SYMLINKS=yes ;; +* ) + HAVE_COMPAT_SYMLINKS=no ;; +esac + +AM_CONDITIONAL(HAVE_COMPAT_SYMLINKS, test "x$HAVE_COMPAT_SYMLINKS" = xyes) + dnl dnl library names dnl diff --git a/install-gallium-links.mk b/install-gallium-links.mk index 49264639e70..5ee923b25df 100644 --- a/install-gallium-links.mk +++ b/install-gallium-links.mk @@ -1,6 +1,7 @@ # 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. +if HAVE_COMPAT_SYMLINKS all-local : .libs/install-gallium-links .libs/install-gallium-links : $(dri_LTLIBRARIES) $(vdpau_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -21,3 +22,4 @@ all-local : .libs/install-gallium-links ln -f $$f $$link_dir; \ fi; \ done && touch $@ +endif diff --git a/install-lib-links.mk b/install-lib-links.mk index 2707eb8834b..0e137198722 100644 --- a/install-lib-links.mk +++ b/install-lib-links.mk @@ -1,6 +1,7 @@ # 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. +if HAVE_COMPAT_SYMLINKS all-local : .libs/install-mesa-links .libs/install-mesa-links : $(lib_LTLIBRARIES) @@ -12,3 +13,4 @@ all-local : .libs/install-mesa-links ln -f $$f $(top_builddir)/$(LIB_DIR); \ fi; \ done && touch $@ +endif diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am index 187e4789a55..17ac76be11f 100644 --- a/src/mesa/drivers/dri/Makefile.am +++ b/src/mesa/drivers/dri/Makefile.am @@ -65,6 +65,7 @@ mesa_dri_drivers_la_LIBADD = \ if NEED_MEGADRIVER dri_LTLIBRARIES = mesa_dri_drivers.la +if HAVE_COMPAT_SYMLINKS # Add a link to allow setting LD_LIBRARY_PATH/LIBGL_DRIVERS_PATH to /lib of the build tree. all-local: mesa_dri_drivers.la $(AM_V_at)$(MKDIR_P) $(top_builddir)/$(LIB_DIR); @@ -74,6 +75,7 @@ all-local: mesa_dri_drivers.la ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.@LIB_EXT@ \ $(top_builddir)/$(LIB_DIR)/$$i; \ done; +endif # hardlink each megadriver instance, but don't actually have # mesa_dri_drivers.@LIB_EXT@ in the set of final installed files. -- 2.30.2