[njs] Now a make command does not fail for obscure reason at

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/f0c94dd2bdb3
branches:  
changeset: 131:f0c94dd2bdb3
user:      Igor Sysoev <igor at sysoev.ru>
date:      Fri Jul 22 14:15:54 2016 +0300
description:
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.

diffstat:

 Makefile           |  10 ++++++++--
 nxt/auto/configure |   7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r eae6c48ff5c1 -r f0c94dd2bdb3 Makefile
--- a/Makefile	Thu Jul 21 21:42:58 2016 +0300
+++ b/Makefile	Fri Jul 22 14:15:54 2016 +0300
@@ -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 -r eae6c48ff5c1 -r f0c94dd2bdb3 nxt/auto/configure
--- a/nxt/auto/configure	Thu Jul 21 21:42:58 2016 +0300
+++ b/nxt/auto/configure	Fri Jul 22 14:15:54 2016 +0300
@@ -55,3 +55,10 @@ END
 . ${NXT_AUTO}memalign
 . ${NXT_AUTO}getrandom
 . ${NXT_AUTO}pcre
+
+
+cat << END >> $NXT_MAKEFILE_CONF
+
+target:		main
+
+END