From a9bfe650038afea8b751175cac16f6027345e45f Mon Sep 17 00:00:00 2001
From: Nicholas <nbnoll@eml.cc>
Date: Sat, 20 Nov 2021 10:53:19 -0800
Subject: Chore: reorganize libutf and libfmt into base

I found the split to be arbitrary. Better to include the functionality
in the standard library. I also split the headers to allow for more
granular inclusion (but the library is still monolithic). The only
ugliness is the circular dependency introduced with libutf's generated
functions. We put explicit prereqs with the necessary object files
instead.
---
 src/cmd/core/basename.c | 1 -
 src/cmd/core/cat.c      | 1 -
 src/cmd/dwm/dwm.h       | 1 -
 src/cmd/menu/menu.h     | 1 -
 src/cmd/rc/rc.h         | 2 +-
 src/cmd/term/term.h     | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/cmd')

diff --git a/src/cmd/core/basename.c b/src/cmd/core/basename.c
index ba9d4c9..263592f 100644
--- a/src/cmd/core/basename.c
+++ b/src/cmd/core/basename.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <base.h>
-#include <libfmt.h>
 
 static void
 usage(void)
diff --git a/src/cmd/core/cat.c b/src/cmd/core/cat.c
index 4f0929c..e9b770b 100644
--- a/src/cmd/core/cat.c
+++ b/src/cmd/core/cat.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <base.h>
-#include <libfmt.h>
 
 static void
 usage(void)
diff --git a/src/cmd/dwm/dwm.h b/src/cmd/dwm/dwm.h
index afec1f2..269f373 100644
--- a/src/cmd/dwm/dwm.h
+++ b/src/cmd/dwm/dwm.h
@@ -2,7 +2,6 @@
 #pragma once
 #include <u.h>
 #include <base.h>
-#include <libutf.h>
 
 #include <errno.h>
 #include <locale.h>
diff --git a/src/cmd/menu/menu.h b/src/cmd/menu/menu.h
index f4345bb..de01607 100644
--- a/src/cmd/menu/menu.h
+++ b/src/cmd/menu/menu.h
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <u.h>
 #include <base.h>
-#include <libutf.h>
 
 #include <time.h>
 #include <locale.h>
diff --git a/src/cmd/rc/rc.h b/src/cmd/rc/rc.h
index f52e4e2..76a1b3d 100644
--- a/src/cmd/rc/rc.h
+++ b/src/cmd/rc/rc.h
@@ -2,7 +2,7 @@
 
 #include <u.h>
 #include <base.h>
-#include <libutf.h>
+#include <base/utf.h>
 
 // -----------------------------------------------------------------------
 // types
diff --git a/src/cmd/term/term.h b/src/cmd/term/term.h
index 6784974..c370239 100644
--- a/src/cmd/term/term.h
+++ b/src/cmd/term/term.h
@@ -3,7 +3,6 @@
 
 #include <u.h>
 #include <base.h>
-#include <libutf.h>
 
 #include <signal.h>
 #include <sys/ioctl.h>
-- 
cgit v1.2.1