From 4bee1c911c0a710da47b62a31e84535d2e0b7c76 Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Thu, 22 Apr 2021 09:48:30 -0700
Subject: chore(organize): restructured build to allow for parallel projects to
 sys functionality

---
 sys/cmd/dwm/rules.mk    | 2 +-
 sys/cmd/filter/rules.mk | 2 +-
 sys/cmd/menu/rules.mk   | 5 ++---
 sys/cmd/term/rules.mk   | 3 +--
 sys/cmd/walk/rules.mk   | 2 +-
 sys/libmath/rules.mk    | 4 ++--
 sys/libn/rules.mk       | 2 --
 7 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'sys')

diff --git a/sys/cmd/dwm/rules.mk b/sys/cmd/dwm/rules.mk
index a8ce4f5..617657e 100644
--- a/sys/cmd/dwm/rules.mk
+++ b/sys/cmd/dwm/rules.mk
@@ -21,7 +21,7 @@ $(BINS_$(d)): TCLIBS = \
 	`$(PKG) --libs fontconfig` \
     `$(PKG) --libs freetype2`  \
 	-lX11 -lXinerama -lXft -lX11-xcb -lxcb -lxcb-res
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/filter/rules.mk b/sys/cmd/filter/rules.mk
index 4973772..21f6d31 100644
--- a/sys/cmd/filter/rules.mk
+++ b/sys/cmd/filter/rules.mk
@@ -7,7 +7,7 @@ BINS_$(d) := $(d)/filter
 include share/paths.mk
 
 # Local rules
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/menu/rules.mk b/sys/cmd/menu/rules.mk
index 8682b77..d040f5e 100644
--- a/sys/cmd/menu/rules.mk
+++ b/sys/cmd/menu/rules.mk
@@ -14,13 +14,12 @@ include share/paths.mk
 # Local rules
 include share/dynamic.mk
 $(BINS_$(d)): TCLIBS = \
-	-lfontconfig -lXft -lXinerama -lX11 \
-	$(OBJ_DIR)/libn/libn.a
+	-lfontconfig -lXft -lXinerama -lX11 
 $(BINS_$(d)): TCINCS = \
 	`$(PKG) --cflags fontconfig` \
 	`$(PKG) --cflags freetype2`
 	
-$(BINS_$(d)): $(OBJS_$(d))
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/term/rules.mk b/sys/cmd/term/rules.mk
index 55e85c3..38acbf7 100644
--- a/sys/cmd/term/rules.mk
+++ b/sys/cmd/term/rules.mk
@@ -16,9 +16,8 @@ $(BINS_$(d)): TCLIBS = \
 	`$(PKG) --libs fontconfig` \
     `$(PKG) --libs freetype2`  \
 	-lm -lrt -lX11 -lutil -lXft -lXrender \
-	$(OBJ_DIR)/libn/libn.a
 
-$(BINS_$(d)): $(OBJS_$(d))
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/cmd/walk/rules.mk b/sys/cmd/walk/rules.mk
index ee2321a..f863d87 100644
--- a/sys/cmd/walk/rules.mk
+++ b/sys/cmd/walk/rules.mk
@@ -7,7 +7,7 @@ BINS_$(d) := $(d)/walk
 include share/paths.mk
 
 # Local rules
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
 	$(COMPLINK)
 
 include share/pop.mk
diff --git a/sys/libmath/rules.mk b/sys/libmath/rules.mk
index d3ff490..42af0da 100644
--- a/sys/libmath/rules.mk
+++ b/sys/libmath/rules.mk
@@ -19,8 +19,8 @@ $(LIBS_$(d)): $(OBJS_$(d))
 	$(ARCHIVE)
 
 $(UNTS_$(d)): TCFLAGS := -D_GNU_SOURCE
-$(UNTS_$(d)): TCLIBS := -lpthread -lm $(LIB_DIR)/libblas.a $(OBJ_DIR)/libn/libn.a $(LIBS_$(d))
-$(UNTS_$(d)): $(TOBJS_$(d)) $(LIBS_$(d)) $(OBJ_DIR)/libn/libn.a 
+$(UNTS_$(d)): TCLIBS := -lpthread -lm $(LIB_DIR)/libblas.a $(OBJ_DIR)/sys/libn/libn.a $(LIBS_$(d))
+$(UNTS_$(d)): $(TOBJS_$(d)) $(LIBS_$(d)) $(OBJ_DIR)/sys/libn/libn.a 
 	$(LINK)
 
 include share/pop.mk
diff --git a/sys/libn/rules.mk b/sys/libn/rules.mk
index abcd60d..d519b67 100644
--- a/sys/libn/rules.mk
+++ b/sys/libn/rules.mk
@@ -1,8 +1,6 @@
 include share/push.mk
 
 # Iterate through subdirectory tree
-# DIR := $(d)/bufio
-# include $(DIR)/rules.mk
 
 # Local sources 
 SRCS_$(d) := \
-- 
cgit v1.2.1