joeac/joeac.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reorganises Makefile, adds headings

Browse Source
This commit is contained in:
Joe Carstairs
2026-06-17 18:31:46 +01:00
parent 574b2d6646
commit e506f7c2e6
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http/Makefile
+31 -14
View File
@@ -1,23 +1,47 @@
include config.mk include config.mk
#############
# VARIABLES #
#############
src_files := $(filter-out %.args,$(wildcard src/*.upp*)) src_files := $(filter-out %.args,$(wildcard src/*.upp*))
src_files += $(filter-out %.args,$(wildcard src/**/*.upp*)) src_files += $(filter-out %.args,$(wildcard src/**/*.upp*))
src_files_ext := $(suffix $(src_files)) src_files_ext := $(suffix $(src_files))
out_deps_ext := $(src_files_ext:.upp%=%) out_deps_ext := $(src_files_ext:.upp%=%)
layout_files := $(wildcard share/layouts/*.layout.upp*) layout_files := $(wildcard share/layouts/*.layout.upp*)
layouts := $(notdir $(basename $(basename $(layout_files)))) layouts := $(notdir $(basename $(basename $(layout_files))))
out_deps := $(addprefix out/,$(src_files:src/%=%)) out_deps := $(addprefix out/,$(src_files:src/%=%))
remove_layout_from_out_deps = out_deps := $$(subst $(1).upp,.,$$(out_deps)) remove_layout_from_out_deps = out_deps := $$(subst $(1).upp,.,$$(out_deps))
$(foreach layout,$(layouts),$(eval $(call remove_layout_from_out_deps,.$(layout)))) $(foreach layout,$(layouts),$(eval $(call remove_layout_from_out_deps,.$(layout))))
$(eval $(call remove_layout_from_out_deps,)) $(eval $(call remove_layout_from_out_deps,))
blogs := $(subst blogs/,,$(wildcard blogs/*))
#############
# FUNCTIONS #
#############
blog_post_target = src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml
blog_post_src = blogs/$(blog)/%.$(BLOG_EXT_$(blog)) $$(wildcard bin/*)
blog_src = $(patsubst \
blogs/$(blog)/%.$(BLOG_EXT_$(blog)),\
src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml,\
$(shell find -L "blogs/$(blog)" -type f -and -name *.$(BLOG_EXT_$(blog))))
define out_rule = define out_rule =
out/%.$(ext): src/%$(layout).upp$(ext) out/%.$(ext): src/%$(layout).upp$(ext)
./bin/mkws https://joeac.net "$$$$(realpath $$<)" ./bin/mkws https://joeac.net "$$$$(realpath $$<)"
endef endef
blog_post_target = src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml define blog_rule =
blog_post_src = blogs/$(blog)/%.$(BLOG_EXT_$(blog)) $$(wildcard bin/*) .PHONY: $(blog)
$(blog): $(blog_src)
endef
define blog_post_rule = define blog_post_rule =
$(blog_post_target): $(blog_post_src) $(blog_post_target): $(blog_post_src)
./bin/blog \ ./bin/blog \
@@ -27,24 +51,17 @@ $(blog_post_target): $(blog_post_src)
-f $$*.$(BLOG_EXT_$(blog)) -f $$*.$(BLOG_EXT_$(blog))
endef endef
blogs := $(subst blogs/,,$(wildcard blogs/*))
blog_src = $(patsubst \
blogs/$(blog)/%.$(BLOG_EXT_$(blog)),\
src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml,\
$(shell find -L "blogs/$(blog)" -type f -and -name *.$(BLOG_EXT_$(blog))))
define blog_rule =
.PHONY: $(blog)
$(blog): $(blog_src)
endef
define prune_blog_rule = define prune_blog_rule =
.PHONY: prune_$(blog) .PHONY: prune_$(blog)
prune_$(blog): prune_$(blog):
./bin/prune_blog $(blog) ./bin/prune_blog $(blog)
endef endef
#########
# RULES #
#########
all: $(blogs) public out all: $(blogs) public out
.PHONY: out .PHONY: out