From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 30 Nov 2016 11:53:15 +0000 (+0300)
Subject: Added more dependencies on nxt_auto_config.h.
X-Git-Tag: 0.1.6~14
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=64cb3fb107b2a65736ecb3f9b5acce5d25c05c17;p=njs.git

Added more dependencies on nxt_auto_config.h.
---

diff --git a/Makefile b/Makefile
index 5788b53c..cd92eab7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,8 @@ NXT_LIB =	nxt
 
 NXT_BUILDDIR =	build
 
-unconfigured:
-	@echo
-	@echo "	Please run ./configure before make"
-	@echo
-
-main:	$(NXT_BUILDDIR)/libnjs.a
-
 $(NXT_BUILDDIR)/libnjs.a: \
+	$(NXT_LIB)/nxt_auto_config.h \
 	$(NXT_BUILDDIR)/njscript.o \
 	$(NXT_BUILDDIR)/njs_vm.o \
 	$(NXT_BUILDDIR)/njs_boolean.o \
@@ -97,6 +91,12 @@ dist:
 	tar czf njs-$(NJS_VER).tar.gz njs-$(NJS_VER)
 	rm -rf njs-$(NJS_VER)
 
+$(NXT_LIB)/nxt_auto_config.h:
+	@echo
+	@echo "	Please run ./configure before make"
+	@echo
+	@exit 1
+
 $(NXT_BUILDDIR)/njscript.o: \
 	$(NXT_BUILDDIR)/libnxt.a \
 	njs/njs_vm.h \
diff --git a/nxt/Makefile b/nxt/Makefile
index 2f2431cc..cb51c74e 100644
--- a/nxt/Makefile
+++ b/nxt/Makefile
@@ -3,6 +3,7 @@ NXT_LIB =	nxt
 
 
 $(NXT_BUILDDIR)/libnxt.a: \
+	$(NXT_LIB)/nxt_auto_config.h \
 	$(NXT_BUILDDIR)/nxt_djb_hash.o \
 	$(NXT_BUILDDIR)/nxt_utf8.o \
 	$(NXT_BUILDDIR)/nxt_array.o \
diff --git a/nxt/auto/configure b/nxt/auto/configure
index b734c336..a4b828dd 100755
--- a/nxt/auto/configure
+++ b/nxt/auto/configure
@@ -55,10 +55,3 @@ END
 . ${NXT_AUTO}memalign
 . ${NXT_AUTO}getrandom
 . ${NXT_AUTO}pcre
-
-
-cat << END >> $NXT_MAKEFILE_CONF
-
-target:		main
-
-END
diff --git a/nxt/test/Makefile b/nxt/test/Makefile
index 08288b57..53e04970 100644
--- a/nxt/test/Makefile
+++ b/nxt/test/Makefile
@@ -1,5 +1,6 @@
 
 lib_test: \
+	$(NXT_LIB)/nxt_auto_config.h \
 	$(NXT_BUILDDIR)/random_unit_test \
 	$(NXT_BUILDDIR)/rbtree_unit_test \
 	$(NXT_BUILDDIR)/lvlhsh_unit_test \