Mesa (master): gallium: use $(top_builddir) when referencing static archives
Emil Velikov
evelikov at kemper.freedesktop.org
Fri Jun 12 14:43:40 UTC 2015
Module: Mesa
Branch: master
Commit: 4722743f4b920c6986a7148ef3ce76b4fd12db46
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4722743f4b920c6986a7148ef3ce76b4fd12db46
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Apr 15 11:42:55 2015 +0100
gallium: use $(top_builddir) when referencing static archives
Just like every other place in gallium.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/drivers/freedreno/Makefile.am | 2 +-
src/gallium/drivers/nouveau/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index e798e44..cbf62c6 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -28,7 +28,7 @@ ir3_compiler_SOURCES = \
ir3_compiler_LDADD = \
libfreedreno.la \
- ../../auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/glsl/libnir.la \
$(top_builddir)/src/libglsl_util.la \
$(top_builddir)/src/util/libmesautil.la \
diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
index 0aefc03..d05f0a1 100644
--- a/src/gallium/drivers/nouveau/Makefile.am
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -48,7 +48,7 @@ nouveau_compiler_SOURCES = \
nouveau_compiler_LDADD = \
libnouveau.la \
- ../../auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
$(GALLIUM_COMMON_LIB_DEPS)
More information about the mesa-commit
mailing list