From db8e974d48b8a9de58f660f159a780dce2992bb7 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sat, 20 Jun 2020 13:32:11 -0700 Subject: fix: added file to make bootstrapping on new device easier. small changes to accomodate --- sys/cmd/dwm/rules.mk | 5 ++--- sys/cmd/ic/.gitignore | 3 --- sys/cmd/ic/ic.c | 2 -- sys/cmd/ic/rules.mk | 2 +- sys/libmath/rules.mk | 3 +-- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 sys/cmd/ic/.gitignore (limited to 'sys') diff --git a/sys/cmd/dwm/rules.mk b/sys/cmd/dwm/rules.mk index 680d741..a8ce4f5 100644 --- a/sys/cmd/dwm/rules.mk +++ b/sys/cmd/dwm/rules.mk @@ -20,9 +20,8 @@ $(BINS_$(d)): TCFLAGS = \ $(BINS_$(d)): TCLIBS = \ `$(PKG) --libs fontconfig` \ `$(PKG) --libs freetype2` \ - -lX11 -lXinerama -lXft -lX11-xcb -lxcb -lxcb-res \ - $(OBJ_DIR)/libn/libn.a -$(BINS_$(d)): $(OBJS_$(d)) + -lX11 -lXinerama -lXft -lX11-xcb -lxcb -lxcb-res +$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a $(COMPLINK) include share/pop.mk diff --git a/sys/cmd/ic/.gitignore b/sys/cmd/ic/.gitignore deleted file mode 100644 index 43d0692..0000000 --- a/sys/cmd/ic/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -ii -*.a -*.o diff --git a/sys/cmd/ic/ic.c b/sys/cmd/ic/ic.c index 50ce8c1..19b868d 100644 --- a/sys/cmd/ic/ic.c +++ b/sys/cmd/ic/ic.c @@ -14,9 +14,7 @@ #include #include -#ifdef NEED_STRLCPY size_t strlcpy(char *, const char *, size_t); -#endif #define IRC_CHANNEL_MAX 200 #define IRC_MSG_MAX 512 /* guaranteed to be <= than PIPE_BUF */ diff --git a/sys/cmd/ic/rules.mk b/sys/cmd/ic/rules.mk index 9a52e42..c373dfb 100644 --- a/sys/cmd/ic/rules.mk +++ b/sys/cmd/ic/rules.mk @@ -2,7 +2,7 @@ include share/push.mk # Iterate through subdirectory tree # Local sources -SRCS_$(d) := $(d)/ic.c +SRCS_$(d) := $(d)/strlcpy.c $(d)/ic.c BINS_$(d) := $(d)/ic include share/paths.mk diff --git a/sys/libmath/rules.mk b/sys/libmath/rules.mk index 9e44ce4..d3ff490 100644 --- a/sys/libmath/rules.mk +++ b/sys/libmath/rules.mk @@ -9,7 +9,6 @@ SRCS_$(d) := \ $(d)/blas2.c \ $(d)/blas3.c LIBS_$(d) := $(d)/libmath.a -BINS_$(d) := TSTS_$(d) := \ $(d)/blas.c \ $(d)/test.c @@ -20,7 +19,7 @@ $(LIBS_$(d)): $(OBJS_$(d)) $(ARCHIVE) $(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)): 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 $(LINK) -- cgit v1.2.1