ap

commit 1236de179f19fd67c990430e734d4ef43b484580
parent c3b2500028587c5253dd5270376ffd59bd9ae9fa
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date:   Tue, 13 Jul 2021 23:13:26 -0700

Install library headers with mk/lib

Diffstat:
M
TODO
 | 
1
-
M
apc/mkfile
 | 
2
+-
M
aps/mkfile
 | 
2
+-
R
lib/ap/ap.h -> include/ap/ap.h
 | 
0

R
lib/ap/apcon.h -> include/ap/apcon.h
 | 
0

R
lib/ap/sock.h -> include/ap/sock.h
 | 
0

R
lib/aputil/aputil.h -> include/aputil/aputil.h
 | 
0

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

M
lib/ap/apcon.c
 | 
3
+--
M
lib/ap/mkfile
 | 
3
+++
M
lib/aputil/mkfile
 | 
3
+++
M
mk/lib.mk
 | 
2
++

12 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/TODO b/TODO
@@ -1,2 +1 @@
 - Create a client library using functions from apc.c
-- Install library headers
diff --git a/apc/mkfile b/apc/mkfile
@@ -6,7 +6,7 @@ obj = ${src:%.c=%.o}
 lib = ap aputil
 mk = ../mk
 
-cppflags = ${lib:%=-I../lib/%}
+cppflags = ${lib:%=-I../include/%}
 ldflags = ${lib:%=-L../lib/%}
 ldlibs = ${lib:%=-l%}
 
diff --git a/aps/mkfile b/aps/mkfile
@@ -6,7 +6,7 @@ obj = ${src:%.c=%.o}
 lib = ap aputil
 mk = ../mk
 
-cppflags = ${lib:%=-I../lib/%}
+cppflags = ${lib:%=-I../include/%}
 ldflags = ${lib:%=-L../lib/%}
 ldlibs = ${lib:%=-l%}
 
diff --git a/lib/ap/ap.h b/include/ap/ap.h
diff --git a/lib/ap/apcon.h b/include/ap/apcon.h
diff --git a/lib/ap/sock.h b/include/ap/sock.h
diff --git a/lib/aputil/aputil.h b/include/aputil/aputil.h
diff --git a/lib/aputil/die.h b/include/aputil/die.h
diff --git a/lib/ap/apcon.c b/lib/ap/apcon.c
@@ -22,8 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "apcon.h"
-#include "sock.h"
+#include <ap.h>
 
 char *
 apcon_getpath(char *path)
diff --git a/lib/ap/mkfile b/lib/ap/mkfile
@@ -3,8 +3,11 @@
 name = libap.a
 src = apcon.c sock.c
 obj = ${src:%.c=%.o}
+hdir = ../../include/ap
 mk = ../../mk
 
+cppflags = -I$hdir
+
 all:V: $name
 
 < $mk/config.mk
diff --git a/lib/aputil/mkfile b/lib/aputil/mkfile
@@ -3,8 +3,11 @@
 name = libaputil.a
 src = die.c
 obj = ${src:%.c=%.o}
+hdir = ../../include/aputil
 mk = ../../mk
 
+cppflags = -I$hdir
+
 all:V: $name
 
 < $mk/config.mk
diff --git a/mk/lib.mk b/mk/lib.mk
@@ -5,6 +5,8 @@ $name: $obj
 
 install:V: $name
         cp -f $name $prefix/lib
+	cp -rf $hdir $prefix/include
 
 uninstall:V:
         rm -f $prefix/lib/$name
+	rm -rf $prefix/include/$(basename $hdir)