From 4f481eab630d97376723da28719f517b7ad08c44 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 10 Jun 2017 23:46:52 +1200
Subject: Makefile refactor

Tried using the POSIX make on OpenIndiana and it got confused by the
implicit dependencies, being a little more explicit seems to have coaxed
it into working.
---
 Makefile | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b302c217..516ddf68 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,16 @@ BINS = bin/ap \
 	bin/xrbg \
 	bin/xrq
 
-BINS_MI5 = bin/chn.sh \
+BINS_M4 = bin/chn.m4 \
+	bin/edda.m4 \
+	bin/pst.m4 \
+	bin/rndl.m4 \
+	bin/swr.m4 \
+	bin/tlcs.m4 \
+	bin/try.m4 \
+	bin/urlc.m4
+
+BINS_SH = bin/chn.sh \
 	bin/edda.sh \
 	bin/pst.sh \
 	bin/rndl.sh \
@@ -226,23 +235,9 @@ all: $(BINS) git/gitconfig gnupg/gpg.conf
 clean distclean:
 	rm -f -- \
 		$(BINS) \
+		$(BINS_M4) \
+		$(BINS_SH) \
 		$(GAMES) \
-		bin/chn.sh \
-		bin/chn.m4 \
-		bin/edda.sh \
-		bin/edda.m4 \
-		bin/pst.sh \
-		bin/pst.m4 \
-		bin/rndl.sh \
-		bin/rndl.m4 \
-		bin/swr.sh \
-		bin/swr.m4 \
-		bin/tlcs.sh \
-		bin/tlcs.m4 \
-		bin/try.sh \
-		bin/try.m4 \
-		bin/urlc.sh \
-		bin/urlc.m4 \
 		git/gitconfig \
 		git/gitconfig.m4 \
 		gnupg/gpg.conf \
@@ -279,7 +274,14 @@ clean distclean:
 .m4.sh:
 	m4 < $< > $@
 
-$(BINS_MI5): include/mktd.m4
+bin/chn.sh: bin/chn.m4 include/mktd.m4
+bin/edda.sh: bin/edda.m4 include/mktd.m4
+bin/pst.sh: bin/pst.m4 include/mktd.m4
+bin/rndl.sh: bin/rndl.m4 include/mktd.m4
+bin/swr.sh: bin/swr.m4 include/mktd.m4
+bin/tlcs.sh: bin/tlcs.m4 include/mktd.m4
+bin/try.sh: bin/try.m4 include/mktd.m4
+bin/urlc.sh: bin/urlc.m4 include/mktd.m4
 
 git/gitconfig: git/gitconfig.m4
 	m4 \
@@ -501,7 +503,7 @@ check: check-bin \
 check-bash:
 	sh check/bash.sh
 
-check-bin: $(BINS_MI5)
+check-bin: $(BINS_SH)
 	sh check/bin.sh
 
 check-games:
-- 
cgit v1.2.3