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

exe.mk: Split defs and rules -> ldlibpath.mk, rules.mk

Browse source 
Push LD_LIBRARY_PATH defs from exe.mk into ldlibpath.mk, and rules
into rules.mk.
This commit is contained in:
Jan Lindemann 2005-06-28 13:52:44 +00:00 • committed by Jan Lindemann
commit 9d141fe861
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/exe.mk
View file

@ -9,9 +9,7 @@ endif
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk 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')
all: $(EXE) $(EXE_BIN) all: $(EXE) $(EXE_BIN)
install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN) install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)
@ -22,8 +20,6 @@ strace: $(EXE) $(EXE_BIN)
kdbg gdb ddd: kdbg gdb ddd:
rm -f $(CORE); make run; $@ $(EXE) $(firstword $(CORE)) rm -f $(CORE); make run; $@ $(EXE) $(firstword $(CORE))
clean: execlean localclean clean: execlean localclean
libpath:
@echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)"
$(LIB_SO): $(LIB_A) $(LIB_SO): $(LIB_A)
$(EXE): $(LIB_SO) $(EXE): $(LIB_SO)

7
make/ldlibpath.mk Normal file
View file

@ -0,0 +1,7 @@
# jan's utility modules
# (c) 2001-2005 jannet it services
# contact@jannet.de
# $Id$
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')

3
make/rules.mk
View file

@ -267,3 +267,6 @@ prepend_header:
remake: remake:
make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS)) make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS))
libpath:
@echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)"