summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-07-13 15:14:43 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-07-13 17:20:39 +0100
commit39d82a1b2028a7fe83a885478c9224669ea9f18a (patch)
treec7c4f5f20cb9f13b68fcaedfd3b5ff740d4fc976 /src/gallium
parent9ed65301e044711de0db51b4986085fca170d764 (diff)
downloadexternal_mesa3d-39d82a1b2028a7fe83a885478c9224669ea9f18a.zip
external_mesa3d-39d82a1b2028a7fe83a885478c9224669ea9f18a.tar.gz
external_mesa3d-39d82a1b2028a7fe83a885478c9224669ea9f18a.tar.bz2
Fix linking gallium drivers and with dricore after defadf2b1
Commit defadf2b1 erroneously tries to make gallium drivers link with libdricore as a static library, not a shared library Also, change uses of DRI_LIB_DEPS in gallium driver Makefiles to GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the gallium driver Also, fix the path to the libdricore.so symlink, it's made in LIB_DIR, not in the libdricore directory Also repair quoting of dricore settings of DRI_LIB_DEPS and GALLIUM_DRI_LIB_DEPS variables so VERSION is interpolated in configure but TOP and LIB_DIR are interpolated later (where they are known, but VERSION isn't) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/targets/dri-i915/Makefile2
-rw-r--r--src/gallium/targets/dri-nouveau/Makefile2
-rw-r--r--src/gallium/targets/dri-r300/Makefile2
-rw-r--r--src/gallium/targets/dri-r600/Makefile2
-rw-r--r--src/gallium/targets/dri-radeonsi/Makefile2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 2ba3eb6..ddebff2 100644
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -28,6 +28,6 @@ endif
include ../Makefile.dri
-DRI_LIB_DEPS += -ldrm_intel
+GALLIUM_DRI_LIB_DEPS += -ldrm_intel
symlinks:
diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index c3c2778..25e6aea 100644
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -23,6 +23,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
-DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
+GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
symlinks:
diff --git a/src/gallium/targets/dri-r300/Makefile b/src/gallium/targets/dri-r300/Makefile
index 6a8bf66..256aa23 100644
--- a/src/gallium/targets/dri-r300/Makefile
+++ b/src/gallium/targets/dri-r300/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
symlinks:
diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile
index 9cc9cb9..7402750 100644
--- a/src/gallium/targets/dri-r600/Makefile
+++ b/src/gallium/targets/dri-r600/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
symlinks:
diff --git a/src/gallium/targets/dri-radeonsi/Makefile b/src/gallium/targets/dri-radeonsi/Makefile
index f76d71b..b45f243 100644
--- a/src/gallium/targets/dri-radeonsi/Makefile
+++ b/src/gallium/targets/dri-radeonsi/Makefile
@@ -21,6 +21,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
-DRI_LIB_DEPS += -ldrm_radeon
+GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
symlinks: