From 4bee1c911c0a710da47b62a31e84535d2e0b7c76 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Thu, 22 Apr 2021 09:48:30 -0700 Subject: chore(organize): restructured build to allow for parallel projects to sys functionality --- share/paths.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/paths.mk b/share/paths.mk index 12c8c3d..91a101f 100644 --- a/share/paths.mk +++ b/share/paths.mk @@ -1,19 +1,22 @@ OBJS_$(d) := $(filter %.o, $(SRCS_$(d):.c=.o)) OBJS_$(d) += $(filter %.o, $(SRCS_$(d):.s=.o)) -OBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(OBJS_$(d))) -DEPS_$(d) := $(OBJS_$(d):.o=.d) +OBJS_$(d) := $(addprefix $(OBJ_DIR)/, $(OBJS_$(d))) -TOBJS_$(d) := $(TSTS_$(d):.c=.o) -TOBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(TOBJS_$(d))) +DEPS_$(d) := $(OBJS_$(d):.o=.d) OBJS := $(OBJS) $(OBJS_$(d)) $(TOBJS_$(d)) DEPS += $(DEPS_$(d)) -LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d))) +LIBS_$(d) := $(addprefix $(OBJ_DIR)/, $(LIBS_$(d))) LIBS += $(LIBS_$(d)) -BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) +BINS_$(d) := $(addprefix $(OBJ_DIR)/, $(BINS_$(d))) BINS += $(BINS_$(d)) -UNTS_$(d) := $(patsubst $(SRC_DIR)/%, $(TST_DIR)/%, $(TSTS_$(d):.c=)) -UNTS += $(UNTS_$(d)) +# Testing infrastructure + +TOBJS_$(d) := $(TSTS_$(d):.c=.o) +TOBJS_$(d) := $(addprefix $(OBJ_DIR)/, $(TOBJS_$(d))) + +UNTS_$(d) := $(addprefix $(TST_DIR)/, $(TSTS_$(d):.c=)) +UNTS += $(UNTS_$(d)) -- cgit v1.2.1