[Mesa-dev] [PATCHv2 09/20] gallium/targets: drop link generation for non DRI targets

[Ilia Mirkin]

On Sat, Mar 8, 2014 at 3:31 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> All three (xvmc and omx) do not have an alternative loading
> similar to the dri modules. Thus one needs to explicitly install
> them in order to use/test them.

Not strictly true... I mean, I install anyway because it's easier for
me, but xvmc is loaded via explicit path. No reason that path can't
point into the mesa source tree... Just an FYI, not a request to
change your patches.

>
> v2:
>  - Keep vdpau targets, as an equivalent of LIBGL_DRIVERS_PATH
> is being worked on.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
> ---
>  src/gallium/targets/r600/omx/Makefile.am     | 6 ------
>  src/gallium/targets/r600/xvmc/Makefile.am    | 6 ------
>  src/gallium/targets/radeonsi/omx/Makefile.am | 6 ------
>  src/gallium/targets/xvmc-nouveau/Makefile.am | 6 ------
>  4 files changed, 24 deletions(-)
>
> diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
> index 3aef9e1..98b064f 100644
> --- a/src/gallium/targets/r600/omx/Makefile.am
> +++ b/src/gallium/targets/r600/omx/Makefile.am
> @@ -70,9 +70,3 @@ libomx_r600_la_LINK = $(LINK) $(libomx_r600_la_LDFLAGS)
>  # Mention a dummy pure C file to trigger generation of the $(LINK) variable
>  nodist_EXTRA_libomx_r600_la_SOURCES = dummy-c.c
>  endif
> -
> -# 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.
> -all-local: libomx_r600.la
> -       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -       ln -f .libs/libomx_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/
> diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
> index 7fe9b1a..6e71ffa 100644
> --- a/src/gallium/targets/r600/xvmc/Makefile.am
> +++ b/src/gallium/targets/r600/xvmc/Makefile.am
> @@ -54,9 +54,3 @@ libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS)
>  # Mention a dummy pure C file to trigger generation of the $(LINK) variable
>  nodist_EXTRA_libXvMCr600_la_SOURCES = dummy-c.c
>  endif
> -
> -# 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.
> -all-local: libXvMCr600.la
> -       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -       ln -f .libs/libXvMCr600.so* $(top_builddir)/$(LIB_DIR)/gallium/
> diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
> index 0d47912..14e9dbb 100644
> --- a/src/gallium/targets/radeonsi/omx/Makefile.am
> +++ b/src/gallium/targets/radeonsi/omx/Makefile.am
> @@ -65,9 +65,3 @@ nodist_EXTRA_libomx_radeonsi_la_SOURCES = dummy-cpp.cpp
>  libomx_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
>  libomx_radeonsi_la_LIBADD += $(LLVM_LIBS)
>  endif
> -
> -# 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.
> -all-local: libomx_radeonsi.la
> -       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -       ln -f .libs/libomx_radeonsi.so* $(top_builddir)/$(LIB_DIR)/gallium/
> diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
> index 4a45f41..4abf81c 100644
> --- a/src/gallium/targets/xvmc-nouveau/Makefile.am
> +++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
> @@ -47,9 +47,3 @@ if HAVE_MESA_LLVM
>  libXvMCnouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
>  libXvMCnouveau_la_LIBADD += $(LLVM_LIBS)
>  endif
> -
> -# 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.
> -all-local: libXvMCnouveau.la
> -       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -       ln -f .libs/libXvMCnouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
> --
> 1.9.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev