From d12b07eb1a881df641f81ce7e31d3da8043a5b80 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 14 Aug 2012 12:33:32 -0700 Subject: [PATCH] build: Remove EXTRA_LIB_PATH You can add extra library paths to LDFLAGS directly. --- configs/current.in | 23 +++++++++++------------ configs/default | 18 +++++++++--------- configure.ac | 6 +----- src/gallium/targets/Makefile.va | 2 +- src/gallium/targets/Makefile.vdpau | 2 +- src/gallium/targets/Makefile.xvmc | 2 +- 6 files changed, 24 insertions(+), 29 deletions(-) diff --git a/configs/current.in b/configs/current.in index c4f3f4df9b3..c4908421044 100644 --- a/configs/current.in +++ b/configs/current.in @@ -20,7 +20,6 @@ CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@ LDFLAGS = @LDFLAGS@ -EXTRA_LIB_PATH = @EXTRA_LIB_PATH@ RADEON_CFLAGS = @RADEON_CFLAGS@ RADEON_LIBS = @RADEON_LIBS@ NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@ @@ -129,22 +128,22 @@ GLW_SOURCES = @GLW_SOURCES@ MOTIF_CFLAGS = @MOTIF_CFLAGS@ # Library/program dependencies -GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@ +GL_LIB_DEPS = @GL_LIB_DEPS@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \ - $(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@ -EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@ + @OSMESA_LIB_DEPS@ +EGL_LIB_DEPS = @EGL_LIB_DEPS@ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \ - $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@ + @GLU_LIB_DEPS@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \ - $(EXTRA_LIB_PATH) @GLW_LIB_DEPS@ -GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@ -GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@ -VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@ -GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@ + @GLW_LIB_DEPS@ +GLESv1_CM_LIB_DEPS = @GLESv1_CM_LIB_DEPS@ +GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@ +VG_LIB_DEPS = @VG_LIB_DEPS@ +GLAPI_LIB_DEPS = @GLAPI_LIB_DEPS@ # DRI dependencies -DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@ -GALLIUM_DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @GALLIUM_DRI_LIB_DEPS@ +DRI_LIB_DEPS = @DRI_LIB_DEPS@ +GALLIUM_DRI_LIB_DEPS = @GALLIUM_DRI_LIB_DEPS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIB = @LIBDRM_LIBS@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ diff --git a/configs/default b/configs/default index 8a8d8f8d209..ea026e6320e 100644 --- a/configs/default +++ b/configs/default @@ -113,15 +113,15 @@ EGL_CLIENT_APIS = $(GL_LIB) # Library dependencies #EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread -OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 -GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread -GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread -VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread -GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread +GL_LIB_DEPS = -lX11 -lXext -lm -lpthread +EGL_LIB_DEPS = -ldl -lpthread +OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 +GLESv1_CM_LIB_DEPS = -lpthread +GLESv2_LIB_DEPS = -lpthread +VG_LIB_DEPS = -lpthread +GLAPI_LIB_DEPS = -lpthread # Program dependencies - specific GL libraries added in Makefiles X11_LIBS = -lX11 diff --git a/configure.ac b/configure.ac index 233efa2f980..7dac091b0cb 100644 --- a/configure.ac +++ b/configure.ac @@ -146,12 +146,8 @@ dnl LIB_DIR - library basename LIB_DIR=`echo $libdir | $SED 's%.*/%%'` AC_SUBST([LIB_DIR]) -dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later +dnl Cache LDFLAGS and CPPFLAGS so we can add to them and restore later _SAVE_LDFLAGS="$LDFLAGS" -AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker]) -AC_SUBST([EXTRA_LIB_PATH]) - -dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later _SAVE_CPPFLAGS="$CPPFLAGS" dnl Compiler macros diff --git a/src/gallium/targets/Makefile.va b/src/gallium/targets/Makefile.va index a6e775c1477..307fa63def6 100644 --- a/src/gallium/targets/Makefile.va +++ b/src/gallium/targets/Makefile.va @@ -10,7 +10,7 @@ INCLUDES = -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/winsys \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VA_MAJOR) -DVER_MINOR=$(VA_MINOR) $(DRIVER_DEFINES) -LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lva -lXext -lX11 -lm +LIBS = $(DRIVER_LIBS) -lva -lXext -lX11 -lm STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/va/libvatracker.a ifeq ($(MESA_LLVM),1) diff --git a/src/gallium/targets/Makefile.vdpau b/src/gallium/targets/Makefile.vdpau index fba3cdf5d83..a00ebf33c50 100644 --- a/src/gallium/targets/Makefile.vdpau +++ b/src/gallium/targets/Makefile.vdpau @@ -10,7 +10,7 @@ INCLUDES = -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/winsys \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VDPAU_MAJOR) -DVER_MINOR=$(VDPAU_MINOR) $(DRIVER_DEFINES) -LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lvdpau -lX11-xcb -lxcb-dri2 -lm -lrt +LIBS = $(DRIVER_LIBS) -lvdpau -lX11-xcb -lxcb-dri2 -lm -lrt STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/vdpau/libvdpautracker.a ifeq ($(MESA_LLVM),1) diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc index ff1af4f4725..0a0ac1b2621 100644 --- a/src/gallium/targets/Makefile.xvmc +++ b/src/gallium/targets/Makefile.xvmc @@ -10,7 +10,7 @@ INCLUDES = -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/winsys \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE $(DRIVER_DEFINES) -LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lXv -lX11-xcb -lxcb-dri2 -lm +LIBS = $(DRIVER_LIBS) -lXv -lX11-xcb -lxcb-dri2 -lm STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/xvmc/libxvmctracker.a ifeq ($(MESA_LLVM),1) -- 2.30.2