Fix linking gallium drivers and with dricore after defadf2b1
authorJon TURNEY <jon.turney@dronecode.org.uk>
Fri, 13 Jul 2012 14:14:43 +0000 (15:14 +0100)
committerJon TURNEY <jon.turney@dronecode.org.uk>
Fri, 13 Jul 2012 16:20:39 +0000 (17:20 +0100)
commit39d82a1b2028a7fe83a885478c9224669ea9f18a
treec7c4f5f20cb9f13b68fcaedfd3b5ff740d4fc976
parent9ed65301e044711de0db51b4986085fca170d764
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>
configure.ac
src/gallium/targets/dri-i915/Makefile
src/gallium/targets/dri-nouveau/Makefile
src/gallium/targets/dri-r300/Makefile
src/gallium/targets/dri-r600/Makefile
src/gallium/targets/dri-radeonsi/Makefile