janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

run.mk: LD_LIBRARY_PATH and DLL_PATH -> ldlibpath.mk

Browse source 
Centralize all generation of LD_LIBRARY_PATH and DLL_PATH in
ldlibpath.mk.
This commit is contained in:
Jan Lindemann 2009-06-29 14:56:58 +00:00 • committed by Jan Lindemann
commit b448274c97
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/ldlibpath.mk
View file

@ -3,6 +3,11 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
LD_LIB_PATH_ORIG := $(LD_LIBRARY_PATH) LD_LIB_PATH_ENV := $(LD_LIBRARY_PATH)
export LD_LIBRARY_PATH=$(shell echo $(strip $(NEW_LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::/:/g') LD_LIB_PATH_LDFLAGS = $(shell echo $(LDFLAGS) | sed 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
#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
export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH_LDFLAGS):$(LD_LIB_PATH):$(LD_LIB_PATH_ENV)) | sed 's/ /:/g; s/::/:/g')

7
make/run.mk
View file

@ -10,13 +10,6 @@ BUILD_HDR =
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/ldlibpath.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: all:
install: install:
valgrind: valgrind: