X-Git-Url: https://git.xandkar.net/?p=khome.git;a=blobdiff_plain;f=Makefile;h=ca399166d6d51defca03e08a82ab1b3412c4690a;hp=5baf8c87c07b97f59e177988da0d73250a2db65a;hb=7cdde8d9423977baf5236ecc5497f72dbbea8890;hpb=8db388f45c4f073420471e5099350513b2add0b9

diff --git a/Makefile b/Makefile
index 5baf8c8..ca39916 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ MAKEFLAGS := --no-builtin-rules
 DEPS := $(wildcard deps/*)
 
 .PHONY: \
-	default \
+    default \
+    clean \
     $(DEPS) \
     deps \
     home \
@@ -24,7 +25,8 @@ default:
 	@echo '================================================================================'
 	@exit 1
 
-home: mpdconf
+home: mpdconf compiled
+	@cp  -Rp       bin           $(HOME)/
 	@cp  -Rp  home/bin           $(HOME)/
 	@cp  -Rp  home/lib           $(HOME)/
 	@cp       home/.compton.conf $(HOME)/
@@ -32,7 +34,6 @@ home: mpdconf
 	@cp  -Rp  home/.newsboat/    $(HOME)/
 	@cp       home/.profile      $(HOME)/
 	@cp       home/.fonts.conf   $(HOME)/
-	@fc-cache -fv
 	@cp       home/.Rprofile     $(HOME)/
 	@cp       home/.tmux.conf    $(HOME)/
 	@cp       home/.xbindkeysrc  $(HOME)/
@@ -44,22 +45,46 @@ mpdconf:
 	@mkdir -p ~/var/run/mpd
 	@cp home/.mpdconf $(HOME)/
 
-pkgs_debian:
-	$(MAKE) pkgs_deb_install
-	$(MAKE) pkgs_deb_purge
-	$(MAKE) pkgs_pip
-	$(MAKE) pkgs_snap_classic
-	$(MAKE) pkgs_snap_strict
+compiled:
+	mkdir -p bin
+	cd src && make
+	mv src/clockloop bin/
+
+font_cache:
+	@fc-cache -fv
+
+#
+# Golang
+#
+pkgs_golang: list pkgs-golang.list
+	go get $(shell ./list pkgs-golang.list)
 
+#
+# Ubuntu
+#
 pkgs_ubuntu: list pkgs-ubuntu.list
 	sudo apt install $(shell ./list pkgs-ubuntu.list)
 
+pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
+	./install-debfiles pkgs-ubuntu-debfiles.list
+
+#
+# PIP
+#
+pkgs_pip:
+	sudo pip3 install $(shell ./list pkgs-pip.list)
+
+#
+# Homebrew/Mac
+#
+
 pkgs_mac:
 	$(MAKE) pkgs_brew_install
 	$(MAKE) pkgs_brew_cask_install
 
-pkgs_pip:
-	sudo pip3 install $(shell ./list pkgs-pip.list)
+# TODO: Test pkgs_brew_tap when list contains multiple items
+pkgs_brew_tap: list pkgs-brew-tap.list
+	brew tap $(shell ./list pkgs-brew-tap.list)
 
 pkgs_brew_install: list pkgs-brew-install.list
 	brew install $(shell ./list pkgs-brew-install.list)
@@ -67,12 +92,18 @@ pkgs_brew_install: list pkgs-brew-install.list
 pkgs_brew_cask_install: list pkgs-brew-cask-install.list
 	brew cask install $(shell ./list pkgs-brew-cask-install.list)
 
+#
+# Debian
+#
 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)
 
+#
+# Snap
+#
 pkgs_snap_classic: list pkgs-snap-classic.list
 	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-classic.list),pkg_snap_classic_$(p))
 
@@ -113,3 +144,7 @@ diff:
 	diff  $(HOME)/lib/login_variables.sh              home/lib/login_variables.sh              ||  true
 	diff  $(HOME)/lib/login_variables_dpi_high.sh     home/lib/login_variables_dpi_high.sh     ||  true
 	diff  $(HOME)/lib/login_variables_dpi_norm.sh     home/lib/login_variables_dpi_norm.sh     ||  true
+
+clean:
+	rm -rf ./debfiles
+	cd src && make clean