From 3f7474df0645224ce61fedcd908028f41971189e Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sat, 16 May 2020 10:38:24 -0700 Subject: fix: linking errors associated to linking bins against all dependencies. partitioned more explictly now --- share/paths.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/paths.mk b/share/paths.mk index e4fabcc..2998014 100644 --- a/share/paths.mk +++ b/share/paths.mk @@ -3,7 +3,10 @@ OBJS_$(d) += $(filter %.o, $(SRCS_$(d):.s=.o)) OBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(OBJS_$(d))) DEPS_$(d) := $(OBJS_$(d):.o=.d) -OBJS := $(OBJS) $(OBJS_$(d)) +TOBJS_$(d) := $(TSTS_$(d):.c=.o) +TOBJS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(TOBJS_$(d))) + +OBJS := $(OBJS) $(OBJS_$(d)) $(TOBJS_$(d)) DEPS := $(DEPS) $(DEPS_$(d)) LIBS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(LIBS_$(d))) @@ -12,5 +15,5 @@ LIBS := $(LIBS) $(LIBS_$(d)) BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) BINS := $(BINS) $(BINS_$(d)) -TSTS_$(d) := $(patsubst $(SRC_DIR)/%, $(TST_DIR)/%, $(TSTS_$(d))) -TSTS := $(TSTS) $(TSTS_$(d)) +UNTS_$(d) := $(patsubst $(SRC_DIR)/%, $(TST_DIR)/%, $(TSTS_$(d):.c=)) +UNTS := $(UNTS) $(UNTS_$(d)) -- cgit v1.2.1