From db1e6097faa48e1aee07e1dc4a447782a30db3f1 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 1 Aug 2017 21:53:36 +0000 Subject: [PATCH] ldlibpath.mk, py-defs.mk, rules.mk: Add ldlibpath.mk to py-defs.mk Since python might need bound C libraries, too, this looks like a good idea. Signed-off-by: Jan Lindemann --- make/ldlibpath.mk | 6 ++++++ make/py-defs.mk | 3 +++ make/rules.mk | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk index 7774aebd..bd6ce1b3 100644 --- a/make/ldlibpath.mk +++ b/make/ldlibpath.mk @@ -16,3 +16,9 @@ LD_LIBRARY_PATH = $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD)) export LD_LIBRARY_PATH export PATH=$(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV) +all: +libpath: + @echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" + @echo "export PATH=.:$(PATH)" + + diff --git a/make/py-defs.mk b/make/py-defs.mk index a0e4cda3..2a034d9d 100644 --- a/make/py-defs.mk +++ b/make/py-defs.mk @@ -49,3 +49,6 @@ echo-py: libpath: py-libpath py-libpath: @echo export PYTHONPATH=$(PYTHONPATH) + +include $(MODDIR)/make/ldlibpath.mk + diff --git a/make/rules.mk b/make/rules.mk index 8f9242b9..80f3b927 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -114,11 +114,6 @@ prepend_header: remake: set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS)) -libpath: - @echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" - @echo "export PATH=.:$(PATH)" - - echo-ldflags: @echo BUILD_LDFLAGS = $(BUILD_LDFLAGS) @echo LOCAL_LDFLAGS = $(LOCAL_LDFLAGS)