X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=261b5a5eac59fd2610d84285a4966290dea66d09;hb=af6e57a29f394428d2fd5a1ddbf57b8c9eadb454;hp=fe48ead1705d8ec382847d97fb39c367be9f8fa0;hpb=6ce658414bdcf1b4485d57a60de751ff26b077c5;p=khome.git

diff --git a/Makefile b/Makefile
index fe48ead..261b5a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 MAKEFLAGS := --no-builtin-rules
 
-.PHONY: home pkgs_install pkgs_purge pkgs deps
+DEPS := $(wildcard deps/*)
+
+.PHONY: home pkgs_deb_install pkgs_deb_purge pkgs deps $(DEPS) pkgs_snap_classic pkgs_snap_strict
 
 home:
 	@cp  -Rp  home/bin           $(HOME)/
@@ -16,22 +18,34 @@ home:
 	@cp       home/.xbindkeysrc  $(HOME)/
 
 pkgs:
-	$(MAKE) pkgs_install
-	$(MAKE) pkgs_purge
+	$(MAKE) pkgs_deb_install
+	$(MAKE) pkgs_deb_purge
 	$(MAKE) pkgs_snap_classic
+	$(MAKE) pkgs_snap_strict
+
+pkgs_deb_install: list pkgs-deb-install.list
+	sudo apt install $(shell ./list pkgs-deb-install.list)
 
-pkgs_install: list pkgs-install
-	sudo apt install $(shell ./list pkgs-install)
+pkgs_deb_purge: list pkgs-deb-purge.list
+	sudo apt purge $(shell ./list pkgs-deb-purge.list)
 
-pkgs_purge: list pkgs-purge
-	sudo apt purge $(shell ./list pkgs-purge)
+pkgs_snap_classic: list pkgs-snap-classic.list
+	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-classic.list),pkg_snap_classic_$(p))
 
-pkgs_snap_classic: list pkgs-snap-classic
-	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-classic),pkg_snap_classic_$(p))
+pkgs_snap_strict: list pkgs-snap-strict.list
+	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-strict.list),pkg_snap_strict_$(p))
 
-# Depends on 'snapd' deb pkg being already installed
+# 'snap' command comes from 'snapd' deb pkg
 pkg_snap_classic_%:
 	sudo snap install --classic $*
+pkg_snap_strict_%:
+	sudo snap install $*
+
+deps: $(DEPS)
+
+define GEN_DEP_RULE
+$(1):
+	cd $1 && make
+endef
 
-deps:
-	@$(foreach d,$(wildcard deps/*),cd $(d) && make)
+$(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))