From 66eb918a13b6607cc7bb615350a0e26f3670cd54 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Fri, 15 May 2020 10:52:11 -0700 Subject: factored out the common code of makefiles --- sys/libbio/rules.mk | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'sys/libbio/rules.mk') diff --git a/sys/libbio/rules.mk b/sys/libbio/rules.mk index ff71746..fbba7df 100644 --- a/sys/libbio/rules.mk +++ b/sys/libbio/rules.mk @@ -1,7 +1,4 @@ -# ---- Push on stack ---- -SP := $(SP).x -DIRSTACK_$(SP) := $(d) -d := $(DIR) +include share/push.mk # Iterate through subdirectory tree DIR := $(d)/io @@ -9,21 +6,11 @@ include $(DIR)/rules.mk # 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)/libbio.a -LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d))) -LIBS := $(LIBS) $(LIBS_$(d)) +BINS_$(d) := +TSTS_$(d) := $(d)/test $(d)/simulate -BINS_$(d) := $(d)/test $(d)/simulate -BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) -BINS := $(BINS) $(BINS_$(d)) +include share/paths.mk # Local rules # $(LIBS_$(d)) = TCFLAGS := @@ -38,8 +25,4 @@ $(BINS_$(d)): $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a @echo BIN $@ @$(LINK) -# ---- Pop off stack ---- --include $(DEPS_$(d)) - -d := $(DIRSTACK_$(SP)) -SP := $(basename $(SP)) +include share/pop.mk -- cgit v1.2.1