From 5514e9236440b032436185d62cea53505cf283c1 Mon Sep 17 00:00:00 2001
From: Suleyman Farajli <suleyman@farajli.net>
Date: Thu, 26 Jun 2025 14:08:52 +0400
Subject: refactor(makefile): clean up directories and improve dependency
 handling

- Dropped creating optional directories
- Ensured required directories (bin, config, fonts) are created via explicit rules
- Made 'config' and 'scripts' targets depend on directory rules instead
- Added 'check' as a prerequisite to relevant install targets for consistency
---
 Makefile | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index ef4c91f..c46ded3 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,8 @@ SOFTWARE    = $(DWM) $(DMENU) $(SLSTATUS) $(ST)
 ARCHIVE     = $(SOFTWARE:=.tar.gz) $(FONTS:=.tar.gz)
 
 BINDIR      = $(HOME)/.local/bin
-BOOKDIR     = $(HOME)/tproj
 CONFDIR     = $(HOME)/.config
 FONTDIR     = $(HOME)/.local/share/fonts/
-MUSICDIR    = $(HOME)/music
-PROJDIR     = $(HOME)/proj
-TESTPROJDIR = $(HOME)/tproj
 
 BASHPROFILE = $(HOME)/.bash_profile
 BASHRC      = $(HOME)/.bashrc
@@ -33,9 +29,12 @@ all: config directory scripts
 
 full: config desktop directory scripts
 
-desktop: dmenu-install dwm-install font1-install font2-install check slstatus-install st-install
+desktop: dmenu-install dwm-install font1-install font2-install slstatus-install st-install
 
-config:
+$(BINDIR) $(CONFDIR) $(FONTDIR):
+	mkdir -p $@
+
+config: $(CONFDIR)
 	mkdir -p                                $$(dirname $(ZCACHE))
 	mkdir -p                                $(CONFDIR)/sites
 	touch                                   $(ZCACHE)
@@ -66,7 +65,7 @@ git:
 	@echo "    gpg --list-secret-keys --keyid-format=long" >&2
 	@echo "    git config --global user.signingkey <YOUR_KEY_ID>" >&2
 
-scripts:
+scripts: $(BINDIR)
 	mkdir -p          $(BINDIR)
 	$(COPY) scripts/* $(BINDIR)
 
@@ -81,18 +80,9 @@ server:
 arch-linux:
 	sudo $(COPY) distros/arch-linux/pacman.conf /etc
 
-directory:
-	mkdir -p \
-		$(BINDIR)      \
-		$(BOOKDIR)     \
-		$(CONFDIR)     \
-		$(MUSICDIR)    \
-		$(PROJDIR)     \
-		$(TESTPROJDIR)
-
 sync: $(ARCHIVE)
 
-$(ARCHIVE):
+$(ARCHIVE): check
 	curl -LO https://farajli.net/archive/$@
 
 dmenu-install: $(DMENU).tar.gz
@@ -102,11 +92,11 @@ st-install: $(ST).tar.gz
 font1-install: $(FONT1).tar.gz
 font2-install: $(FONT2).tar.gz
 
-dmenu-install dwm-install slstatus-install st-install:
+dmenu-install dwm-install slstatus-install st-install: check
 	tar xf $<
 	PREFIX=~/.local make -C $$(basename $< .tar.gz) install
 
-font1-install font2-install:
+font1-install font2-install: $(FONTDIR) check
 	tar xf $<
 	$(COPY) $$(basename $< .tar.gz) $(FONTDIR)
 	fc-cache
-- 
cgit v1.2.3