dd

diff --git a/Makefile b/Makefile
index 6a35ba9f6e707a60b029f77b3bca7b4434434034..06ab9f082f466beae167126d7899c33508b697ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
 
-WORK_DIR       = /var/www/ros.vados.ru
-FuncFile       ?= AM-GlobalFunc.rsc
-ALL_RSC                := $(wildcard *.rsc */*.rsc)
+WorkFiles      := checksums.json AM-GlobalFunc.rsc
+WORK_DIR       := /var/www/ros.vados.ru
+
 
 DATE            ?= $(shell (date '+%T %d.%m.%Y'))
 DTSTAMP         ?= $(shell (date '+%Y%d%m%H%M%S'))
@@ -11,20 +11,28 @@ OWNER           ?= $(shell whoami)
 
 #SEDCMD                ?= $(shell sed -e "/^:global CommitId/c :global CommitId \"${COMMITID:-unknown}\";")/$(shell sed )
 
+all: $(WorkFiles)
+
+.PHONY: $(WorkFiles)
+
+checksums.json : ALL_RSC := $(wildcard *.rsc */*.rsc)
+
 
-.PHONY: all checksums
-#commitinfo
-# commitinfo
-# rsc clean
 
-all: checksums $(FuncFile)
-#commitinfo
+ifeq ($@,checksums.json)
+define get-sums =
+    cd $(WORK_DIR)/html && \
+    md5sum $(find -name '*.rsc' | sort) | \
+    sed -e "s| \./||" -e 's|.rsc$||' | \
+    jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add' > $@
+endef
+endef
 
+$(WorkFiles):
 
 #      @cd html && $(WORK_DIR)/$(BIN_DIR)/checksums.sh $(ALL_RSC) > $@
-# md5sum $(find -name $(All_RSC) | sort) | \
-#    sed -e "s| \./||" -e 's|.rsc$||' | \
-#    jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add' > $@
+ $(shell md5sum \$(find -name '*.rsc' | sort) | sed -e "s| \./||" -e 's|.rsc$||' | jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add')
+endif
 
 checksums: checksums.json
            cd $(WORK_DIR)/html
@@ -38,13 +46,17 @@ checksums.json: $(WORK_DIR)/bin/checksums.sh $(ALL_RSC)
 AM-GlobalFunc.rsc: COMMITID    := $(VERSION)
 AM-GlobalFunc.rsc: COMMITINFO  := "$(DATE) - Commit owner: $(OWNER)"
 
-$(FuncFile):
-       sed \
-    -e "/^:global CommitId/c :global CommitId \"${COMMITID:-unknown}\";" \
-    -e "/^:global CommitInfo/c :global CommitInfo \"${COMMITINFO:-unknown}\";" \
-    < "html/$@"
+define sed-cmd =
+    cd $(WORK_DIR) && \
+    sed \
+       -e "/^:global CommitId/c :global CommitId \"${COMMITID:-unknown}\";" \
+       -e "/^:global CommitInfo/c :global CommitInfo \"${COMMITINFO:-unknown}\";" \
+       < "./html/${1}"
+endef
 
-#    $(sed-cmd);
+$(FuncFile): ./html/$@
+       $(sed-cmd) $< > $<~
+       mv $<~ $<
 
 #$(WORK_DIR)/html/AM-GlobalFunc.rsc
 #      cd $(WORK_DIR)/html && $(WORK_DIR)/bin/commitinfo.sh $< > $<~
@@ -59,6 +71,18 @@ $(FuncFile):
 #push: 
 #      git $@ origin
 
+#ifeq (git,$(firstword $(MAKECMDGOALS)))
+#    # Remaining arguments form the commit string
+#    GIT_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
+#    # ...and turn them into do-nothing targets
+#    $(eval $(GIT_ARGS):;@:)
+#endif
+
+# git function to push to repo
+#git:
+#    git add . && git commit -m "$(GIT_ARGS)" && git push
+
+
 #clean:
 #      rm -f $(HTML) checksums.json
 #      make -C tmpl/ clean