]> Nishi Git Mirror - gwion.git/commitdiff
:wrench: Update build system
authorfennecdjay <astor.jeremie@wanadoo.fr>
Thu, 20 Jun 2019 00:14:38 +0000 (02:14 +0200)
committerfennecdjay <astor.jeremie@wanadoo.fr>
Thu, 20 Jun 2019 00:14:38 +0000 (02:14 +0200)
Makefile
ast
util

index 64258ff99f85f493d5fc7305c187ddfc580d1ea9..353853e588213cfd4fe186c9df39283930233180 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,10 +74,13 @@ CFLAGS += -DGWION_BUILTIN
 GWLIBS = libgwion.a ast/libgwion_ast.a util/libgwion_util.a
 _LDFLAGS = ${GWLIBS} ${LDFLAGS}
 
-all: options util/libgwion_util.a ast/libgwion_ast.a libgwion.a src/main.o
+all: options-show util/libgwion_util.a ast/libgwion_ast.a libgwion.a src/main.o
        $(info link ${PRG})
        @${CC} src/main.o -o ${PRG} ${_LDFLAGS} ${LIBS}
 
+options-show:
+       @$(call _options)
+
 libgwion.a: ${gwlib_obj}
        ${AR} ${AR_OPT}
 
@@ -107,6 +110,5 @@ test:
        @bash help/test.sh tests/* examples
 
 include $(wildcard .d/*.d)
-include util/target.mk
 include util/intl.mk
 include docs.mk
diff --git a/ast b/ast
index c43f0ae616811b5a927a4bcd0bd552037a7c09c9..7e45db213551d99358e9a05e718453156ac18287 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit c43f0ae616811b5a927a4bcd0bd552037a7c09c9
+Subproject commit 7e45db213551d99358e9a05e718453156ac18287
diff --git a/util b/util
index aea933e163b6840fc9fddb7a4f4ee7c531b9c13a..b1c0fd4049a357937387902ecb11077c265d2893 160000 (submodule)
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit aea933e163b6840fc9fddb7a4f4ee7c531b9c13a
+Subproject commit b1c0fd4049a357937387902ecb11077c265d2893