From 15ebc14a1f9d962fd0640a14fc13ef2872b9b1b5 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 29 Oct 2018 00:53:05 -0400
Subject: more reorganizing

---
 Makefile | 58 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index da8e81b..0af6c0e 100644
--- a/Makefile
+++ b/Makefile
@@ -74,26 +74,28 @@ EMPTYDIRS := \
     .config/alacritty \
     .config/touchegg
 
+INSTALLED := \
+    $(patsubst %,$(INTO)/%,$(EMPTYDIRS) $(INSTALL)) \
+    /var/spool/cron/$(USER) \
+    $(INTO)/Maildir/.notmuch
+
 BUILD := \
     $(patsubst services/available/%,services/enabled/%,$(wildcard services/available/*)) \
-    bin/local/timettyrec \
     $(addsuffix .dat,$(filter-out %.dat,$(wildcard fortune/*))) \
     $(addsuffix tags,$(wildcard vim/pack/*/start/*/doc/)) \
     vim/spell/en.utf-8.add.spl \
     less \
     wunderground \
-    mpdscribble/mpdscribble.conf
-
-INSTALLED := \
-    $(patsubst %,$(INTO)/%,$(EMPTYDIRS) $(INSTALL)) \
-    /var/spool/cron/$(USER) \
-    $(INTO)/Maildir/.notmuch
+    mpdscribble/mpdscribble.conf \
+    bin/local/timettyrec
 
 ECHO      = @echo
 LN        = @ln -sf
 MKDIR     = @mkdir -p
 RM        = @rm -f
 
+# named targets
+
 all : submodules build
 
 submodules :
@@ -120,24 +122,41 @@ versions :
 updates :
 	@git submodule foreach -q 'if [ $$path == "vim/pack/filetype/start/perl" ]; then if [ $$(git rev-parse dev) != $$sha1 ]; then git lg dev...$$sha1; fi; else if [ $$(git rev-parse master) != $$sha1 ]; then git lg master...$$sha1; fi; fi'
 
+.PHONY: all submodules build install clean update versions updates
+
+# installation targets
+
 $(patsubst %,$(INTO)/%,$(EMPTYDIRS)) :
-	@mkdir -p $@
+	$(MKDIR) $@
 
 $(patsubst %,$(INTO)/%,$(INSTALL)) : $(INTO)/.% : %
 	@[ ! -e $@ ] || [ -h $@ ] || mv -f $@ $@.bak
 	$(LN) $(PWD)/$< $@
 
-services/enabled/% : services/available/%
-	@mkdir -p services/enabled
-	$(LN) ../available/$(notdir $<) $@
-
 /var/spool/cron/$(USER) : crontab
 	@crontab $<
 
+$(INTO)/Maildir/.notmuch: notmuch
+	$(MKDIR) $(INTO)/Maildir
+	@[ ! -e $@ ] || [ -h $@ ] || mv -f $@ $@.bak
+	$(LN) $(PWD)/$< $@
+
+# build targets
+
+services/enabled/% : services/available/%
+	$(MKDIR) services/enabled
+	$(LN) ../available/$(notdir $<) $@
+
 fortune/%.dat : fortune/%
-	@echo "Compiling $@"
+	$(ECHO) "Compiling $@"
 	@strfile -s $(basename $@)
 
+%/doc/tags: %/doc
+	@vim -u NONE -c':helptags $< | :q'
+
+%.spl : %
+	@vim -u NONE -c':mkspell! $< | :q'
+
 less : lesskey
 	lesskey -o $@ $<
 
@@ -146,16 +165,3 @@ wunderground :
 
 mpdscribble/mpdscribble.conf : mpdscribble/mpdscribble.conf.tmpl
 	perl -E'while (<STDIN>) { if (/^password =/) { say "password = $$ARGV[0]" } else { print } }' "$$(pass show websites/last.fm/doyster)" < $< > $@
-
-$(INTO)/Maildir/.notmuch: notmuch
-	mkdir -p $(INTO)/Maildir
-	@[ ! -e $@ ] || [ -h $@ ] || mv -f $@ $@.bak
-	$(LN) $(PWD)/$< $@
-
-%.spl : %
-	@vim -u NONE -c':mkspell! $< | :q'
-
-%/doc/tags: %/doc
-	@vim -u NONE -c':helptags $< | :q'
-
-.PHONY: build submodules install clean update
-- 
cgit v1.2.3-54-g00ecf