From e97c8c469db0aa27985dab2879dc1f14905c7387 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Sat, 20 Nov 2021 11:55:55 -0800 Subject: chore: simplify makefiles --- share/dynamic.mk | 6 ------ share/paths.mk | 10 +--------- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'share') diff --git a/share/dynamic.mk b/share/dynamic.mk index b7ec24d..f5f2956 100644 --- a/share/dynamic.mk +++ b/share/dynamic.mk @@ -3,9 +3,3 @@ $(BINS_$(d)): INIT = $(BINS_$(d)): FINI = $(BINS_$(d)): ELIBS = $(BINS_$(d)): INCS = -I $(SYS_DIR)/$(OS)/$(ARCH) -I $(SYS_DIR)/$(OS)/port -I $(INC_DIR) - -$(TEST_$(d)): STATIC = -$(TEST_$(d)): INIT = -$(TEST_$(d)): FINI = -$(TEST_$(d)): ELIBS = -$(TEST_$(d)): INCS = -I $(SYS_DIR)/$(OS)/$(ARCH) -I $(SYS_DIR)/$(OS)/port -I $(INC_DIR) diff --git a/share/paths.mk b/share/paths.mk index 112c254..978d87d 100644 --- a/share/paths.mk +++ b/share/paths.mk @@ -15,14 +15,6 @@ LIBS += $(LIBS_$(d)) BINS_$(d) := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(BINS_$(d))) BINS += $(BINS_$(d)) -# Testing infrastructure - -UNIT_$(d) := $(CHECK_$(d):.c=.o) -UNIT_$(d) := $(patsubst %(SRC_DIR)/%, $(OBJ_DIR)/%, $(UNIT_$(d))) -OBJS += $(UNIT_$(d)) - -TEST_$(d) := $(patsubst $(SRC_DIR)/%, $(TEST_DIR)/%, $(TEST_$(d):.c=)) -TEST += $(TEST_$(d)) - # useful path o := $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(d)) +t := $(patsubst $(SRC_DIR)/%, $(TST_DIR)/%, $(d)) -- cgit v1.2.1