From f8747fcdbd8d180622ef07987df9e0adfffe80f7 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 22 Jul 2017 14:34:23 +0000
Subject: [PATCH] py-defs.mk, py-mod.mk: Add exports to __init__.py

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/py-defs.mk | 3 ++-
 make/py-mod.mk  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/make/py-defs.mk b/make/py-defs.mk
index 71e1e658..95f84b47 100644
--- a/make/py-defs.mk
+++ b/make/py-defs.mk
@@ -6,12 +6,13 @@ else
   PY_SITE_PACKAGES_PATH = $(PREFIX)/python/site-packages
 endif
 
-PY_PROJ_MODULES_DIR ?= $(TOPDIR)/tools/python
+PY_PROJ_MODULES_DIR ?= $(wildcard $(TOPDIR)/tools/python $(TOPDIR)/src/python)
 PY_MODULES_DIR ?= $(PY_PROJ_MODULES_DIR)
 PY_PROJ_MODULES += $(dir $(wildcard $(PY_MODULES_DIR)/*/__init__.py))
 PY_MODULES ?= $(PY_PROJ_MODULES)
 PY_INSTALL_MOD ?= $(shell pwd | sed 's%.*/python/%%; s%/.*%%')
 PY_INSTALL_SUBMOD ?= $(shell pwd | sed "s%.*/$(PY_INSTALL_MOD)\(/\|$$\)%%")
+PY_MOD ?= $(patsubst /,.,$(PY_INSTALL_MOD).$(PY_INSTALL_SUBMOD))
 PY_SRC_PY = $(sort $(wildcard *.py) __init__.py)
 PY_PYC = $(patsubst %.py,%.pyc,$(PY_SRC_PY))
 
diff --git a/make/py-mod.mk b/make/py-mod.mk
index 2d9382b5..da25eeb6 100644
--- a/make/py-mod.mk
+++ b/make/py-mod.mk
@@ -8,7 +8,7 @@ distclean:
 
 py.clean:
 	rm -f *.done *.pyc
-	if [ ! -s __init__.py ]; then /bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py; fi
+	/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py
 
 install-dirs.done:
 	$(INSTALL) -d -m $(PYMODDIRMODE) -o $(PYMODDIROWNER) -g $(PYMODDIRGROUP) $(PY_INSTALL_DIR)
@@ -27,4 +27,5 @@ $(PY_INSTALL_DIR)/%.pyc: %.pyc
 	$(INSTALL) -m $(PYMODMODE) -o $(PYMODOWNER) -g $(PYMODGROUP) $< $@
 
 __init__.py:
-	touch $@
+	/bin/bash +H $(MOD_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" *.py | tee $@.tmp
+	mv $@.tmp $@