From c83f5a09f3f8129f60f7ae2d45c4d1d1507d2340 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Mon, 23 Jan 2023 11:51:31 +0100
Subject: [PATCH] chore: update makefiles

---
 development/makefiles/conan.mk                |  6 +++++
 development/makefiles/directories-go-lib.mk   |  1 +
 .../makefiles/directories-go-utilities.mk     |  1 +
 .../makefiles/directories-platform-part.mk    |  2 +-
 development/makefiles/docman.mk               | 11 ++++++++-
 development/makefiles/target-caddy.mk         |  1 +
 development/makefiles/target-conan.mk         |  7 +-----
 development/makefiles/target-deploy-tool.mk   |  3 ++-
 development/makefiles/target-docman.mk        | 24 +++++++++----------
 9 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/development/makefiles/conan.mk b/development/makefiles/conan.mk
index 64dacde6f..702594840 100644
--- a/development/makefiles/conan.mk
+++ b/development/makefiles/conan.mk
@@ -49,3 +49,9 @@ export CONANEXAMPLECONF
 $(CONAN_CONFIG):
 	$(QUIET) $(ECHO) "$$CONANEXAMPLECONF" >> $@
 
+
+
+$(CONAN_BIN):
+	$(QUIET) $(MKDIR) -p $(VENDOR_PATH)
+	$(QUIET) $(WGET) -O $(CONAN_BIN) http://download.schukai.com/tools/conan/conan-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`)
+	$(QUIET) $(CHMOD) u+x $(CONAN_BIN)
diff --git a/development/makefiles/directories-go-lib.mk b/development/makefiles/directories-go-lib.mk
index 5dd10706f..257f8ab40 100644
--- a/development/makefiles/directories-go-lib.mk
+++ b/development/makefiles/directories-go-lib.mk
@@ -10,6 +10,7 @@ APPLICATION_PATH          ?=   $(PROJECT_ROOT)
 DEPLOYMENT_PATH           ?=   $(PROJECT_ROOT)
 DEVELOPMENT_PATH          ?=   $(PROJECT_ROOT)
 DOCUMENTATION_PATH        ?=   $(PROJECT_ROOT)
+DOCUMENTATION_CONFIG_PATH ?=   $(DOCUMENTATION_PATH)config/
 
 RESOURCE_PATH             ?=   $(APPLICATION_PATH)
 SOURCE_PATH               ?=   $(APPLICATION_PATH)
diff --git a/development/makefiles/directories-go-utilities.mk b/development/makefiles/directories-go-utilities.mk
index f754f0370..8fc261826 100644
--- a/development/makefiles/directories-go-utilities.mk
+++ b/development/makefiles/directories-go-utilities.mk
@@ -10,6 +10,7 @@ APPLICATION_PATH          ?=   $(PROJECT_ROOT)application/
 DEPLOYMENT_PATH           ?=   $(PROJECT_ROOT)deployment/
 DEVELOPMENT_PATH          ?=   $(PROJECT_ROOT)development/
 DOCUMENTATION_PATH        ?=   $(PROJECT_ROOT)documentation/
+DOCUMENTATION_CONFIG_PATH ?=   $(DOCUMENTATION_PATH)config/
 
 RESOURCE_PATH             ?=   $(APPLICATION_PATH)resource/
 SOURCE_PATH               ?=   $(APPLICATION_PATH)source/
diff --git a/development/makefiles/directories-platform-part.mk b/development/makefiles/directories-platform-part.mk
index 63f300306..f7111b0ce 100644
--- a/development/makefiles/directories-platform-part.mk
+++ b/development/makefiles/directories-platform-part.mk
@@ -14,7 +14,7 @@ SCRIPT_PATH               ?=   $(PROJECT_ROOT)$(RELATIVE_SCRIPT_PATH)
 VENDOR_PATH               ?=   $(PROJECT_ROOT)vendor/
 NODE_PATH                 ?=   $(PROJECT_ROOT)node_modules/
 TEST_PATH                 ?=   $(PROJECT_ROOT)test/
-DEVELOPMENT_PATH		  ?=   $(PROJECT_ROOT)
+DEVELOPMENT_PATH		      ?=   $(PROJECT_ROOT)
 
 LICENSE_PATH              ?=   $(PROJECT_ROOT)
 DIST_PATH			      ?=   $(PROJECT_ROOT)dist/
diff --git a/development/makefiles/docman.mk b/development/makefiles/docman.mk
index cc61cff5b..40b21228b 100644
--- a/development/makefiles/docman.mk
+++ b/development/makefiles/docman.mk
@@ -7,4 +7,13 @@
 #############################################################################################
 
 
-DOCMAN_BIN            ?= $(VENDOR_PATH)docman
+DOCMAN_BIN           ?= $(VENDOR_PATH)docman
+DOCMAN_CONFIG_PATH   ?= $(DOCUMENTATION_CONFIG_PATH)docman.yaml
+DOCMAN_HTML_ARTEFACT ?= $(PROJECT_ROOT)deployment/build/manual.html
+DOCMAN_PDF_ARTEFACT  ?= $(PROJECT_ROOT)deployment/build/manual.pdf
+DOCMAN_SOURCE        ?= $(shell find $(DOCUMENTATION_PATH) -type f)
+
+$(DOCMAN_BIN):
+	$(QUIET) $(MKDIR) -p $(VENDOR_PATH)
+	$(QUIET) $(WGET) -O $(DOCMAN_BIN) http://download.schukai.com/tools/docman/docman-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`)
+	$(QUIET) $(CHMOD) u+x $(DOCMAN_BIN)
diff --git a/development/makefiles/target-caddy.mk b/development/makefiles/target-caddy.mk
index 4387423c6..7258e3e18 100644
--- a/development/makefiles/target-caddy.mk
+++ b/development/makefiles/target-caddy.mk
@@ -19,5 +19,6 @@ $(CADDY_BIN):
 .PHONY: run-caddy
 ## run caddy webserver
 run-caddy: $(CADDY_BIN) 
+	$(ECHOMARKER) "Run Caddy"
 	$(QUIET) $(CADDY_BIN) run -config $(CADDY_CONFIG) -pidfile $(CADDY_PIDFILE) -watch
 
diff --git a/development/makefiles/target-conan.mk b/development/makefiles/target-conan.mk
index 4a9a06ff8..1e42f1f4b 100644
--- a/development/makefiles/target-conan.mk
+++ b/development/makefiles/target-conan.mk
@@ -10,13 +10,8 @@ ifeq ($(CONAN_BIN),)
   $(error $(ERRORMARKER) Conan is not defined, check your Makefile if conan.mk is included)
 endif
 
-
-$(CONAN_BIN):
-	$(QUIET) $(MKDIR) -p $(VENDOR_PATH)
-	$(QUIET) $(WGET) -O $(CONAN_BIN) http://download.schukai.com/tools/conan/conan-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`)
-	$(QUIET) $(CHMOD) u+x $(CONAN_BIN)
-
 .PHONY: run-conan
 ## run conan webserver
 run-conan: $(CONAN_BIN) $(CONAN_CONFIG)
+	$(ECHOMARKER) "Run Conan"
 	$(QUIET) $(CONAN_BIN) server serve --config $(CONAN_CONFIG)
diff --git a/development/makefiles/target-deploy-tool.mk b/development/makefiles/target-deploy-tool.mk
index 4e69db87e..e47b89954 100644
--- a/development/makefiles/target-deploy-tool.mk
+++ b/development/makefiles/target-deploy-tool.mk
@@ -17,6 +17,7 @@ deploy: compile
 .PHONY: overview-to-s3
 ## overview-to-s3
 overview-to-s3:
+	$(ECHOMARKER) "Deploy to aws"
 	$(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.html $(UPLOAD_TOOL_URL)
 	$(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.css $(UPLOAD_TOOL_URL)
-	$(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.js $(UPLOAD_TOOL_URL)
\ No newline at end of file
+	$(QUIET) AWS_PROFILE=$(AWS_PROFILE) $(AWS) s3 cp $(WEB_PATH)/index.js $(UPLOAD_TOOL_URL)
diff --git a/development/makefiles/target-docman.mk b/development/makefiles/target-docman.mk
index 050374042..2c8424b02 100644
--- a/development/makefiles/target-docman.mk
+++ b/development/makefiles/target-docman.mk
@@ -1,4 +1,3 @@
-
 #############################################################################################
 #############################################################################################
 ##
@@ -11,28 +10,27 @@ ifeq ($(DOCMAN_BIN),)
   $(error "$(DOCMAN_BIN) is not installed. Please check your makefile and include the docman.mk")
 endif
 
-$(DOCMAN_BIN):
-	$(QUIET) $(MKDIR) -p $(VENDOR_PATH)
-	$(QUIET) $(WGET) -O $(DOCMAN_BIN) http://download.schukai.com/tools/docman/docman-$(shell uname -s | tr [:upper:] [:lower:])-$(shell echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`)
-	$(QUIET) $(CHMOD) u+x $(DOCMAN_BIN)
-
-$(PROJECT_ROOT)deployment/build/manual.html: $(DOCMAN_BIN)
-	$(DOCMAN_BIN) document html --config $(PROJECT_ROOT)documentation/config.yaml
+$(DOCMAN_HTML_ARTEFACT): $(DOCMAN_BIN) $(DOCMAN_SOURCE)
+	$(ECHOMARKER) "Build HTML Documentation"
+	$(QUIET) $(DOCMAN_BIN) document html --config $(DOCMAN_CONFIG_PATH)
 
-$(PROJECT_ROOT)deployment/build/manual.pdf: $(DOCMAN_BIN)
-	$(DOCMAN_BIN) document pdf --config $(PROJECT_ROOT)documentation/config.yaml
+$(DOCMAN_PDF_ARTEFACT): $(DOCMAN_BIN) $(DOCMAN_SOURCE)
+	$(ECHOMARKER) "Build PDF Documentation"
+	$(QUIET) $(DOCMAN_BIN) document pdf --config $(DOCMAN_CONFIG_PATH)
 
 .PHONY: build-doc-pdf
 ## creating the documentation in pdf format
-build-doc-pdf: $(PROJECT_ROOT)deployment/build/manual.pdf
+build-doc-pdf: $(DOCMAN_PDF_ARTEFACT)
 
 .PHONY: build-doc-html
 ## creating the documentation in html format
-build-doc-html: $(PROJECT_ROOT)deployment/build/manual.html
-
+build-doc-html: $(DOCMAN_HTML_ARTEFACT)
 
 .PHONY: build-doc
 ## creating the documentation in pdf and html format
 build-doc: build-doc-pdf build-doc-html
 
 
+
+
+
-- 
GitLab