Adding module suffix for njs module files.

diff --git a/auto/make b/auto/make
index dae8416656dd3b7b2760fd7c28479ed4ed11e28d..5046c5b2e2d9e625726e78b08d022ecc76dfd618 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -174,7 +174,7 @@ njs_dep_post=`njs_gen_dep_post $njs_dep $njs_externals_obj`
 cat << END >> $NJS_MAKEFILE
 
 $NJS_BUILD_DIR/$njs_externals_obj: \\
-    $njs_src external/njs_webcrypto.c
+    $njs_src
        \$(NJS_CC) -c \$(NJS_CFLAGS) $NJS_LIB_AUX_CFLAGS \\
                \$(NJS_LIB_INCS) -Injs \\
                -o $NJS_BUILD_DIR/$njs_externals_obj \\

diff --git a/auto/modules b/auto/modules
index 5f20cc6f7e45c4a789acc33987ea0755755c2ae6..2bf04c7ebad885185221c620697ee977e98ddd70 100644 (file)
--- a/auto/modules
+++ b/auto/modules
@@ -9,26 +9,26 @@ njs_module_srcs=src/njs_buffer.c
 
 njs_module_name=njs_crypto_module
 njs_module_incs=
-njs_module_srcs=external/njs_crypto.c
+njs_module_srcs=external/njs_crypto_module.c
 
 . auto/module
 
 if [ $NJS_OPENSSL = YES -a $NJS_HAVE_OPENSSL = YES ]; then
        njs_module_name=njs_webcrypto_module
        njs_module_incs=
-       njs_module_srcs=external/njs_webcrypto.c
+       njs_module_srcs=external/njs_webcrypto_module.c
 
        . auto/module
 fi
 
 njs_module_name=njs_fs_module
 njs_module_incs=
-njs_module_srcs=external/njs_fs.c
+njs_module_srcs=external/njs_fs_module.c
 
 . auto/module
 
 njs_module_name=njs_query_string_module
 njs_module_incs=
-njs_module_srcs=external/njs_query_string.c
+njs_module_srcs=external/njs_query_string_module.c
 
 . auto/module

diff --git a/external/njs_crypto.c b/external/njs_crypto_module.c
similarity index 100%
rename from external/njs_crypto.c
rename to external/njs_crypto_module.c

diff --git a/external/njs_fs.c b/external/njs_fs_module.c
similarity index 100%
rename from external/njs_fs.c
rename to external/njs_fs_module.c

diff --git a/external/njs_query_string.c b/external/njs_query_string_module.c
similarity index 100%
rename from external/njs_query_string.c
rename to external/njs_query_string_module.c

diff --git a/external/njs_webcrypto.c b/external/njs_webcrypto_module.c
similarity index 100%
rename from external/njs_webcrypto.c
rename to external/njs_webcrypto_module.c

diff --git a/nginx/config b/nginx/config
index a0fbeeea691dd7e5682a7658ecf038f6456cf39b..3b4de1029ce49295ec621168ed9950214507c3ca 100644 (file)
--- a/nginx/config
+++ b/nginx/config
@@ -4,7 +4,7 @@ NJS_DEPS="$ngx_addon_dir/ngx_js.h \
     $ngx_addon_dir/ngx_js_fetch.h"
 NJS_SRCS="$ngx_addon_dir/ngx_js.c \
     $ngx_addon_dir/ngx_js_fetch.c \
-    $ngx_addon_dir/../external/njs_webcrypto.c"
+    $ngx_addon_dir/../external/njs_webcrypto_module.c"
 
 if [ $HTTP != NO ]; then
     ngx_module_type=HTTP_AUX_FILTER