summaryrefslogtreecommitdiffhomepage
path: root/auto/make
diff options
context:
space:
mode:
authorMax Romanov <max.romanov@nginx.com>2019-10-02 19:11:10 +0300
committerMax Romanov <max.romanov@nginx.com>2019-10-02 19:11:10 +0300
commit9b4e45cafcc8f1f74bcfce3071866ee5eab176a5 (patch)
tree0965b0c9334ce2e9280bb0501ad59e1d8a4c90fc /auto/make
parent2eb6f35ef5a5e72e3b16649dc52c55df617d3f0e (diff)
downloadunit-9b4e45cafcc8f1f74bcfce3071866ee5eab176a5.tar.gz
unit-9b4e45cafcc8f1f74bcfce3071866ee5eab176a5.tar.bz2
Fixed "make tests" build without preceding "make".
Currently almost all Unit object files depends on generated nxt_version.h. This patch adds missing dependence and fixes running make with multiple jobs. This closes #318 issue on GitHub.
Diffstat (limited to 'auto/make')
-rw-r--r--auto/make7
1 files changed, 2 insertions, 5 deletions
diff --git a/auto/make b/auto/make
index a5899c53..4b1e76fc 100644
--- a/auto/make
+++ b/auto/make
@@ -78,9 +78,6 @@ $NXT_VERSION_H: version
$echo '#define NXT_VERSION "\$(NXT_VERSION)"' > $NXT_VERSION_H
$echo '#define NXT_VERNUM \$(NXT_VERNUM)' >> $NXT_VERSION_H
-$NXT_BUILD_DIR/src/nxt_unit.o: $NXT_VERSION_H
-$NXT_BUILD_DIR/src/nxt_lib.o: $NXT_VERSION_H
-
END
@@ -119,7 +116,7 @@ do
nxt_dep_post=`nxt_gen_dep_post`
cat << END >> $NXT_MAKEFILE
-$NXT_BUILD_DIR/$nxt_obj: $nxt_src
+$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H
\$(CC) -c \$(CFLAGS) \$(NXT_LIB_INCS) $NXT_LIB_AUX_CFLAGS \\
-o $NXT_BUILD_DIR/$nxt_obj \\
$nxt_dep_flags \\
@@ -265,7 +262,7 @@ do
nxt_dep_post=`nxt_gen_dep_post`
cat << END >> $NXT_MAKEFILE
-$NXT_BUILD_DIR/$nxt_obj: $nxt_src
+$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H
\$(CC) -c \$(CFLAGS) \$(NXT_INCS) \\
$NXT_LIB_AUX_CFLAGS \\
-o $NXT_BUILD_DIR/$nxt_obj \\