diff options
| author | Max Romanov <max.romanov@nginx.com> | 2019-10-02 19:11:10 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2019-10-02 19:11:10 +0300 |
| commit | 9b4e45cafcc8f1f74bcfce3071866ee5eab176a5 (patch) | |
| tree | 0965b0c9334ce2e9280bb0501ad59e1d8a4c90fc /auto | |
| parent | 2eb6f35ef5a5e72e3b16649dc52c55df617d3f0e (diff) | |
| download | unit-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')
| -rw-r--r-- | auto/make | 7 | ||||
| -rw-r--r-- | auto/modules/java | 2 | ||||
| -rw-r--r-- | auto/modules/perl | 2 | ||||
| -rw-r--r-- | auto/modules/php | 2 | ||||
| -rw-r--r-- | auto/modules/python | 2 | ||||
| -rw-r--r-- | auto/modules/ruby | 2 |
6 files changed, 7 insertions, 10 deletions
@@ -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 \\ diff --git a/auto/modules/java b/auto/modules/java index 24ee4927..b0fd62f1 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -336,7 +336,7 @@ for nxt_src in $NXT_JAVA_MODULE_SRCS; do cat << END >> $NXT_MAKEFILE -$NXT_BUILD_DIR/$nxt_obj: $nxt_src +$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H mkdir -p $NXT_BUILD_DIR/src/java \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_JAVA_INCLUDE \\ $nxt_dep_flags \\ diff --git a/auto/modules/perl b/auto/modules/perl index a4fd5437..e9d7e109 100644 --- a/auto/modules/perl +++ b/auto/modules/perl @@ -164,7 +164,7 @@ for nxt_src in $NXT_PERL_MODULE_SRCS; do cat << END >> $NXT_MAKEFILE -$NXT_BUILD_DIR/$nxt_obj: $nxt_src +$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H mkdir -p $NXT_BUILD_DIR/src/perl \$(CC) -c \$(CFLAGS) $NXT_PERL_CFLAGS \$(NXT_INCS) $NXT_PERL_INCLUDE \\ $nxt_dep_flags \\ diff --git a/auto/modules/php b/auto/modules/php index 362bbc69..97d1ac43 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -203,7 +203,7 @@ for nxt_src in $NXT_PHP_MODULE_SRCS; do 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_PHP_INCLUDE \\ -DNXT_ZEND_SIGNAL_STARTUP=$NXT_ZEND_SIGNAL_STARTUP \\ $nxt_dep_flags \\ diff --git a/auto/modules/python b/auto/modules/python index e298f5b9..abd145c9 100644 --- a/auto/modules/python +++ b/auto/modules/python @@ -149,7 +149,7 @@ for nxt_src in $NXT_PYTHON_MODULE_SRCS; do 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_PYTHON_INCLUDE \\ $nxt_dep_flags \\ -o $NXT_BUILD_DIR/$nxt_obj $nxt_src diff --git a/auto/modules/ruby b/auto/modules/ruby index 7d379f2f..407406ce 100644 --- a/auto/modules/ruby +++ b/auto/modules/ruby @@ -160,7 +160,7 @@ for nxt_src in $NXT_RUBY_MODULE_SRCS; do cat << END >> $NXT_MAKEFILE -$NXT_BUILD_DIR/$nxt_obj: $nxt_src +$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H mkdir -p $NXT_BUILD_DIR/src/ruby \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_RUBY_INCPATH \\ $nxt_dep_flags \\ |