From e97c8c469db0aa27985dab2879dc1f14905c7387 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Sat, 20 Nov 2021 11:55:55 -0800 Subject: chore: simplify makefiles --- sys/rules.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sys/rules.mk') diff --git a/sys/rules.mk b/sys/rules.mk index 3113915..4bba9aa 100644 --- a/sys/rules.mk +++ b/sys/rules.mk @@ -1,9 +1,11 @@ # rules for rt +# -- rt1 initialization -- RT1 := $(OBJ_DIR)/rt/rt1.a RTI := $(OBJ_DIR)/rt/rti.o -# rt2 = user program +# -- rt2 = user program -- RTN := $(OBJ_DIR)/rt/rtn.o RT3 := $(OBJ_DIR)/rt/rt3.a +# -- rt3 finalization -- RUNTIME := $(RT1) $(RTI) $(RTN) $(RT3) RT1_SRC := \ @@ -12,12 +14,14 @@ RT1_SRC := \ $(SYS_DIR)/rt/boot.c\ $(SYS_DIR)/rt/thunk.c +RT1_OBJ := $(filter %.o, $(RT1_SRC:.c=.o)) +RT1_OBJ := $(patsubst $(SYS_DIR)/rt/%, $(OBJ_DIR)/rt/%, $(RT1_OBJ)) + RT3_SRC := \ + $(SYS_DIR)/rt/stack.c\ $(SYS_DIR)/rt/dummy.c\ - $(SYS_DIR)/rt/exit.c\ + $(SYS_DIR)/rt/exit.c -RT1_OBJ := $(filter %.o, $(RT1_SRC:.c=.o)) -RT1_OBJ := $(patsubst $(SYS_DIR)/rt/%, $(OBJ_DIR)/rt/%, $(RT1_OBJ)) RT3_OBJ := $(filter %.o, $(RT3_SRC:.c=.o)) RT3_OBJ := $(patsubst $(SYS_DIR)/rt/%, $(OBJ_DIR)/rt/%, $(RT3_OBJ)) -- cgit v1.2.1