[njs] Added more dependencies on nxt_auto_config.h.

Igor Sysoev igor at sysoev.ru
Wed Nov 30 11:53:37 UTC 2016


details:   http://hg.nginx.org/njs/rev/86c35adbd3f9
branches:  
changeset: 268:86c35adbd3f9
user:      Igor Sysoev <igor at sysoev.ru>
date:      Wed Nov 30 14:53:15 2016 +0300
description:
Added more dependencies on nxt_auto_config.h.

diffstat:

 Makefile           |  14 +++++++-------
 nxt/Makefile       |   1 +
 nxt/auto/configure |   7 -------
 nxt/test/Makefile  |   1 +
 4 files changed, 9 insertions(+), 14 deletions(-)

diffs (67 lines):

diff -r adfb758ad872 -r 86c35adbd3f9 Makefile
--- a/Makefile	Wed Nov 30 14:10:49 2016 +0300
+++ b/Makefile	Wed Nov 30 14:53:15 2016 +0300
@@ -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 -r adfb758ad872 -r 86c35adbd3f9 nxt/Makefile
--- a/nxt/Makefile	Wed Nov 30 14:10:49 2016 +0300
+++ b/nxt/Makefile	Wed Nov 30 14:53:15 2016 +0300
@@ -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 -r adfb758ad872 -r 86c35adbd3f9 nxt/auto/configure
--- a/nxt/auto/configure	Wed Nov 30 14:10:49 2016 +0300
+++ b/nxt/auto/configure	Wed Nov 30 14:53:15 2016 +0300
@@ -55,10 +55,3 @@ END
 . ${NXT_AUTO}memalign
 . ${NXT_AUTO}getrandom
 . ${NXT_AUTO}pcre
-
-
-cat << END >> $NXT_MAKEFILE_CONF
-
-target:		main
-
-END
diff -r adfb758ad872 -r 86c35adbd3f9 nxt/test/Makefile
--- a/nxt/test/Makefile	Wed Nov 30 14:10:49 2016 +0300
+++ b/nxt/test/Makefile	Wed Nov 30 14:53:15 2016 +0300
@@ -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 \



More information about the nginx-devel mailing list