aboutsummaryrefslogtreecommitdiff
path: root/sys/cmd
diff options
context:
space:
mode:
authorNicholas Noll <nnoll523@gmail.com>2021-10-23 11:17:25 -0700
committerNicholas Noll <nnoll523@gmail.com>2021-10-26 11:11:57 -0700
commitc8e1e71eb526475dd431443345262c2e5a627831 (patch)
treeea9f7bcbba18a13f7ba8b32fcb1433ac2f4dd8b4 /sys/cmd
parent40f4c7305a041d4214df117491593898d04d0134 (diff)
chore(rename): libn -> base
Diffstat (limited to 'sys/cmd')
-rw-r--r--sys/cmd/dwm/dwm.h2
-rw-r--r--sys/cmd/dwm/rules.mk2
-rw-r--r--sys/cmd/filter/filter.c2
-rw-r--r--sys/cmd/filter/rules.mk2
-rw-r--r--sys/cmd/menu/menu.h2
-rw-r--r--sys/cmd/menu/rules.mk2
-rw-r--r--sys/cmd/rc/rc.h2
-rw-r--r--sys/cmd/rc/rules.mk2
-rw-r--r--sys/cmd/rules.mk10
-rw-r--r--sys/cmd/term/rules.mk2
-rw-r--r--sys/cmd/term/term.h2
-rw-r--r--sys/cmd/walk/rules.mk2
-rw-r--r--sys/cmd/walk/walk.c2
-rw-r--r--sys/cmd/wm/render.c2
-rw-r--r--sys/cmd/wm/rules.mk2
-rw-r--r--sys/cmd/wm/wm.h2
16 files changed, 20 insertions, 20 deletions
diff --git a/sys/cmd/dwm/dwm.h b/sys/cmd/dwm/dwm.h
index a934287..269f373 100644
--- a/sys/cmd/dwm/dwm.h
+++ b/sys/cmd/dwm/dwm.h
@@ -1,7 +1,7 @@
/* See LICENSE file for copyright and license details. */
#pragma once
#include <u.h>
-#include <libn.h>
+#include <base.h>
#include <errno.h>
#include <locale.h>
diff --git a/sys/cmd/dwm/rules.mk b/sys/cmd/dwm/rules.mk
index 617657e..a87c3f6 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)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/filter/filter.c b/sys/cmd/filter/filter.c
index 271c544..abc9a88 100644
--- a/sys/cmd/filter/filter.c
+++ b/sys/cmd/filter/filter.c
@@ -1,6 +1,6 @@
/* See LICENSE file for copyright and license details. */
#include <u.h>
-#include <libn.h>
+#include <base.h>
#include <dirent.h>
#include <sys/stat.h>
diff --git a/sys/cmd/filter/rules.mk b/sys/cmd/filter/rules.mk
index 21f6d31..31bb257 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)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/menu/menu.h b/sys/cmd/menu/menu.h
index f558339..eaea274 100644
--- a/sys/cmd/menu/menu.h
+++ b/sys/cmd/menu/menu.h
@@ -1,6 +1,6 @@
/* See LICENSE file for copyright and license details. */
#include <u.h>
-#include <libn.h>
+#include <base.h>
#include <time.h>
#include <locale.h>
diff --git a/sys/cmd/menu/rules.mk b/sys/cmd/menu/rules.mk
index d040f5e..1ee3ab0 100644
--- a/sys/cmd/menu/rules.mk
+++ b/sys/cmd/menu/rules.mk
@@ -19,7 +19,7 @@ $(BINS_$(d)): TCINCS = \
`$(PKG) --cflags fontconfig` \
`$(PKG) --cflags freetype2`
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/rc/rc.h b/sys/cmd/rc/rc.h
index 11af508..3090002 100644
--- a/sys/cmd/rc/rc.h
+++ b/sys/cmd/rc/rc.h
@@ -1,7 +1,7 @@
#pragma once
#include <u.h>
-#include <libn.h>
+#include <base.h>
// -----------------------------------------------------------------------
// types
diff --git a/sys/cmd/rc/rules.mk b/sys/cmd/rc/rules.mk
index dcddcce..991fb2e 100644
--- a/sys/cmd/rc/rules.mk
+++ b/sys/cmd/rc/rules.mk
@@ -25,7 +25,7 @@ $(d)/parse.h $(d)/parse.c: $(d)/syntax.y
yacc --header=$(<D)/parse.h --output=$(<D)/parse.c $(<)
# Local rules
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a $(d)/parse.h
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a $(d)/parse.h
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/rules.mk b/sys/cmd/rules.mk
index 2302c49..0b54f68 100644
--- a/sys/cmd/rules.mk
+++ b/sys/cmd/rules.mk
@@ -2,11 +2,14 @@ include share/push.mk
# Iterate through subdirectory tree
+# DIR := $(d)/cc
+# include $(DIR)/rules.mk
+
DIR := $(d)/rc
include $(DIR)/rules.mk
-# DIR := $(d)/cc
-# include $(DIR)/rules.mk
+DIR := $(d)/wm
+include $(DIR)/rules.mk
DIR := $(d)/dwm
include $(DIR)/rules.mk
@@ -14,9 +17,6 @@ include $(DIR)/rules.mk
# DIR := $(d)/tinywl
# include $(DIR)/rules.mk
-# DIR := $(d)/wm
-# include $(DIR)/rules.mk
-
# DIR := $(d)/test
# include $(DIR)/rules.mk
diff --git a/sys/cmd/term/rules.mk b/sys/cmd/term/rules.mk
index ef340b3..a882e70 100644
--- a/sys/cmd/term/rules.mk
+++ b/sys/cmd/term/rules.mk
@@ -18,7 +18,7 @@ $(BINS_$(d)): TCLIBS = \
`$(PKG) --libs freetype2` \
-lm -lrt -lX11 -lutil -lXft -lXrender -lharfbuzz
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/term/term.h b/sys/cmd/term/term.h
index fd7b68c..b328db7 100644
--- a/sys/cmd/term/term.h
+++ b/sys/cmd/term/term.h
@@ -2,7 +2,7 @@
#pragma once
#include <u.h>
-#include <libn.h>
+#include <base.h>
#include <signal.h>
#include <sys/ioctl.h>
diff --git a/sys/cmd/walk/rules.mk b/sys/cmd/walk/rules.mk
index f863d87..5b9192d 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)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/walk/walk.c b/sys/cmd/walk/walk.c
index 853369c..c68d6e0 100644
--- a/sys/cmd/walk/walk.c
+++ b/sys/cmd/walk/walk.c
@@ -1,5 +1,5 @@
#include <u.h>
-#include <libn.h>
+#include <base.h>
static char buf[4*1024], *c = buf; /* should be greater or equal to PATH_MAX */
diff --git a/sys/cmd/wm/render.c b/sys/cmd/wm/render.c
index ff4a514..1f51804 100644
--- a/sys/cmd/wm/render.c
+++ b/sys/cmd/wm/render.c
@@ -8,7 +8,6 @@ struct Payload
int x, y;
};
-
static
void
render(struct wlr_surface *surface, int sx, int sy, void *data)
@@ -20,6 +19,7 @@ render(struct wlr_surface *surface, int sx, int sy, void *data)
struct wlr_box box;
struct wlr_output *output;
struct wlr_texture *texture;
+
enum wl_output_transform transform;
payload = data;
diff --git a/sys/cmd/wm/rules.mk b/sys/cmd/wm/rules.mk
index bf9aabc..5a36b6f 100644
--- a/sys/cmd/wm/rules.mk
+++ b/sys/cmd/wm/rules.mk
@@ -55,7 +55,7 @@ $(BINS_$(d)): TCLIBS = \
`$(PKG) --libs wayland-server` \
`$(PKG) --libs xkbcommon` \
-$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/libn/libn.a
+$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/sys/base/base.a
$(COMPLINK)
include share/pop.mk
diff --git a/sys/cmd/wm/wm.h b/sys/cmd/wm/wm.h
index d9124f4..a263804 100644
--- a/sys/cmd/wm/wm.h
+++ b/sys/cmd/wm/wm.h
@@ -1,7 +1,7 @@
#pragma once
#include <u.h>
-#include <libn.h>
+#include <base.h>
#include <wayland-server-core.h>
#include <linux/input-event-codes.h>