diff --git a/Makefile b/Makefile index d4fd399..cc46279 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,33 @@ -# git helper Makefile: Version 1.3 (2025-08-05) +# git helper Makefile: Version 1.4 (2025-08-05) default: help .ONESHELL: SHELL = /usr/bin/bash .SILENT: +-include make.d/*.mk + GIT_FLAG = ./.git VENV_FLAG = ./.venv_required VENV_FOLDER = ./venv -INIT_FILE = ./init + +localhelp: help: - echo "Possible options are: init, status, venv_flag, clean, cleanall" + echo "Possible common options are:" + echo " - init - Initialise the repository and all folders below with a Makefile" + echo " - giti - Get the git status of all submodules including their submodules" + echo " - update_submodules - Set all submodules to remote master" + echo " - venv_flag - Set the venev flag for the base folder. A venv will be generated" + echo " - clean - clean up" + echo " - deepclean - clean up this and all Makefiles below" + $(MAKE) localhelp + echo "You are able to create files make.d/*.mk and add local rules there. " + echo " - localinit - Will be executed as last step in the init process." + echo " - localhelp - Will be executed in th middle of the help text generation" + echo " - localclean - Will be executed before the clean rule" + +localinit: init: print_head # Init git repo @@ -29,26 +45,23 @@ init: print_head mkvenv fi fi - # Start my init script if needed - if [[ -x $(INIT_FILE) ]]; then - $(INIT_FILE) - fi + # Start local init + $(MAKE) localinit update_submodules: git submodule foreach "git checkout master && git pull && git submodule init && git submodule update" -status: print_head +giti_sub: print_head giti - echo "Submodules:" - echo "-----------" - git submodule --quiet foreach giti + echo " Submodules:" + git submodule --quiet foreach "echo -n ' ' && giti" -statusall: - for subdir in $$(find . -maxdepth 2 -mindepth 2 -name Makefile | sort); do - $(MAKE) --no-print-directory -C $$(dirname $$subdir) status - done +giti: + git submodule --quiet foreach make --no-print-directory giti_sub -clean: +localclean: + +clean: localclean if [[ ! -e $(VENV_FLAG) ]]; then if [[ -d $(VENV_FOLDER) ]]; then rm -rf $(VENV_FOLDER) diff --git a/journaliser b/journaliser index 89af021..70dfca9 160000 --- a/journaliser +++ b/journaliser @@ -1 +1 @@ -Subproject commit 89af0211b4bfb7c16655f157ec9417145a87c531 +Subproject commit 70dfca9cafa22d99728e094a71f1e1b75e891829 diff --git a/loggy b/loggy index 9077043..465f869 160000 --- a/loggy +++ b/loggy @@ -1 +1 @@ -Subproject commit 9077043d38a70a450238245f74e62f32e1797412 +Subproject commit 465f8699b541632bbb978f764f3bc82fd892ba5c diff --git a/mqtt_sniffer b/mqtt_sniffer index 20703bd..fbc3e99 160000 --- a/mqtt_sniffer +++ b/mqtt_sniffer @@ -1 +1 @@ -Subproject commit 20703bdaa93cad3f891acb4a1a96a37d7054d7c5 +Subproject commit fbc3e998e635919d6d9fb5c6baeb5777a24eaf41 diff --git a/nemo b/nemo index 1548967..fd8d430 160000 --- a/nemo +++ b/nemo @@ -1 +1 @@ -Subproject commit 1548967bdb12799faefcdb1b0791e3ac580794d5 +Subproject commit fd8d430ee0dcbedd8382826af460e3b28626e70e diff --git a/netst b/netst index c7aa049..19c92fa 160000 --- a/netst +++ b/netst @@ -1 +1 @@ -Subproject commit c7aa0498c753462ef98fbd25685b879b38605c85 +Subproject commit 19c92fac55fa6aac2d287afe8501b0f48d668333 diff --git a/ptpython b/ptpython index 6211660..74cbd64 160000 --- a/ptpython +++ b/ptpython @@ -1 +1 @@ -Subproject commit 621166073d2f0fd4303f05aa055afb295cd7a122 +Subproject commit 74cbd64cd3d100b50bed497986d5baa8e882819f diff --git a/pyrip b/pyrip index fd7a7a4..acd4169 160000 --- a/pyrip +++ b/pyrip @@ -1 +1 @@ -Subproject commit fd7a7a456e198947b46e223593122b05863afbbd +Subproject commit acd4169e696c36cd7dcb25952aed2576d22f836a diff --git a/starter b/starter index 5e1b205..17f3f88 160000 --- a/starter +++ b/starter @@ -1 +1 @@ -Subproject commit 5e1b205bef6f051ae7b421d3b60eb216a2b49877 +Subproject commit 17f3f88571c5959434b39b60183e9314ae5d957e