From f319c240efe81120440881b0fc53adc006eec535 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Nov 2019 13:48:52 +0000
Subject: [PATCH] move much into usual.mk.in

---
 Subdir.mk.in         | 23 +----------------------
 subdirmk/usual.mk.in | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 subdirmk/usual.mk.in

diff --git a/Subdir.mk.in b/Subdir.mk.in
index cd8fa53..e80ef52 100644
--- a/Subdir.mk.in
+++ b/Subdir.mk.in
@@ -1,26 +1,5 @@
-#
-
-VPATH		= &^
-
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-bindir		= @bindir@
-
-CC		?= @CC@
-CFLAGS		?= @CFLAGS@
-DEFS		?= @DEFS@
-INCLUDES	?= @INCLUDES@
-LD		?= @CC@
-LDFLAGS		?= @LDFLAGS@
-LIBS		?= @LIBS@
 
 INCLUDES	+= -I&^/lib/
 
-LINK		?= $(CC) -o$@ $(CFLAGS) $(LDFLAGS)
-AR		?= ar
-COMPILE		?= $(CC) -c -o$@ -MD $(DEFS) $(INCLUDES) $(CFLAGS)
-
-%.o: %.c
-	$(COMPILE) $<
-
+&:include subdirmk/usual.mk.in
 include subdirmk/regen.mk
diff --git a/subdirmk/usual.mk.in b/subdirmk/usual.mk.in
new file mode 100644
index 0000000..c961915
--- /dev/null
+++ b/subdirmk/usual.mk.in
@@ -0,0 +1,22 @@
+#
+
+VPATH		= &^
+
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+bindir		= @bindir@
+
+CC		?= @CC@
+CFLAGS		?= @CFLAGS@
+DEFS		?= @DEFS@
+INCLUDES	?= @INCLUDES@
+LD		?= @CC@
+LDFLAGS		?= @LDFLAGS@
+LIBS		?= @LIBS@
+
+LINK		?= $(CC) -o$@ $(CFLAGS) $(LDFLAGS)
+AR		?= ar
+COMPILE		?= $(CC) -c -o$@ -MD $(DEFS) $(INCLUDES) $(CFLAGS)
+
+%.o: %.c
+	$(COMPILE) $<
-- 
2.30.2