diff --git a/make/defs.mk b/make/defs.mk index 73149126..78f856ca 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -7,10 +7,6 @@ JW_PKG_DEF_MK_INCLUDED = true MAKEFLAGS += -r -empty := -space := $(empty) $(empty) -comma := , - include $(JWBDIR)/make/projects.mk # ----- Executables diff --git a/make/platform.mk b/make/platform.mk index 19a07bc8..3a2c9cc8 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -3,6 +3,10 @@ ifndef PLATFORM_MK_INCLUDED PLATFORM_MK_INCLUDED = true +empty := +space := $(empty) $(empty) +comma := , + CACHE_PROJECT_MK ?= $(TOPDIR)/.cache-project.mk CACHE_PROJECTS_MK := $(JWBDIR)/.cache-projects.mk JW_PKG_NO_CACHE ?= false diff --git a/make/py-defs.mk b/make/py-defs.mk index 98c22bbb..bf8f06fa 100644 --- a/make/py-defs.mk +++ b/make/py-defs.mk @@ -19,6 +19,8 @@ else PY_SITE_PACKAGES_PATH := $(shell $(PYTHON) -c "import site; print([d for d in site.getsitepackages() if d.find('/local/') == -1][0])") endif +PYTHON_RUNNER ?= $(PYTHON) + PY_SRC_PY ?= $(wildcard *.py) PY_LOCAL_PY = $(PY_SRC_PY) PY_INSTALL_PY = $(filter-out __init__.py,$(PY_SRC_PY)) diff --git a/make/py-path.mk b/make/py-path.mk index 64c03dab..d1c96a3d 100644 --- a/make/py-path.mk +++ b/make/py-path.mk @@ -1,4 +1,5 @@ -# -- PYTHONPATH +include $(JWBDIR)/make/platform.mk # For JW_PKG_PY + PYTHONPATH_ENV := $(PYTHONPATH) ifeq ($(origin JW_PKG_PYTHON_PATH),undefined) JW_PKG_PYTHON_PATH := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN)) @@ -14,4 +15,3 @@ py-tools.clean: py-path: @echo "PYTHONPATH=$(PYTHONPATH)" - @#echo "MYPYPATH=$(MYPYPATH)" diff --git a/make/py-run.mk b/make/py-run.mk index 629f88b1..af042bc6 100644 --- a/make/py-run.mk +++ b/make/py-run.mk @@ -5,7 +5,6 @@ include $(JWBDIR)/make/run-success.mk EXE ?= $(firstword $(wildcard main.py runme.py test.py *.py)) EXE_ARGS ?= -PYTHON_RUNNER ?= $(PYTHON) all: install: