Added more dependencies on nxt_auto_config.h.

diff --git a/Makefile b/Makefile
index 5788b53cc21377a40a906eb749a3830d78c67c06..cd92eab700da9953719718022f012860b69aabd5 100644 (file)
--- 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 2f2431ccbed80f065906d61b25e58dea7f0157c2..cb51c74e43b4ee07308bafc6b061cbb5030edde6 100644 (file)
--- 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 b734c336e28a3b483a963549b4bf196070b36083..a4b828dd575dc391b4982f856d3df14bc11e4818 100755 (executable)
--- 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 08288b57b1fe197ebdd505b2bfd9088ebc707a33..53e049705c9dd0fa61315d62079cb8a38af4692c 100644 (file)
--- 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 \