From 39d82a1b2028a7fe83a885478c9224669ea9f18a Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 13 Jul 2012 15:14:43 +0100 Subject: 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 Signed-off-by: Tom Stellard --- src/gallium/targets/dri-radeonsi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gallium/targets/dri-radeonsi/Makefile') diff --git a/src/gallium/targets/dri-radeonsi/Makefile b/src/gallium/targets/dri-radeonsi/Makefile index f76d71bec98..b45f243b852 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: -- cgit v1.2.3