diff options
| author | Nicholas Noll <nbnoll@eml.cc> | 2021-04-22 09:48:30 -0700 |
|---|---|---|
| committer | Nicholas Noll <nbnoll@eml.cc> | 2021-04-22 09:48:30 -0700 |
| commit | 4bee1c911c0a710da47b62a31e84535d2e0b7c76 (patch) | |
| tree | 05e86e31bfa55eebeb8b698e5e56590c66ab34ac /share | |
| parent | 1f312a24606b09cf1a41aa79946b1963a242f648 (diff) | |
chore(organize): restructured build to allow for parallel projects to sys functionality
Diffstat (limited to 'share')
| -rw-r--r-- | share/paths.mk | 19 |
1 files changed, 11 insertions, 8 deletions
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)) |