From: Jon TURNEY Date: Fri, 13 Jul 2012 14:14:43 +0000 (+0100) Subject: Fix linking gallium drivers and with dricore after defadf2b1 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39d82a1b2028a7fe83a885478c9224669ea9f18a;p=mesa.git 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 --- diff --git a/configure.ac b/configure.ac index 0221c028d41..9227474f13f 100644 --- a/configure.ac +++ b/configure.ac @@ -1066,8 +1066,8 @@ GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a' dnl ... or dricore? if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then - DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la' - GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a' + DRI_LIB_DEPS="\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la" + GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so" HAVE_DRICORE=yes fi AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes) diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile index 2ba3eb6e4e6..ddebff2d130 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 c3c277895ea..25e6aea5489 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 6a8bf6635f7..256aa233fac 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 9cc9cb9f63b..740275099e3 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 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: