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/libn/rules.mk | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

(limited to 'sys/libn')

diff --git a/sys/libn/rules.mk b/sys/libn/rules.mk
index 7efcae6..bd3308a 100644
--- a/sys/libn/rules.mk
+++ b/sys/libn/rules.mk
@@ -1,37 +1,13 @@
-# ---- Push on stack ----
-SP 			   := $(SP).x
-DIRSTACK_$(SP) := $(d)
-d 			   := $(DIR)
-
-# Iterate through subdirectory tree
-# DIR := $(d)/bufio
-# include $(DIR)/rules.mk
-# ...
+include share/push.mk
 
 # Local sources 
 SRCS_$(d) := $(wildcard $(d)/*.c)
 ASMS_$(d) := $(wildcard $(d)/*.s)
-OBJS_$(d) := $(SRCS_$(d):.c=.o)
-OBJS_$(d) += $(ASMS_$(d):.s=.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)/libn.a
-LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d)))
-LIBS 	  := $(LIBS) $(LIBS_$(d))
+BINS_$(d) := 
+TSTS_$(d) := $(d)/test
 
-BINS_$(d) := $(d)/test
-BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d)))
-BINS 	  := $(BINS) $(BINS_$(d))
-
-# Local rules
-# $(LIBS_$(d)) := TCFLAGS := 
-# $(LIBS_$(d)) := TCINCS  := 
-# $(LIBS_$(d)) := TCLIBS  := 
+include share/paths.mk
 
 $(LIBS_$(d)): $(OBJS_$(d))
 	@echo LIB $@
@@ -42,8 +18,4 @@ $(BINS_$(d)): $(OBJ_DIR)/libn/test.o $(LIBS_$(d))
 	@echo BIN $@
 	@$(LINK)
 
-# ---- Pop off stack ----
--include $(DEPS_$(d))
-
-d  := $(DIRSTACK_$(SP))
-SP := $(basename $(SP))
+include share/pop.mk
-- 
cgit v1.2.1