From 66c4b7486a15b67e79a049a49d44ac84c04c0a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= <juhani@krekelä.fi>
Date: Mon, 15 May 2023 20:55:29 +0300
Subject: [PATCH] Move chkblayout(1) and chvideomode(1) into their own
 directories.

---
 Makefile                             |  2 ++
 chkblayout/.gitignore                |  1 +
 chkblayout/Makefile                  | 30 ++++++++++++++++++++++++++++
 {utils => chkblayout}/chkblayout.1   |  0
 {utils => chkblayout}/chkblayout.c   |  0
 chvideomode/.gitignore               |  1 +
 chvideomode/Makefile                 | 30 ++++++++++++++++++++++++++++
 {utils => chvideomode}/chvideomode.1 |  0
 {utils => chvideomode}/chvideomode.c |  0
 utils/Makefile                       |  4 ----
 10 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 chkblayout/.gitignore
 create mode 100644 chkblayout/Makefile
 rename {utils => chkblayout}/chkblayout.1 (100%)
 rename {utils => chkblayout}/chkblayout.c (100%)
 create mode 100644 chvideomode/.gitignore
 create mode 100644 chvideomode/Makefile
 rename {utils => chvideomode}/chvideomode.1 (100%)
 rename {utils => chvideomode}/chvideomode.c (100%)

diff --git a/Makefile b/Makefile
index 83047f32..38ae4c1a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ libmount \
 bench \
 carray \
 checksum \
+chkblayout \
+chvideomode \
 dhclient \
 disked \
 dnsconfig \
diff --git a/chkblayout/.gitignore b/chkblayout/.gitignore
new file mode 100644
index 00000000..c40ff6f6
--- /dev/null
+++ b/chkblayout/.gitignore
@@ -0,0 +1 @@
+chkblayout
diff --git a/chkblayout/Makefile b/chkblayout/Makefile
new file mode 100644
index 00000000..3e8e780a
--- /dev/null
+++ b/chkblayout/Makefile
@@ -0,0 +1,30 @@
+SOFTWARE_MEANT_FOR_SORTIX=1
+include ../build-aux/platform.mak
+include ../build-aux/compiler.mak
+include ../build-aux/dirs.mak
+
+OPTLEVEL?=$(DEFAULT_OPTLEVEL)
+CFLAGS?=$(OPTLEVEL)
+
+CFLAGS += -Wall -Wextra
+
+BINARIES = chkblayout
+MANPAGES1 = chkblayout.1
+
+LIBS =
+
+all: $(BINARIES)
+
+.PHONY: all install clean
+
+install: all
+	mkdir -p $(DESTDIR)$(BINDIR)
+	install $(BINARIES) $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	cp $(MANPAGES1) $(DESTDIR)$(MANDIR)/man1
+
+%: %.c
+	$(CC) -std=gnu11 $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
+
+clean:
+	rm -f $(BINARIES)
diff --git a/utils/chkblayout.1 b/chkblayout/chkblayout.1
similarity index 100%
rename from utils/chkblayout.1
rename to chkblayout/chkblayout.1
diff --git a/utils/chkblayout.c b/chkblayout/chkblayout.c
similarity index 100%
rename from utils/chkblayout.c
rename to chkblayout/chkblayout.c
diff --git a/chvideomode/.gitignore b/chvideomode/.gitignore
new file mode 100644
index 00000000..fd73988e
--- /dev/null
+++ b/chvideomode/.gitignore
@@ -0,0 +1 @@
+chvideomode
diff --git a/chvideomode/Makefile b/chvideomode/Makefile
new file mode 100644
index 00000000..249ce2ea
--- /dev/null
+++ b/chvideomode/Makefile
@@ -0,0 +1,30 @@
+SOFTWARE_MEANT_FOR_SORTIX=1
+include ../build-aux/platform.mak
+include ../build-aux/compiler.mak
+include ../build-aux/dirs.mak
+
+OPTLEVEL?=$(DEFAULT_OPTLEVEL)
+CFLAGS?=$(OPTLEVEL)
+
+CFLAGS += -Wall -Wextra
+
+BINARIES = chvideomode
+MANPAGES1 = chvideomode.1
+
+LIBS =
+
+all: $(BINARIES)
+
+.PHONY: all install clean
+
+install: all
+	mkdir -p $(DESTDIR)$(BINDIR)
+	install $(BINARIES) $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	cp $(MANPAGES1) $(DESTDIR)$(MANDIR)/man1
+
+%: %.c
+	$(CC) -std=gnu11 $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
+
+clean:
+	rm -f $(BINARIES)
diff --git a/utils/chvideomode.1 b/chvideomode/chvideomode.1
similarity index 100%
rename from utils/chvideomode.1
rename to chvideomode/chvideomode.1
diff --git a/utils/chvideomode.c b/chvideomode/chvideomode.c
similarity index 100%
rename from utils/chvideomode.c
rename to chvideomode/chvideomode.c
diff --git a/utils/Makefile b/utils/Makefile
index 1921f4ba..a49dd3ef 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -13,10 +13,8 @@ CPPFLAGS:=$(CPPFLAGS) -DVERSIONSTR=\"$(VERSION)\"
 BINARIES_EXCEPT_INSTALL:=\
 basename \
 cat \
-chkblayout \
 chmod \
 chown \
-chvideomode \
 clear \
 colormake \
 column \
@@ -81,8 +79,6 @@ $(BINARIES_EXCEPT_INSTALL) \
 xinstall
 
 MANPAGES1=\
-chkblayout.1 \
-chvideomode.1 \
 kernelinfo.1 \
 logname.1 \
 nc.1 \