diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-01 18:37:44 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-01 18:37:44 +0100 |
| commit | 5644789d642af0199d2c96d4425e0d062ce935ac (patch) | |
| tree | a84855b8d26e8d4543d9f088e68f1d03f4e6743f | |
| parent | c7c8a96a572dd04c3aff44284c4c46da04deaa37 (diff) | |
all rule builds stuff
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | make/vars.mk | 4 |
2 files changed, 7 insertions, 11 deletions
@@ -43,22 +43,14 @@ endef # RULES # ######### -.SILENT: usage -.PHONY: usage -usage: - echo "usage:" - echo " make install" - $(foreach module,$(MODULES),echo " make install_$(module)") - echo " make reinstall" - $(foreach module,$(MODULES),echo " make reinstall_$(module)") - echo " make uninstall" - $(foreach module,$(MODULES),echo " make uninstall_$(module)") +.PHONY: all +all: $(ENV_RULES) $(MAKE_RULES) $(BUILD_RULES) $(PUSH_RULES) $(foreach module,$(MAKE_MODULES),$(eval $(call make_module_rule))) $(foreach module,$(MODULES),$(eval $(call module_env_rule))) .PHONY: install -install: $(foreach module,$(MODULES),install_$(module)) install_crontab +install: $(foreach module,$(MODULES),$(module)/.env install_$(module)) install_crontab .PHONY: uninstall uninstall: uninstall_nginx uninstall_dyndns uninstall_joeac.net_service $(foreach module,$(MODULES),uninstall_$(module)) uninstall_crontab diff --git a/make/vars.mk b/make/vars.mk index 4d7b188..925b080 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -11,6 +11,10 @@ COMPOSE_SERVICES := $(shell podman-compose config \ | yq ".services | keys" --output-format csv --csv-separator " ") MAKE_MODULES := $(foreach module,$(MODULES),\ $(shell [ -f $(module)/Makefile ] && echo $(module))) +ENV_RULES := $(foreach module,$(MODULES),$(module)/.env) +MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module)) +BUILD_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)) build_$(module)) +PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)) push_$(module)) SUBDOMAIN_http := @ SUBDOMAIN_vaultwarden := pwd SUBDOMAIN_etherpad := docs |