hyutih

diff --git a/Makefile b/Makefile
index 06ab9f082f466beae167126d7899c33508b697ce..6dbc20a6dc63e6318028c7f346d3a23a3d0115d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@
 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'))
 VERSION         ?= $(shell git symbolic-ref --short HEAD 2>/dev/null)/$(shell git rev-list --count HEAD 2>/dev/null)/$(shell git rev-parse --short=8 HEAD 2>/dev/null)
@@ -16,22 +15,31 @@ all: $(WorkFiles)
 .PHONY: $(WorkFiles)
 
 checksums.json : ALL_RSC := $(wildcard *.rsc */*.rsc)
+AM-GlobalFunc.rsc : COMMITID   := $(VERSION)
+AM-GlobalFunc.rsc : COMMITINFO := "$(DATE) - Commit owner: $(OWNER)"
 
-
+ifeq ($@,AM-GlobalFunc.rsc)
+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
+endif
 
 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
+       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
+endif
 
 $(WorkFiles):
-
-#      @cd html && $(WORK_DIR)/$(BIN_DIR)/checksums.sh $(ALL_RSC) > $@
- $(shell md5sum \$(find -name '*.rsc' | sort) | sed -e "s| \./||" -e 's|.rsc$||' | jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add')
+ifeq ($@,checksums.json)
+       $(get-sums) $(ALL_RSC); > $@
 endif
 
 checksums: checksums.json
@@ -40,19 +48,6 @@ checksums: checksums.json
 checksums.json: $(WORK_DIR)/bin/checksums.sh $(ALL_RSC)
        $(WORK_DIR)/bin/checksums.sh > $(WORK_DIR)/html/$@
 
-#commitinfo: $(FuncFile)
-
-.PHONY: $(FuncFile)
-AM-GlobalFunc.rsc: COMMITID    := $(VERSION)
-AM-GlobalFunc.rsc: COMMITINFO  := "$(DATE) - Commit owner: $(OWNER)"
-
-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
 
 $(FuncFile): ./html/$@
        $(sed-cmd) $< > $<~