From c93d2c76235ae6823ee59b1072338258897ae2d7 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Wed, 2 Aug 2017 13:18:04 +0300 Subject: [PATCH] Include build/Makefile into main Makefile. --- auto/make | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/auto/make b/auto/make index 607f02fb..9739ee4b 100644 --- a/auto/make +++ b/auto/make @@ -245,19 +245,18 @@ fi cat << END > Makefile -all: $NXT_BIN +.PHONY: $NXT_BIN lib_test -libnxt: - make -f $NXT_MAKEFILE libnxt +all: $NXT_BIN -lib_test: - make -f $NXT_MAKEFILE $NXT_BUILD_DIR/lib_unit_test - make -f $NXT_MAKEFILE $NXT_BUILD_DIR/utf8_file_name_test +include $NXT_MAKEFILE + + +lib_test: $NXT_BUILD_DIR/lib_unit_test $NXT_BUILD_DIR/utf8_file_name_test clean: rm -rf $NXT_BUILD_DIR *.dSYM Makefile -$NXT_BIN: - make -f $NXT_MAKEFILE $NXT_BUILD_DIR/$NXT_BIN +$NXT_BIN: $NXT_BUILD_DIR/$NXT_BIN END