From 66eb918a13b6607cc7bb615350a0e26f3670cd54 Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Fri, 15 May 2020 10:52:11 -0700
Subject: factored out the common code of makefiles

---
 sys/libc/rules.mk | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'sys/libc')

diff --git a/sys/libc/rules.mk b/sys/libc/rules.mk
index 36cf1a7..f017738 100644
--- a/sys/libc/rules.mk
+++ b/sys/libc/rules.mk
@@ -1,42 +1,23 @@
-# ---- Push on stack ----
-SP 			   := $(SP).x
-DIRSTACK_$(SP) := $(d)
-d 			   := $(DIR)
+include share/push.mk
 
 # Iterate through subdirectory tree
 
 # Local sources
 SRCS_$(d) := $(wildcard $(d)/*.c)
-OBJS_$(d) := $(SRCS_$(d):.c=.o)
-OBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(OBJS_$(d)))
-DEPS_$(d) := $(OBJS_$(d):.o=.d)
-
-OBJS := $(OBJS) $(OBJS_$(d))
-DEPS := $(DEPS) $(DEPS_$(d))
-
-# Local targets
 LIBS_$(d) := $(d)/libc.a
-LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d)))
-LIBS 	  := $(LIBS) $(LIBS_$(d))
-
 BINS_$(d) :=
-BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d)))
-BINS 	  := $(BINS) $(BINS_$(d))
+
+include share/paths.mk
 
 # Local rules
 # $(LIBS_$(d)) = TGTINCS  :=
 # $(LIBS_$(d)) = TGTLIBS  :=
 
 $(LIBS_$(d)): TCFLAGS := -ffreestanding -fno-builtin -nostdlib
-
 $(LIBS_$(d)): $(OBJS_$(d))
 	$(ARCHIVE)
 
 $(BINS_$(d)): $(OBJ_DIR)/libn/test.o
 	$(LINK)
 
-# ---- Pop off stack ----
--include $(DEPS_$(d))
-
-d  := $(DIRSTACK_$(SP))
-SP := $(basename $(SP))
+include share/pop.mk
-- 
cgit v1.2.1