diff options
Diffstat (limited to 'share/paths.mk')
| -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 91a101f..371ab7a 100644 --- a/share/paths.mk +++ b/share/paths.mk @@ -1,22 +1,25 @@ OBJS_$(d) := $(filter %.o, $(SRCS_$(d):.c=.o)) OBJS_$(d) += $(filter %.o, $(SRCS_$(d):.s=.o)) -OBJS_$(d) := $(addprefix $(OBJ_DIR)/, $(OBJS_$(d))) +OBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(OBJS_$(d))) DEPS_$(d) := $(OBJS_$(d):.o=.d) -OBJS := $(OBJS) $(OBJS_$(d)) $(TOBJS_$(d)) +# Binary building + +OBJS += $(OBJS_$(d)) DEPS += $(DEPS_$(d)) -LIBS_$(d) := $(addprefix $(OBJ_DIR)/, $(LIBS_$(d))) +LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d))) LIBS += $(LIBS_$(d)) -BINS_$(d) := $(addprefix $(OBJ_DIR)/, $(BINS_$(d))) +BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) BINS += $(BINS_$(d)) # Testing infrastructure -TOBJS_$(d) := $(TSTS_$(d):.c=.o) -TOBJS_$(d) := $(addprefix $(OBJ_DIR)/, $(TOBJS_$(d))) +UNIT_$(d) := $(CHECK_$(d):.c=.o) +UNIT_$(d) := $(patsubst %(SRC_DIR)/%, $(OBJ_DIR)/%, $(UNIT_$(d))) +OBJS += $(UNIT_$(d)) -UNTS_$(d) := $(addprefix $(TST_DIR)/, $(TSTS_$(d):.c=)) -UNTS += $(UNTS_$(d)) +TEST_$(d) := $(patsubst $(SRC_DIR)/%, $(TEST_DIR)/%, $(TEST_$(d):.c=)) +TEST += $(TEST_$(d)) |