From d5ea2f38f0f83c741b50d49bb4ed30a78cd0be51 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 22 Jul 2016 14:15:54 +0300 Subject: [PATCH] Now a make command does not fail for obscure reason at the very start or after "make clean" command but it offers to run the ./configure command instead. This change is not compatible with BSD PMake which does not support both "-include" and "sinclude" directives but only ".sinclude" directive so GNU Make should be used. --- Makefile | 10 ++++++++-- nxt/auto/configure | 7 +++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 74b6b78a..469d330b 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,16 @@ NJS_VER = 20150922 NXT_LIB = nxt -include $(NXT_LIB)/Makefile.conf +-include $(NXT_LIB)/Makefile.conf NXT_BUILDDIR = build +unconfigured: + @echo + @echo " Please run ./configure before make" + @echo + +main: $(NXT_BUILDDIR)/libnjs.a $(NXT_BUILDDIR)/libnjs.a: \ $(NXT_BUILDDIR)/njscript.o \ @@ -81,7 +87,7 @@ test: \ clean: rm -rf $(NXT_BUILDDIR) - rm $(NXT_LIB)/Makefile.conf $(NXT_LIB)/nxt_auto_config.h + rm -f $(NXT_LIB)/Makefile.conf $(NXT_LIB)/nxt_auto_config.h tarball: make clean diff --git a/nxt/auto/configure b/nxt/auto/configure index a4b828dd..b734c336 100755 --- a/nxt/auto/configure +++ b/nxt/auto/configure @@ -55,3 +55,10 @@ END . ${NXT_AUTO}memalign . ${NXT_AUTO}getrandom . ${NXT_AUTO}pcre + + +cat << END >> $NXT_MAKEFILE_CONF + +target: main + +END -- 2.47.3