From: fennecdjay Date: Thu, 20 Jun 2019 00:14:38 +0000 (+0200) Subject: :wrench: Update build system X-Git-Tag: nightly~2425 X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=802970a4fda1acd6403cf1572c50f4059da23e98;p=gwion.git :wrench: Update build system --- diff --git a/Makefile b/Makefile index 64258ff9..353853e5 100644 --- 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 c43f0ae6..7e45db21 160000 --- a/ast +++ b/ast @@ -1 +1 @@ -Subproject commit c43f0ae616811b5a927a4bcd0bd552037a7c09c9 +Subproject commit 7e45db213551d99358e9a05e718453156ac18287 diff --git a/util b/util index aea933e1..b1c0fd40 160000 --- a/util +++ b/util @@ -1 +1 @@ -Subproject commit aea933e163b6840fc9fddb7a4f4ee7c531b9c13a +Subproject commit b1c0fd4049a357937387902ecb11077c265d2893