Parcourir la source

:beetle: Fix make cleaning

The aggregated yml file must be destroyed as well.
DricomDragon il y a 1 an
Parent
commit
b60e050a33
1 fichiers modifiés avec 11 ajouts et 9 suppressions
  1. 11 9
      makefile

+ 11 - 9
makefile

@@ -5,17 +5,18 @@ DIST_DIR := dist
 SRC_HTMLS := $(shell find src -name '*.src.html')
 SRC_MDS := $(shell find src -name '*.src.md')
 SRC_TEMPLATES := $(shell find src/templates -name '*.html')
+SRC_LIST_YML := $(shell echo src/projets/*/*.meta.yml)
 
 GEN_HTMLS := $(SRC_HTMLS:%.src.html=%.gen.html)
 GEN_MDS := $(SRC_MDS:%.src.md=%.gen.html)
-GEN_FILES := $(GEN_HTMLS) $(GEN_MDS)
-
-LISTED_META_FILES := $(shell echo src/projets/*/*.meta.yml)
+GEN_LIST_YML := 'src/projets/list.gen.yml'
+GEN_CONTENT_FILES := $(GEN_HTMLS) $(GEN_MDS)
+GEN_FILES := $(GEN_CONTENT_FILES) $(GEN_LIST_YML)
 
 INCLUDED_FILES := $(shell find src/include -type f)
 EMBEDDED_FILES := $(shell find src -name '*.png' -or -name '*.svg' -or -name '*.pdf')
 
-DIST_GEN_FILES := $(GEN_FILES:src/%.gen.html=$(DIST_DIR)/%.html)
+DIST_GEN_FILES := $(GEN_CONTENT_FILES:src/%.gen.html=$(DIST_DIR)/%.html)
 DIST_INC_FILES := $(INCLUDED_FILES:src/%=$(DIST_DIR)/%)
 DIST_EMB_FILES := $(EMBEDDED_FILES:src/%=$(DIST_DIR)/%)
 DIST_FILES := $(DIST_GEN_FILES) $(DIST_INC_FILES) $(DIST_DWN_FILES) $(DIST_EMB_FILES) $(DIST_DIR)/favicon.ico
@@ -25,7 +26,7 @@ LIST_GEN := yq eval-all '. as $$item ireduce ([]; . + $$item ) | {"list": .}'
 
 # Build
 .PHONY: build
-build: $(GEN_FILES)
+build: $(GEN_CONTENT_FILES)
 	$(info HTML generated)
 
 %.gen.html: %.src.html %.meta.yml $(SRC_TEMPLATES)
@@ -35,11 +36,11 @@ build: $(GEN_FILES)
 	$(PANDOC_GEN) --metadata-file $*.meta.yml --output $@ $<
 
 # Build lists
-src/projets/list.gen.yml: $(LISTED_META_FILES)
-	$(LIST_GEN) $(LISTED_META_FILES) > $@
+$(GEN_LIST_YML): $(SRC_LIST_YML)
+	$(LIST_GEN) $(SRC_LIST_YML) > $@
 
-src/projets/content.gen.html: src/projets/content.src.html src/projets/content.meta.yml src/projets/list.gen.yml
-	$(PANDOC_GEN) --metadata-file src/projets/content.meta.yml --metadata-file src/projets/list.gen.yml --output $@ $<
+src/projets/content.gen.html: src/projets/content.src.html src/projets/content.meta.yml $(GEN_LIST_YML)
+	$(PANDOC_GEN) --metadata-file src/projets/content.meta.yml --metadata-file $(GEN_LIST_YML) --output $@ $<
 
 # Distribution
 .PHONY: dist
@@ -76,6 +77,7 @@ debug:
 	$(info GEN_HTMLS $(GEN_HTMLS))
 	$(info GEN_MDS $(GEN_MDS))
 	$(info GEN_FILES $(GEN_FILES))
+	$(info GEN_CONTENT_FILES $(GEN_CONTENT_FILES))
 	$(info INCLUDED_FILES $(INCLUDED_FILES))
 	$(info EMBEDDED_FILES $(EMBEDDED_FILES))
 	$(info DIST_FILES $(DIST_FILES))