aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorNicholas Noll <nbnoll@eml.cc>2020-05-16 10:38:24 -0700
committerNicholas Noll <nbnoll@eml.cc>2020-05-16 10:38:24 -0700
commit3f7474df0645224ce61fedcd908028f41971189e (patch)
tree0bd98f69f9ba09ec9c1cb19fe0c96bf89d8b6ee6 /share
parentfa25c8f3df6791727b9384c9b405c996ac68b8ab (diff)
fix: linking errors associated to linking bins against all dependencies. partitioned more explictly now
Diffstat (limited to 'share')
-rw-r--r--share/paths.mk9
1 files changed, 6 insertions, 3 deletions
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))