ap

commit 734884fb792c965b409d43580f38bfde5798ea5c
parent 5e827efe9d5a25691e887d0d6950141ef9c89d84
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date:   Wed, 14 Jul 2021 16:03:40 -0700

Remove aputil library

The aputil library was made for functions common to apc and aps
without adding cruft to the ap library. Since there are no longer
functions which fit that definition, and I don't foresee adding
any, the library is adding unnecessary complexity.

If shared functions are needed in the future they will simply be
added to libap.

Diffstat:
M
apc/apc.c
 | 
2
+-
R
lib/aputil/die.c -> apc/die.c
 | 
0

R
include/aputil/die.h -> apc/die.h
 | 
0

M
apc/mkfile
 | 
4
++--
D
include/aputil/aputil.h
 | 
1
-
D
lib/aputil/mkfile
 | 
16
----------------
M
mkfile
 | 
2
+-

7 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/apc/apc.c b/apc/apc.c
@@ -29,9 +29,9 @@
 #endif
 
 #include <ap.h>
-#include <aputil.h>
 
 #include "config.h"
+#include "die.h"
 
 int
 mksend(int sock, char **argv, int argc)
diff --git a/lib/aputil/die.c b/apc/die.c
diff --git a/include/aputil/die.h b/apc/die.h
diff --git a/apc/mkfile b/apc/mkfile
@@ -1,9 +1,9 @@
 # Copyright 2021 Jacob R. Edwards
 
 name = apc
-src = apc.c
+src = apc.c die.c
 obj = ${src:%.c=%.o}
-lib = ap aputil
+lib = ap
 mk = ../mk
 
 cppflags = ${lib:%=-I../include/%}
diff --git a/include/aputil/aputil.h b/include/aputil/aputil.h
@@ -1 +0,0 @@
-#include "die.h"
diff --git a/lib/aputil/mkfile b/lib/aputil/mkfile
@@ -1,16 +0,0 @@
-# Copyright 2021 Jacob R. Edwards
-
-name = libaputil.a
-src = die.c
-obj = ${src:%.c=%.o}
-hdir = ../../include/aputil
-mk = ../../mk
-
-cppflags = -I$hdir
-
-all:V: $name
-
-< $mk/config.mk
-< $mk/clean.mk
-< $mk/obj.mk
-< $mk/lib.mk
diff --git a/mkfile b/mkfile
@@ -1,6 +1,6 @@
 # Copyright 2021 Jacob R. Edwards
 
-subdirs = lib/ap lib/aputil aps apc
+subdirs = lib/ap aps apc
 targets = all install uninstall clean
 
 all:V: