From b448274c9718168a10380a2fa52ab0a04ba35d22 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 29 Jun 2009 14:56:58 +0000 Subject: [PATCH] run.mk: LD_LIBRARY_PATH and DLL_PATH -> ldlibpath.mk Centralize all generation of LD_LIBRARY_PATH and DLL_PATH in ldlibpath.mk. --- make/ldlibpath.mk | 11 ++++++++--- make/run.mk | 7 ------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk index 80c72b84..ec9d7187 100644 --- a/make/ldlibpath.mk +++ b/make/ldlibpath.mk @@ -3,6 +3,11 @@ # contact@jannet.de # $Id$ -LD_LIB_PATH_ORIG := $(LD_LIBRARY_PATH) -export LD_LIBRARY_PATH=$(shell echo $(strip $(NEW_LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::/:/g') -#export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::/:/g') +LD_LIB_PATH_ENV := $(LD_LIBRARY_PATH) +LD_LIB_PATH_LDFLAGS = $(shell echo $(LDFLAGS) | sed 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') + +ifeq ($(TARGET),mingw) +DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | sed 's/:/;/g');$(CROSS_TOOL_DIR)/bin +endif + +export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | sed 's/ /:/g; s/::/:/g') diff --git a/make/run.mk b/make/run.mk index 14543420..6b25c0c2 100644 --- a/make/run.mk +++ b/make/run.mk @@ -10,13 +10,6 @@ BUILD_HDR = include $(MODDIR)/make/rules.mk include $(MODDIR)/make/ldlibpath.mk -#LD_LIB_PATH_ORIG := $(LD_LIBRARY_PATH) -#export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::*/:/g') - -ifeq ($(TARGET),mingw) -DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | sed 's/:/;/g');$(CROSS_TOOL_DIR)/bin -endif - all: install: valgrind: