Mesa (master): automake: include the libdeps in the correct order
Emil Velikov
evelikov at kemper.freedesktop.org
Thu Jun 19 21:57:22 UTC 2014
Module: Mesa
Branch: master
Commit: d300f3f51a5b24e3959889f97a3fbe8cd10ace8e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d300f3f51a5b24e3959889f97a3fbe8cd10ace8e
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Jun 19 22:46:25 2014 +0100
automake: include the libdeps in the correct order
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80254
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/targets/gbm/Makefile.am | 4 ++--
src/gallium/targets/opencl/Makefile.am | 4 ++--
src/gallium/targets/xa/Makefile.am | 4 ++--
src/gallium/tests/trivial/Makefile.am | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index 00f12c5..6f2a792 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -43,11 +43,11 @@ nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy.cpp
gbm_gallium_drm_la_SOURCES = gbm.c
gbm_gallium_drm_la_LIBADD = \
- $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+ $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
$(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 80b7e67..ca047f0 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -17,11 +17,11 @@ lib at OPENCL_LIBNAME@_la_LDFLAGS += \
endif
lib at OPENCL_LIBNAME@_la_LIBADD = \
- $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+ $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
-ldl \
-lclangCodeGen \
-lclangFrontendTool \
diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am
index 632b52f..a627040 100644
--- a/src/gallium/targets/xa/Makefile.am
+++ b/src/gallium/targets/xa/Makefile.am
@@ -40,11 +40,11 @@ nodist_EXTRA_libxatracker_la_SOURCES = dummy.cpp
libxatracker_la_SOURCES =
libxatracker_la_LIBADD = \
- $(GALLIUM_PIPE_LOADER_LIBS) \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+ $(GALLIUM_PIPE_LOADER_LIBS) \
$(LIBDRM_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
index 183fe8e..a0434d9 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -12,10 +12,10 @@ AM_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES)
LDADD = \
- $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
- $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
+ $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
noinst_PROGRAMS = compute tri quad-tex
More information about the mesa-commit
mailing list