automake: create compat symlinks only for linux systems

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 <emil.l.velikov@gmail.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> (v1)
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/configure.ac b/configure.ac
index 5e1d09166ec7c677d1c1f5c23868420e403ce147..0735a76c46def730bb913be950418c228cda4802 100644 (file)
--- 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 49264639e708905d649748e9d52d8949e8dddc4b..5ee923b25df8a9b985362200ec8e62373154c641 100644 (file)
--- 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 2707eb8834b461e797255fdf54109e780d52a797..0e137198722ada86b162df01b797b288cd76d54e 100644 (file)
--- 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 187e4789a55db4aad2bf51b8c08c8f8ddc8c1f46..17ac76be11f9e71cbf208cdc14aebeef4f7ada0c 100644 (file)
--- 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.