:fire: put other libs in util

diff --git a/Makefile b/Makefile
index 1c386ffa190611c2fa714296c4b78ef3d436c36b..accc51a497a1bba46b414102119e92d72fcc5a94 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ test_dir += examples
 src := $(wildcard src/*.c)
 src += $(wildcard src/*/*.c)
 
-CFLAGS += -Iutil/include -Iutil/libtermcolor/include -Iast/include -Ilibcmdapp/src -D_GNU_SOURCE
+CFLAGS += -Iutil/include -Iast/include -D_GNU_SOURCE
 CFLAGS += -Iast/libprettyerr/src -Ifmt/include
 
 # add commit hash to version for now
@@ -58,9 +58,9 @@ ifeq ($(shell uname), Linux)
 LDFLAGS += -lrt
 endif
 
-ALMOST_LIBS := libcmdapp/libcmdapp.a fmt/libgwion_fmt.a
+ALMOST_LIBS := fmt/libgwion_fmt.a
 ALMOST_LIBS += ast/libgwion_ast.a ast/libprettyerr/libprettyerr.a
-ALMOST_LIBS += util/libgwion_util.a util/libtermcolor/libtermcolor.a
+ALMOST_LIBS += util/libgwion_util.a
 GWLIBS := lib${PRG}.a ${ALMOST_LIBS}
 LDFLAGS := ${GWLIBS} ${LDFLAGS}
 
@@ -88,9 +88,6 @@ lto:
 lib${PRG}.a: ${lib_obj}
        @${AR} ${AR_OPT}
 
-util/libtermcolor/libtermcolor.a:
-       @+${MAKE} BUILD_ON_WINDOWS=${BUILD_ON_WINDOWS} -s -C util/libtermcolor static
-
 util/libgwion_util.a:
        @+${MAKE} -s -C util
 
@@ -100,14 +97,11 @@ util: util/libgwion_util.a
 ast/libgwion_ast.a: util/libgwion_util.a
        @+ ${MAKE} -s -C ast
 
-libcmdapp/libcmdapp.a:
-       @+CFLAGS=-I$(shell pwd)/util/libtermcolor/include ${MAKE} -s -C libcmdapp static
-
 fmt/libgwion_fmt.a: ast/libgwion_ast.a
        @+${MAKE} -s -C fmt libgwion_fmt.a
 
-ast/libprettyerr/libprettyerr.a:
-       @+CFLAGS=-I$(shell pwd)/util/libtermcolor/include ${MAKE} -s -C ast/libprettyerr static
+ast/libprettyerr/libprettyerr.a: options-show
+       @+CFLAGS=-I$(shell pwd)/util/include ${MAKE} -s -C ast/libprettyerr static
 
 ast: ast/libgwion_ast.a
        @(info build ast)
@@ -123,12 +117,10 @@ clean_core:
        @rm -f core.* *vgcore.*
 
 clean-all: clean
-               ${MAKE} -s -C libcmdapp clean
                ${MAKE} -s -C fmt clean
                ${MAKE} -s -C ast clean
                ${MAKE} -s -C ast/libprettyerr clean
                ${MAKE} -s -C util clean
-               ${MAKE} -s -C util/libtermcolor clean
 
 update: clean-all
        bash scripts/update.sh

diff --git a/libcmdapp b/libcmdapp
deleted file mode 160000 (submodule)
index 625861f..0000000
--- a/libcmdapp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 625861f90f4989c5cbd0e0afc14779141bb721ba

diff --git a/util b/util
index 572b36317b9d6ca5b2a794ef2a5901a0656e811e..f28a1fed2973e5bf1806961709e7ebab0275ae5f 160000 (submodule)
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit 572b36317b9d6ca5b2a794ef2a5901a0656e811e
+Subproject commit f28a1fed2973e5bf1806961709e7ebab0275ae5f