diff options
| author | Nicholas Noll <nbnoll@eml.cc> | 2020-05-15 12:11:57 -0700 |
|---|---|---|
| committer | Nicholas Noll <nbnoll@eml.cc> | 2020-05-15 12:11:57 -0700 |
| commit | e881e80d6b793c2d29e472ae4b65bdf8e4363b87 (patch) | |
| tree | ca81576f4da93de1a6571da9fc0aa2d08a3ac497 /sys | |
| parent | 66eb918a13b6607cc7bb615350a0e26f3670cd54 (diff) | |
feat: testing directory to allow for easier tests of code
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/libbio/rules.mk | 8 | ||||
| -rw-r--r-- | sys/libmath/rules.mk | 16 | ||||
| -rw-r--r-- | sys/libn/rules.mk | 18 | ||||
| -rw-r--r-- | sys/rules.mk | 9 |
4 files changed, 19 insertions, 32 deletions
diff --git a/sys/libbio/rules.mk b/sys/libbio/rules.mk index fbba7df..cabc1b3 100644 --- a/sys/libbio/rules.mk +++ b/sys/libbio/rules.mk @@ -18,11 +18,9 @@ include share/paths.mk # $(LIBS_$(d)) = TCLIBS := $(LIBS_$(d)): $(OBJS_$(d)) $(OBJS_$(d)/io) - @echo LIB $@ - @$(ARCHIVE) + $(ARCHIVE) -$(BINS_$(d)): $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a - @echo BIN $@ - @$(LINK) +$(TSTS_$(d)): $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a + $(LINK) include share/pop.mk diff --git a/sys/libmath/rules.mk b/sys/libmath/rules.mk index c82361d..f948686 100644 --- a/sys/libmath/rules.mk +++ b/sys/libmath/rules.mk @@ -10,18 +10,12 @@ TSTS_$(d) := $(d)/blas include share/paths.mk -GENERATE = python $^ > $@ -$(d)/blas1.c: $(d)/gen1.py - @$(GENERATE) - $(LIBS_$(d)): $(OBJS_$(d)) - @echo AR $^ - @$(ARCHIVE) + $(ARCHIVE) -$(BINS_$(d)): TCFLAGS := -D_GNU_SOURCE -$(BINS_$(d)): TCLIBS := -lpthread -lm -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a $(LIB_DIR)/vendor/libblas.a - @echo BIN $@ - @$(LINK) +$(TSTS_$(d)): TCFLAGS := -D_GNU_SOURCE +$(TSTS_$(d)): TCLIBS := -lpthread -lm +$(TSTS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a $(LIB_DIR)/vendor/libblas.a + $(LINK) include share/pop.mk diff --git a/sys/libn/rules.mk b/sys/libn/rules.mk index bd3308a..85f3df7 100644 --- a/sys/libn/rules.mk +++ b/sys/libn/rules.mk @@ -1,21 +1,21 @@ include share/push.mk +# Iterate through subdirectory tree +# DIR := $(d)/bufio +# include $(DIR)/rules.mk + # Local sources -SRCS_$(d) := $(wildcard $(d)/*.c) -ASMS_$(d) := $(wildcard $(d)/*.s) -LIBS_$(d) := $(d)/libn.a +SRCS_$(d) := $(wildcard $(d)/*.c) $(wildcard $(d)/*.s) +LIBS_$(d) := $(d)/libnbn.a BINS_$(d) := TSTS_$(d) := $(d)/test include share/paths.mk $(LIBS_$(d)): $(OBJS_$(d)) - @echo LIB $@ - @$(ARCHIVE) + $(ARCHIVE) -$(BINS_$(d)): TCLIBS := $(LIBS_$(d)) $(LIB_DIR)/vendor/libz.a -$(BINS_$(d)): $(OBJ_DIR)/libn/test.o $(LIBS_$(d)) - @echo BIN $@ - @$(LINK) +$(TSTS_$(d)): $(LIBS_$(d)) + $(LINK) include share/pop.mk diff --git a/sys/rules.mk b/sys/rules.mk index d7535a7..cfff9b7 100644 --- a/sys/rules.mk +++ b/sys/rules.mk @@ -1,7 +1,4 @@ -# ---- Push on stack ---- -SP := $(SP).x -DIRSTACK_$(SP) := $(d) -d := $(DIR) +include share/push.mk # Iterate through subdirectory tree @@ -20,6 +17,4 @@ include $(DIR)/rules.mk DIR := $(d)/cmd include $(DIR)/rules.mk -# ---- Pop off stack ---- -d := $(DIRSTACK_$(SP)) -SP := $(basename $(SP)) +include share/pop.mk |