X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=4dd1869f742444b1873f4563bbe4c156285a8888;hb=9d9538819e154aba6520887154e11f08b65b4ae7;hp=487b43d20137249261bd48a9ef5fa1404afc558b;hpb=dffe5c946bbc4f156fe6b600c8af1c31b6bf4416;p=khome.git

diff --git a/Makefile b/Makefile
index 487b43d..4dd1869 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 MAKEFLAGS := --no-builtin-rules
 
-.PHONY: home pkgs_install pkgs_purge pkgs
+DEPS := $(wildcard deps/*)
 
-home:
+.PHONY: home pkgs_deb_install pkgs_deb_purge pkgs deps $(DEPS) pkgs_snap_classic pkgs_snap_strict mpdconf
+
+home: mpdconf
 	@cp  -Rp  home/bin           $(HOME)/
 	@cp  -Rp  home/lib           $(HOME)/
 	@cp       home/.compton.conf $(HOME)/
@@ -11,16 +13,45 @@ home:
 	@cp       home/.fonts.conf   $(HOME)/
 	@fc-cache                    $(HOME)/.fonts
 	@cp       home/.Rprofile     $(HOME)/
-	@cp       home/.mpdconf      $(HOME)/
 	@cp       home/.tmux.conf    $(HOME)/
 	@cp       home/.xbindkeysrc  $(HOME)/
 
+mpdconf:
+	@mkdir -p ~/Archives/Audio
+	@mkdir -p ~/var/lib/mpd/playlists
+	@mkdir -p ~/var/log/mpd
+	@mkdir -p ~/var/run/mpd
+	@cp home/.mpdconf $(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_deb_purge: list pkgs-deb-purge.list
+	sudo apt purge $(shell ./list pkgs-deb-purge.list)
+
+pkgs_snap_classic: list pkgs-snap-classic.list
+	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-classic.list),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))
+
+# 'snap' command comes from 'snapd' deb pkg
+pkg_snap_classic_%:
+	sudo snap install --classic $*
+pkg_snap_strict_%:
+	sudo snap install $*
+
+deps: $(DEPS)
 
-pkgs_install: list pkgs-install
-	sudo apt install $(shell ./list pkgs-install)
+define GEN_DEP_RULE
+$(1):
+	cd $1 && make
+endef
 
-pkgs_purge: list pkgs-purge
-	sudo apt purge $(shell ./list pkgs-purge)
+$(foreach d,$(DEPS),$(eval $(call GEN_DEP_RULE,$(d))))