diff options
| author | Nicholas Noll <nbnoll@eml.cc> | 2020-05-16 10:38:24 -0700 |
|---|---|---|
| committer | Nicholas Noll <nbnoll@eml.cc> | 2020-05-16 10:38:24 -0700 |
| commit | 3f7474df0645224ce61fedcd908028f41971189e (patch) | |
| tree | 0bd98f69f9ba09ec9c1cb19fe0c96bf89d8b6ee6 /sys | |
| parent | fa25c8f3df6791727b9384c9b405c996ac68b8ab (diff) | |
fix: linking errors associated to linking bins against all dependencies. partitioned more explictly now
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/libbio/rules.mk | 11 | ||||
| -rw-r--r-- | sys/libmath/rules.mk | 18 | ||||
| -rw-r--r-- | sys/libn/rules.mk | 24 |
3 files changed, 40 insertions, 13 deletions
diff --git a/sys/libbio/rules.mk b/sys/libbio/rules.mk index cabc1b3..fdb4c74 100644 --- a/sys/libbio/rules.mk +++ b/sys/libbio/rules.mk @@ -5,10 +5,14 @@ DIR := $(d)/io include $(DIR)/rules.mk # Local sources -SRCS_$(d) := $(wildcard $(d)/*.c) +SRCS_$(d) := \ + $(d)/align.c \ + $(d)/phylo.c LIBS_$(d) := $(d)/libbio.a BINS_$(d) := -TSTS_$(d) := $(d)/test $(d)/simulate +TSTS_$(d) := \ + $(d)/test.c \ + $(d)/simulate.c include share/paths.mk @@ -20,7 +24,8 @@ include share/paths.mk $(LIBS_$(d)): $(OBJS_$(d)) $(OBJS_$(d)/io) $(ARCHIVE) -$(TSTS_$(d)): $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a +$(UNTS_$(d)): TCLIBS := $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a +$(UNTS_$(d)): $(TOBJS_$(d)) $(TCLIBS) $(LINK) include share/pop.mk diff --git a/sys/libmath/rules.mk b/sys/libmath/rules.mk index f948686..c7d8d61 100644 --- a/sys/libmath/rules.mk +++ b/sys/libmath/rules.mk @@ -3,19 +3,25 @@ include share/push.mk # Iterate through subdirectory tree # Local sources -SRCS_$(d) := $(wildcard $(d)/*.c) -LIBS_$(d) := +SRCS_$(d) := \ + $(d)/basic.c \ + $(d)/blas1.c \ + $(d)/blas2.c \ + $(d)/linalg.c +LIBS_$(d) := $(d)/libmath.a BINS_$(d) := -TSTS_$(d) := $(d)/blas +TSTS_$(d) := \ + $(d)/blas.c \ + $(d)/test.c include share/paths.mk $(LIBS_$(d)): $(OBJS_$(d)) $(ARCHIVE) -$(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 +$(UNTS_$(d)): TCFLAGS := -D_GNU_SOURCE +$(UNTS_$(d)): TCLIBS := -lpthread -lm $(LIB_DIR)/vendor/libblas.a $(OBJ_DIR)/libn/libn.a $(LIBS_$(d)) +$(UNTS_$(d)): $(TOBJS_$(d)) $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a $(LINK) include share/pop.mk diff --git a/sys/libn/rules.mk b/sys/libn/rules.mk index 85f3df7..3e9b810 100644 --- a/sys/libn/rules.mk +++ b/sys/libn/rules.mk @@ -5,17 +5,33 @@ include share/push.mk # include $(DIR)/rules.mk # Local sources -SRCS_$(d) := $(wildcard $(d)/*.c) $(wildcard $(d)/*.s) -LIBS_$(d) := $(d)/libnbn.a +SRCS_$(d) := \ + $(d)/bufio.c \ + $(d)/coro_unix_x64.s \ + $(d)/coro.c \ + $(d)/error.c \ + $(d)/flate.c \ + $(d)/gz.c \ + $(d)/io.c \ + $(d)/memory.c \ + $(d)/mmap.c \ + $(d)/random.c \ + $(d)/sort.c \ + $(d)/string.c + +TSTS_$(d) := \ + $(d)/test.c + +LIBS_$(d) := $(d)/libn.a BINS_$(d) := -TSTS_$(d) := $(d)/test include share/paths.mk $(LIBS_$(d)): $(OBJS_$(d)) $(ARCHIVE) -$(TSTS_$(d)): $(LIBS_$(d)) +$(UNTS_$(d)): TCLIBS := $(LIBS_$(d)) +$(UNTS_$(d)): $(TOBJS_$(d)) $(TCLIBS) $(LINK) include share/pop.mk |