From 2f94f6aee98f58dd7b7ce5818ecc8382ae096257 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Wed, 13 Mar 2019 15:04:58 +0800 Subject: [PATCH] Introducing UNIT makefile dependency scripts. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 1) Autogenerating Makefile. 2) Correct makefile dependency tracking. 3) Makefile.conf is removed. 4) nxt/auto scripts moved to auto. In collaboration with 洪志道 (Hong Zhi Dao). This closes #110 issue on Github. --- Makefile | 576 ------------------------------ {nxt/auto => auto}/clang | 52 +-- {nxt/auto => auto}/define | 0 auto/deps | 29 ++ {nxt/auto => auto}/echo | 0 {nxt/auto => auto}/editline | 26 +- {nxt/auto => auto}/expect | 16 +- {nxt/auto => auto}/explicit_bzero | 4 +- {nxt/auto => auto}/feature | 24 +- {nxt/auto => auto}/getrandom | 8 +- auto/make | 275 ++++++++++++++ {nxt/auto => auto}/memalign | 4 +- {nxt/auto => auto}/os | 16 +- {nxt/auto => auto}/pcre | 16 +- auto/sources | 65 ++++ {nxt/auto => auto}/time | 14 +- configure | 52 ++- nginx/config | 4 +- nginx/config.make | 2 +- nxt/Makefile | 273 -------------- nxt/auto/configure | 60 ---- nxt/test/Makefile | 57 --- 22 files changed, 503 insertions(+), 1070 deletions(-) delete mode 100644 Makefile rename {nxt/auto => auto}/clang (90%) rename {nxt/auto => auto}/define (100%) create mode 100644 auto/deps rename {nxt/auto => auto}/echo (100%) rename {nxt/auto => auto}/editline (75%) rename {nxt/auto => auto}/expect (53%) rename {nxt/auto => auto}/explicit_bzero (95%) rename {nxt/auto => auto}/feature (79%) rename {nxt/auto => auto}/getrandom (95%) create mode 100644 auto/make rename {nxt/auto => auto}/memalign (95%) rename {nxt/auto => auto}/os (80%) rename {nxt/auto => auto}/pcre (75%) create mode 100644 auto/sources rename {nxt/auto => auto}/time (90%) delete mode 100644 nxt/Makefile delete mode 100755 nxt/auto/configure delete mode 100644 nxt/test/Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index f7a364f5..00000000 --- a/Makefile +++ /dev/null @@ -1,576 +0,0 @@ - -NXT_LIB = nxt - --include $(NXT_LIB)/Makefile.conf - -NXT_BUILDDIR = build - -$(NXT_BUILDDIR)/libnjs.a: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_BUILDDIR)/njs_shell.o \ - $(NXT_BUILDDIR)/njs_vm.o \ - $(NXT_BUILDDIR)/njs_boolean.o \ - $(NXT_BUILDDIR)/njs_number.o \ - $(NXT_BUILDDIR)/njs_string.o \ - $(NXT_BUILDDIR)/njs_object.o \ - $(NXT_BUILDDIR)/njs_array.o \ - $(NXT_BUILDDIR)/njs_json.o \ - $(NXT_BUILDDIR)/njs_function.o \ - $(NXT_BUILDDIR)/njs_regexp.o \ - $(NXT_BUILDDIR)/njs_date.o \ - $(NXT_BUILDDIR)/njs_error.o \ - $(NXT_BUILDDIR)/njs_math.o \ - $(NXT_BUILDDIR)/njs_time.o \ - $(NXT_BUILDDIR)/njs_module.o \ - $(NXT_BUILDDIR)/njs_event.o \ - $(NXT_BUILDDIR)/njs_fs.o \ - $(NXT_BUILDDIR)/njs_crypto.o \ - $(NXT_BUILDDIR)/njs_extern.o \ - $(NXT_BUILDDIR)/njs_variable.o \ - $(NXT_BUILDDIR)/njs_builtin.o \ - $(NXT_BUILDDIR)/njs_lexer.o \ - $(NXT_BUILDDIR)/njs_lexer_keyword.o \ - $(NXT_BUILDDIR)/njs_parser.o \ - $(NXT_BUILDDIR)/njs_parser_expression.o \ - $(NXT_BUILDDIR)/njs_generator.o \ - $(NXT_BUILDDIR)/njs_disassembler.o \ - $(NXT_BUILDDIR)/nxt_diyfp.o \ - $(NXT_BUILDDIR)/nxt_dtoa.o \ - $(NXT_BUILDDIR)/nxt_strtod.o \ - $(NXT_BUILDDIR)/nxt_djb_hash.o \ - $(NXT_BUILDDIR)/nxt_utf8.o \ - $(NXT_BUILDDIR)/nxt_array.o \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_lvlhsh.o \ - $(NXT_BUILDDIR)/nxt_trace.o \ - $(NXT_BUILDDIR)/nxt_random.o \ - $(NXT_BUILDDIR)/nxt_md5.o \ - $(NXT_BUILDDIR)/nxt_sha1.o \ - $(NXT_BUILDDIR)/nxt_sha2.o \ - $(NXT_BUILDDIR)/nxt_pcre.o \ - $(NXT_BUILDDIR)/nxt_time.o \ - $(NXT_BUILDDIR)/nxt_file.o \ - $(NXT_BUILDDIR)/nxt_malloc.o \ - $(NXT_BUILDDIR)/nxt_mp.o \ - $(NXT_BUILDDIR)/nxt_sprintf.o \ - - ar -r -c $(NXT_BUILDDIR)/libnjs.a \ - $(NXT_BUILDDIR)/njs_shell.o \ - $(NXT_BUILDDIR)/njs_vm.o \ - $(NXT_BUILDDIR)/njs_boolean.o \ - $(NXT_BUILDDIR)/njs_number.o \ - $(NXT_BUILDDIR)/njs_string.o \ - $(NXT_BUILDDIR)/njs_object.o \ - $(NXT_BUILDDIR)/njs_array.o \ - $(NXT_BUILDDIR)/njs_json.o \ - $(NXT_BUILDDIR)/njs_function.o \ - $(NXT_BUILDDIR)/njs_regexp.o \ - $(NXT_BUILDDIR)/njs_date.o \ - $(NXT_BUILDDIR)/njs_error.o \ - $(NXT_BUILDDIR)/njs_math.o \ - $(NXT_BUILDDIR)/njs_time.o \ - $(NXT_BUILDDIR)/njs_module.o \ - $(NXT_BUILDDIR)/njs_event.o \ - $(NXT_BUILDDIR)/njs_fs.o \ - $(NXT_BUILDDIR)/njs_crypto.o \ - $(NXT_BUILDDIR)/njs_extern.o \ - $(NXT_BUILDDIR)/njs_variable.o \ - $(NXT_BUILDDIR)/njs_builtin.o \ - $(NXT_BUILDDIR)/njs_lexer.o \ - $(NXT_BUILDDIR)/njs_lexer_keyword.o \ - $(NXT_BUILDDIR)/njs_parser.o \ - $(NXT_BUILDDIR)/njs_parser_expression.o \ - $(NXT_BUILDDIR)/njs_generator.o \ - $(NXT_BUILDDIR)/njs_disassembler.o \ - $(NXT_BUILDDIR)/nxt_diyfp.o \ - $(NXT_BUILDDIR)/nxt_dtoa.o \ - $(NXT_BUILDDIR)/nxt_strtod.o \ - $(NXT_BUILDDIR)/nxt_djb_hash.o \ - $(NXT_BUILDDIR)/nxt_utf8.o \ - $(NXT_BUILDDIR)/nxt_array.o \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_lvlhsh.o \ - $(NXT_BUILDDIR)/nxt_trace.o \ - $(NXT_BUILDDIR)/nxt_random.o \ - $(NXT_BUILDDIR)/nxt_md5.o \ - $(NXT_BUILDDIR)/nxt_sha1.o \ - $(NXT_BUILDDIR)/nxt_sha2.o \ - $(NXT_BUILDDIR)/nxt_pcre.o \ - $(NXT_BUILDDIR)/nxt_time.o \ - $(NXT_BUILDDIR)/nxt_file.o \ - $(NXT_BUILDDIR)/nxt_malloc.o \ - $(NXT_BUILDDIR)/nxt_mp.o \ - $(NXT_BUILDDIR)/nxt_sprintf.o \ - -all: test lib_test - -njs: $(NXT_BUILDDIR)/njs - -libnjs: $(NXT_BUILDDIR)/libnjs.a - -njs_interactive_test: njs_expect_test $(NXT_BUILDDIR)/njs_interactive_test - $(NXT_BUILDDIR)/njs_interactive_test - -test: lib_test \ - njs_interactive_test \ - $(NXT_BUILDDIR)/njs_unit_test \ - $(NXT_BUILDDIR)/njs_benchmark \ - - $(NXT_BUILDDIR)/njs_unit_test - -clean: - rm -rf $(NXT_BUILDDIR) - rm -f $(NXT_LIB)/Makefile.conf $(NXT_LIB)/nxt_auto_config.h - -dist: - NJS_VER=`grep NJS_VERSION njs/njs.h | sed -e 's/.*"\(.*\)".*/\1/'`; \ - rm -rf njs-$${NJS_VER} \ - && hg archive njs-$${NJS_VER}.tar.gz \ - -p njs-$${NJS_VER} \ - -X ".hg*" \ - && echo njs-$${NJS_VER}.tar.gz done - -$(NXT_LIB)/nxt_auto_config.h: - @echo - @echo " Please run ./configure before make" - @echo - @exit 1 - -$(NXT_BUILDDIR)/njs_shell.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_function.h \ - njs/njs_parser.h \ - njs/njs_generator.h \ - njs/njs.h \ - njs/njs.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_shell.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs.c - -$(NXT_BUILDDIR)/njs_vm.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_number.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_object_hash.h \ - njs/njs_array.h \ - njs/njs_function.h \ - njs/njs_regexp.h \ - njs/njs_extern.h \ - njs/njs_variable.h \ - njs/njs_parser.h \ - njs/njs_vm.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_vm.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_vm.c - -$(NXT_BUILDDIR)/njs_boolean.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_vm.h \ - njs/njs_boolean.h \ - njs/njs_object.h \ - njs/njs_function.h \ - njs/njs_boolean.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_boolean.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_boolean.c - -$(NXT_BUILDDIR)/njs_number.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_number.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_array.h \ - njs/njs_function.h \ - njs/njs_number.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_number.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_number.c - -$(NXT_BUILDDIR)/njs_string.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_number.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_object_hash.h \ - njs/njs_array.h \ - njs/njs_function.h \ - njs/njs_regexp.h \ - njs/njs_parser.h \ - njs/njs_string.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_string.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs $(NXT_PCRE_CFLAGS) \ - njs/njs_string.c - -$(NXT_BUILDDIR)/njs_object.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_object.h \ - njs/njs_object_hash.h \ - njs/njs_function.h \ - njs/njs_object.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_object.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_object.c - -$(NXT_BUILDDIR)/njs_array.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_number.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_object_hash.h \ - njs/njs_array.h \ - njs/njs_function.h \ - njs/njs_array.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_array.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_array.c - -$(NXT_BUILDDIR)/njs_json.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_object.h \ - njs/njs_json.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_json.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_json.c - - -$(NXT_BUILDDIR)/njs_function.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_object.h \ - njs/njs_array.h \ - njs/njs_function.h \ - njs/njs_function.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_function.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_function.c - -$(NXT_BUILDDIR)/njs_regexp.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_object_hash.h \ - njs/njs_array.h \ - njs/njs_function.h \ - njs/njs_regexp.h \ - njs/njs_regexp.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_regexp.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs $(NXT_PCRE_CFLAGS) \ - njs/njs_regexp.c - -$(NXT_BUILDDIR)/njs_date.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_function.h \ - njs/njs_date.h \ - njs/njs_date.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_date.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs $(NXT_PCRE_CFLAGS) \ - njs/njs_date.c - -$(NXT_BUILDDIR)/njs_error.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_function.h \ - njs/njs_error.h \ - njs/njs_error.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_error.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs $(NXT_PCRE_CFLAGS) \ - njs/njs_error.c - -$(NXT_BUILDDIR)/njs_math.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_object.h \ - njs/njs_math.h \ - njs/njs_math.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_math.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_math.c - -$(NXT_BUILDDIR)/njs_time.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_object.h \ - njs/njs_time.h \ - njs/njs_time.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_time.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_time.c - -$(NXT_BUILDDIR)/njs_module.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_module.h \ - njs/njs_module.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_module.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_module.c - -$(NXT_BUILDDIR)/njs_event.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_event.h \ - njs/njs_event.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_event.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_event.c - -$(NXT_BUILDDIR)/njs_fs.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_vm.h \ - njs/njs_fs.h \ - njs/njs_fs.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_fs.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_fs.c - -$(NXT_BUILDDIR)/njs_crypto.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_crypto.h \ - njs/njs_crypto.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_crypto.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_crypto.c - -$(NXT_BUILDDIR)/njs_extern.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_parser.h \ - njs/njs_extern.h \ - njs/njs_extern.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_extern.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_extern.c - -$(NXT_BUILDDIR)/njs_variable.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_parser.h \ - njs/njs_variable.h \ - njs/njs_variable.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_variable.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_variable.c - -$(NXT_BUILDDIR)/njs_builtin.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_boolean.h \ - njs/njs_number.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_array.h \ - njs/njs_module.h \ - njs/njs_function.h \ - njs/njs_regexp.h \ - njs/njs_parser.h \ - njs/njs_builtin.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_builtin.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_builtin.c - -$(NXT_BUILDDIR)/njs_lexer.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_parser.h \ - njs/njs_lexer.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_lexer.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_lexer.c - -$(NXT_BUILDDIR)/njs_lexer_keyword.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_vm.h \ - njs/njs_number.h \ - njs/njs_object.h \ - njs/njs_parser.h \ - njs/njs_lexer_keyword.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_lexer_keyword.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_lexer_keyword.c - -$(NXT_BUILDDIR)/njs_parser.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_string.h \ - njs/njs_object.h \ - njs/njs_function.h \ - njs/njs_variable.h \ - njs/njs_parser.h \ - njs/njs_parser.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_parser.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_parser.c \ - -$(NXT_BUILDDIR)/njs_parser_expression.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_number.h \ - njs/njs_object.h \ - njs/njs_function.h \ - njs/njs_variable.h \ - njs/njs_parser.h \ - njs/njs_parser_expression.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_parser_expression.o \ - $(NXT_CFLAGS) -I$(NXT_LIB) -Injs \ - njs/njs_parser_expression.c - -$(NXT_BUILDDIR)/njs_generator.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_parser.h \ - njs/njs_generator.h \ - njs/njs_generator.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_generator.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_generator.c - -$(NXT_BUILDDIR)/njs_disassembler.o: \ - $(NXT_BUILDDIR)/libnxt.a \ - njs/njs.h \ - njs/njs_core.h \ - njs/njs_vm.h \ - njs/njs_object.h \ - njs/njs_parser.h \ - njs/njs_disassembler.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_disassembler.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/njs_disassembler.c - -$(NXT_BUILDDIR)/njs: \ - $(NXT_BUILDDIR)/libnxt.a \ - $(NXT_BUILDDIR)/libnjs.a \ - njs/njs_shell.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/njs $(NXT_CFLAGS) \ - -I$(NXT_LIB) $(NXT_EDITLINE_CFLAGS) -Injs \ - njs/njs_shell.c \ - $(NXT_BUILDDIR)/libnjs.a \ - -lm $(NXT_PCRE_LIB) $(NXT_LIBRT) $(NXT_EDITLINE_LIB) - -$(NXT_BUILDDIR)/njs_unit_test: \ - $(NXT_BUILDDIR)/libnxt.a \ - $(NXT_BUILDDIR)/libnjs.a \ - njs/test/njs_unit_test.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/njs_unit_test $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/test/njs_unit_test.c \ - $(NXT_BUILDDIR)/libnjs.a \ - -lm $(NXT_PCRE_LIB) $(NXT_LIBRT) - -$(NXT_BUILDDIR)/njs_interactive_test: \ - $(NXT_BUILDDIR)/libnxt.a \ - $(NXT_BUILDDIR)/libnjs.a \ - njs/test/njs_interactive_test.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/njs_interactive_test $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/test/njs_interactive_test.c \ - $(NXT_BUILDDIR)/libnjs.a \ - -lm $(NXT_PCRE_LIB) $(NXT_LIBRT) - -$(NXT_BUILDDIR)/njs_benchmark: \ - $(NXT_BUILDDIR)/libnxt.a \ - $(NXT_BUILDDIR)/libnjs.a \ - njs/test/njs_benchmark.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/njs_benchmark $(NXT_CFLAGS) \ - -I$(NXT_LIB) -Injs \ - njs/test/njs_benchmark.c \ - $(NXT_BUILDDIR)/libnjs.a \ - -lm $(NXT_PCRE_LIB) $(NXT_LIBRT) - -include $(NXT_LIB)/Makefile diff --git a/nxt/auto/clang b/auto/clang similarity index 90% rename from nxt/auto/clang rename to auto/clang index 7aa675a1..9769a12e 100644 --- a/nxt/auto/clang +++ b/auto/clang @@ -3,7 +3,7 @@ # Copyright (C) NGINX, Inc. -$nxt_echo checking for C compiler: $CC +$echo checking for C compiler: $CC cat << END >> $NXT_AUTOCONF_ERR ---------------------------------------- checking for C compiler: $CC @@ -14,9 +14,9 @@ END set +e if [ -z `which $CC` ]; then - $nxt_echo - $nxt_echo $0: error: $CC not found. - $nxt_echo + $echo + $echo $0: error: $CC not found. + $echo exit 1; fi @@ -24,34 +24,34 @@ fi if `/bin/sh -c "($CC -v)" 2>&1 | grep "gcc version" >> $NXT_AUTOCONF_ERR 2>&1` then NXT_CC_NAME=gcc - $nxt_echo " + using GNU C compiler" + $echo " + using GNU C compiler" NXT_CC_VERSION=`/bin/sh -c "($CC -v)" 2>&1 | grep "gcc version" 2>&1` - $nxt_echo " + $NXT_CC_VERSION" + $echo " + $NXT_CC_VERSION" else if `/bin/sh -c "($CC -v)" 2>&1 | grep "clang version" >> $NXT_AUTOCONF_ERR 2>&1` then NXT_CC_NAME=clang - $nxt_echo " + using Clang C compiler" + $echo " + using Clang C compiler" NXT_CC_VERSION=`/bin/sh -c "($CC -v)" 2>&1 | grep "clang version" 2>&1` - $nxt_echo " + $NXT_CC_VERSION" + $echo " + $NXT_CC_VERSION" else if `/bin/sh -c "($CC -v)" 2>&1 \ | grep "Apple LLVM version" >> $NXT_AUTOCONF_ERR 2>&1` then NXT_CC_NAME=clang - $nxt_echo " + using Clang C compiler" + $echo " + using Clang C compiler" NXT_CC_VERSION=`/bin/sh -c "($CC -v)" 2>&1 | grep "Apple LLVM version" 2>&1` - $nxt_echo " + $NXT_CC_VERSION" + $echo " + $NXT_CC_VERSION" else if `/bin/sh -c "($CC -V)" 2>&1 | grep "Sun C" >> $NXT_AUTOCONF_ERR 2>&1` then NXT_CC_NAME=SunC - $nxt_echo " + using Sun C compiler" + $echo " + using Sun C compiler" NXT_CC_VERSION=`/bin/sh -c "($CC -V)" 2>&1 | grep "Sun C" 2>&1` - $nxt_echo " + $NXT_CC_VERSION" + $echo " + $NXT_CC_VERSION" fi # SunC fi # Apple LLVM clang @@ -62,7 +62,7 @@ fi # gcc case $NXT_CC_NAME in gcc) - nxt_define=NXT_GCC . ${NXT_AUTO}define + nxt_define=NXT_GCC . auto/define NXT_CFLAGS="$NXT_CFLAGS -pipe" NXT_CFLAGS="$NXT_CFLAGS -fPIC" @@ -102,7 +102,7 @@ case $NXT_CC_NAME in ;; clang) - nxt_define=NXT_CLANG . ${NXT_AUTO}define + nxt_define=NXT_CLANG . auto/define NXT_CFLAGS="$NXT_CFLAGS -pipe" NXT_CFLAGS="$NXT_CFLAGS -fPIC" @@ -138,7 +138,7 @@ case $NXT_CC_NAME in ;; SunC) - nxt_define=NXT_SUNC . ${NXT_AUTO}define + nxt_define=NXT_SUNC . auto/define NXT_CFLAGS="$NXT_CFLAGS -fPIC" # Optimization. @@ -157,7 +157,7 @@ esac # Stop on error exit status again. set -e -cat << END >> $NXT_MAKEFILE_CONF +cat << END >> $NXT_MAKEFILE NXT_CC = ${CC} NXT_CFLAGS = ${NXT_CFLAGS} ${CFLAGS} @@ -175,7 +175,7 @@ nxt_feature_test="int main(void) { unsigned __int128 p = 0; return (int) p; }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __builtin_expect()" @@ -189,7 +189,7 @@ nxt_feature_test="int main(int argc, char *const *argv) { return 0; return 1; }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __builtin_unreachable()" @@ -200,7 +200,7 @@ nxt_feature_libs= nxt_feature_test="int main(void) { __builtin_unreachable(); }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __builtin_prefetch()" @@ -212,7 +212,7 @@ nxt_feature_test="int main(void) { __builtin_prefetch(0); return 0; }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __builtin_clz()" @@ -226,7 +226,7 @@ nxt_feature_test="int main(void) { } return 0; }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __builtin_clzll()" @@ -240,7 +240,7 @@ nxt_feature_test="int main(void) { } return 0; }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __attribute__ visibility" @@ -253,7 +253,7 @@ nxt_feature_test="int n __attribute__ ((visibility(\"default\"))); int main(void) { return 0; }" -. ${NXT_AUTO}feature +. auto/feature nxt_feature="GCC __attribute__ malloc" @@ -275,7 +275,7 @@ nxt_feature_test="#include } return 0; }" -. ${NXT_AUTO}feature +. auto/feature nxt_os="$NXT_SYSTEM/$NXT_SYSTEM_PLATFORM" @@ -299,7 +299,7 @@ else int main(void) { return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi @@ -318,4 +318,4 @@ nxt_feature_test="#include printf(\"%x\", (uint32_t) i64); return 0; }" -. ${NXT_AUTO}feature +. auto/feature diff --git a/nxt/auto/define b/auto/define similarity index 100% rename from nxt/auto/define rename to auto/define diff --git a/auto/deps b/auto/deps new file mode 100644 index 00000000..3af6092f --- /dev/null +++ b/auto/deps @@ -0,0 +1,29 @@ + +# Copyright (C) Igor Sysoev +# Copyright (C) NGINX, Inc. + + +case "$NXT_CC_NAME" in + + SunC): + nxt_gen_dep_flags() { + $echo "-xMMD -xMF $NXT_BUILD_DIR/$1.tmp" + } + + nxt_gen_dep_post() { + $echo -n "@sed -e 's#^.*:#$NXT_BUILD_DIR/$2:#' " + $echo -n "$NXT_BUILD_DIR/$1.tmp > $NXT_BUILD_DIR/$1" + $echo " && rm -f $NXT_BUILD_DIR/$1.tmp" + } + ;; + + *) + nxt_gen_dep_flags() { + $echo "-MMD -MF $NXT_BUILD_DIR/$1 -MT $NXT_BUILD_DIR/$2" + } + + nxt_gen_dep_post() { + $echo "" + } + ;; +esac diff --git a/nxt/auto/echo b/auto/echo similarity index 100% rename from nxt/auto/echo rename to auto/echo diff --git a/nxt/auto/editline b/auto/editline similarity index 75% rename from nxt/auto/editline rename to auto/editline index 7a635321..3a3551e1 100644 --- a/nxt/auto/editline +++ b/auto/editline @@ -1,6 +1,10 @@ # Copyright (C) Dmitry Volyntsev # Copyright (C) NGINX, Inc. + +NXT_EDITLINE_CFLAGS= +NXT_EDITLINE_LIB= + nxt_found=no nxt_feature="editline library" @@ -15,7 +19,7 @@ nxt_feature_test="#include add_history(NULL); return 0; }" -. ${NXT_AUTO}feature +. auto/feature if [ $nxt_found = no ]; then @@ -37,23 +41,15 @@ if [ $nxt_found = no ]; then . auto/feature fi +NXT_DEFAULT_TARGET=libnjs + if [ $nxt_found = yes ]; then NXT_HAVE_LIBEDIT=YES - cat << END >> $NXT_MAKEFILE_CONF - -NXT_EDITLINE_CFLAGS = $nxt_feature_incs -NXT_EDITLINE_LIB = $nxt_feature_libs - -default: njs -END + NXT_EDITLINE_CFLAGS=$nxt_feature_incs + NXT_EDITLINE_LIB=$nxt_feature_libs + NXT_DEFAULT_TARGET="$NXT_DEFAULT_TARGET njs" else NXT_HAVE_LIBEDIT=NO - $nxt_echo " - building interactive shell is not possible" - - cat << END >> $NXT_MAKEFILE_CONF - -default: libnjs -END - + $echo " - building interactive shell is not possible" fi diff --git a/nxt/auto/expect b/auto/expect similarity index 53% rename from nxt/auto/expect rename to auto/expect index 8ea8eb9b..befb7fa8 100644 --- a/nxt/auto/expect +++ b/auto/expect @@ -3,31 +3,31 @@ # Copyright (C) NGINX, Inc. nxt_found=no -$nxt_echo -n "checking for expect ..." +$echo -n "checking for expect ..." if /bin/sh -c "(expect -v)" >> $NXT_AUTOCONF_ERR 2>&1; then nxt_found=yes fi if [ $nxt_found = yes ]; then - $nxt_echo " found" - $nxt_echo " + Expect version: `expect -v`" + $echo " found" + $echo " + Expect version: `expect -v`" else - $nxt_echo " not found" + $echo " not found" fi if [ $nxt_found = yes -a $NXT_HAVE_LIBEDIT = YES ]; then - cat << END >> $NXT_MAKEFILE_CONF + cat << END >> $NXT_MAKEFILE njs_expect_test: njs njs/test/njs_expect_test.exp - PATH=\$(NXT_BUILDDIR):\$(PATH) expect -f njs/test/njs_expect_test.exp + PATH=$NXT_BUILD_DIR:\$(PATH) expect -f njs/test/njs_expect_test.exp END else - $nxt_echo " - expect tests are disabled" + $echo " - expect tests are disabled" - cat << END >> $NXT_MAKEFILE_CONF + cat << END >> $NXT_MAKEFILE njs_expect_test: @echo "Skipping expect tests" diff --git a/nxt/auto/explicit_bzero b/auto/explicit_bzero similarity index 95% rename from nxt/auto/explicit_bzero rename to auto/explicit_bzero index f18e6248..dc940094 100644 --- a/nxt/auto/explicit_bzero +++ b/auto/explicit_bzero @@ -19,7 +19,7 @@ nxt_feature_test="#include explicit_bzero(&r, sizeof(r)); return 0; }" -. ${NXT_AUTO}feature +. auto/feature if [ $nxt_found = no ]; then @@ -36,5 +36,5 @@ if [ $nxt_found = no ]; then explicit_memset(&r, 0, sizeof(r)); return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi diff --git a/nxt/auto/feature b/auto/feature similarity index 79% rename from nxt/auto/feature rename to auto/feature index 73886f38..fa03be02 100644 --- a/nxt/auto/feature +++ b/auto/feature @@ -3,7 +3,7 @@ # Copyright (C) NGINX, Inc. -$nxt_echo -n "checking for $nxt_feature ..." +$echo -n "checking for $nxt_feature ..." cat << END >> $NXT_AUTOCONF_ERR ---------------------------------------- @@ -52,10 +52,10 @@ if [ -x $NXT_AUTOTEST ]; then value) if /bin/sh -c "($NXT_AUTOTEST)" >> $NXT_AUTOCONF_ERR 2>&1; then - $nxt_echo >> $NXT_AUTOCONF_ERR + $echo >> $NXT_AUTOCONF_ERR nxt_found=yes nxt_feature_value=`$NXT_AUTOTEST` - $nxt_echo " $nxt_feature_value" + $echo " $nxt_feature_value" if [ -n "$nxt_feature_name" ]; then cat << END >> $NXT_AUTO_CONFIG_H @@ -66,13 +66,13 @@ if [ -x $NXT_AUTOTEST ]; then END fi else - $nxt_echo " not found" + $echo " not found" fi ;; yes) if /bin/sh -c "($NXT_AUTOTEST)" >> $NXT_AUTOCONF_ERR 2>&1; then - $nxt_echo " found" + $echo " found" nxt_found=yes cat << END >> $NXT_AUTO_CONFIG_H @@ -82,12 +82,12 @@ END END else - $nxt_echo " found but is not working" + $echo " found but is not working" fi ;; *) - $nxt_echo " found" + $echo " found" nxt_found=yes cat << END >> $NXT_AUTO_CONFIG_H @@ -100,13 +100,13 @@ END esac else - $nxt_echo " not found" + $echo " not found" - $nxt_echo "----------" >> $NXT_AUTOCONF_ERR + $echo "----------" >> $NXT_AUTOCONF_ERR cat $NXT_AUTOTEST.c >> $NXT_AUTOCONF_ERR - $nxt_echo "----------" >> $NXT_AUTOCONF_ERR - $nxt_echo $nxt_test >> $NXT_AUTOCONF_ERR - $nxt_echo "----------" >> $NXT_AUTOCONF_ERR + $echo "----------" >> $NXT_AUTOCONF_ERR + $echo $nxt_test >> $NXT_AUTOCONF_ERR + $echo "----------" >> $NXT_AUTOCONF_ERR fi rm -rf $NXT_AUTOTEST* diff --git a/nxt/auto/getrandom b/auto/getrandom similarity index 95% rename from nxt/auto/getrandom rename to auto/getrandom index 5e0e819e..34e61dab 100644 --- a/nxt/auto/getrandom +++ b/auto/getrandom @@ -22,7 +22,7 @@ nxt_feature_test="#include return 0; }" -. ${NXT_AUTO}feature +. auto/feature if [ $nxt_found = no ]; then @@ -44,7 +44,7 @@ if [ $nxt_found = no ]; then return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi @@ -65,7 +65,7 @@ if [ $nxt_found = no ]; then return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi @@ -87,5 +87,5 @@ if [ $nxt_found = no ]; then return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi diff --git a/auto/make b/auto/make new file mode 100644 index 00000000..27153000 --- /dev/null +++ b/auto/make @@ -0,0 +1,275 @@ + +# Copyright (C) Igor Sysoev +# Copyright (C) NGINX, Inc. + +. auto/deps + +$echo "creating $NXT_MAKEFILE" + +mkdir -p $NXT_BUILD_DIR/src +mkdir -p $NXT_BUILD_DIR/test + + +cat << END > $NXT_MAKEFILE + +# This file is auto-generated by configure + +NXT_CC = ${CC} +NXT_CFLAGS = ${NXT_CFLAGS} ${CFLAGS} + +default: $NXT_DEFAULT_TARGET +END + + +# The nxt include paths list. + +$echo -n "NXT_LIB_INCS =" >> $NXT_MAKEFILE + +for nxt_inc in nxt $NXT_BUILD_DIR +do + $echo -n " -I $nxt_inc" >> $NXT_MAKEFILE +done + +$echo >> $NXT_MAKEFILE +$echo >> $NXT_MAKEFILE + + +# The nxt object files list. + +$echo "NXT_LIB_OBJS = \\" >> $NXT_MAKEFILE + +for nxt_src in $NXT_LIB_SRCS +do + fname=$(basename $nxt_src) + nxt_obj="src/${fname%.c}.o" + $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE +done + +$echo >> $NXT_MAKEFILE + + +# The nxt static library. + +cat << END >> $NXT_MAKEFILE + +libnxt: $NXT_BUILD_DIR/libnxt.a + +$NXT_BUILD_DIR/libnxt.a: \\ + $NXT_BUILD_DIR/nxt_auto_config.h \\ + \$(NXT_LIB_OBJS) + ar -r -c $NXT_BUILD_DIR/libnxt.a \\ + \$(NXT_LIB_OBJS) + +END + + +# The nxt object files. + +for nxt_src in $NXT_LIB_SRCS +do + fname=$(basename $nxt_src) + nxt_obj="src/${fname%.c}.o" + nxt_dep="src/${fname%.c}.dep" + nxt_dep_flags=`nxt_gen_dep_flags $nxt_dep $nxt_obj` + nxt_dep_post=`nxt_gen_dep_post $nxt_dep $nxt_obj` + cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/$nxt_obj: $nxt_src + \$(NXT_CC) -c \$(NXT_CFLAGS) $NXT_LIB_AUX_CFLAGS \\ + \$(NXT_LIB_INCS) -o $NXT_BUILD_DIR/$nxt_obj \\ + $nxt_dep_flags \\ + $nxt_src \\ + $nxt_dep_post + +-include $NXT_BUILD_DIR/$nxt_dep + +END + +done + +# nxt tests. + +for nxt_src in $NXT_TEST_SRCS +do + fname=$(basename $nxt_src) + nxt_dep="test/${fname%.c}.dep" + nxt_bin="${fname%.c}" + nxt_dep_flags=`nxt_gen_dep_flags $nxt_dep $fname` + nxt_dep_post=`nxt_gen_dep_post $nxt_dep $fname` + cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/$nxt_bin: $nxt_src \\ + $NXT_BUILD_DIR/libnxt.a + \$(NXT_CC) -o $NXT_BUILD_DIR/$nxt_bin \$(NXT_CFLAGS) \\ + \$(NXT_LIB_INCS) $nxt_dep_flags \\ + $nxt_src $NXT_BUILD_DIR/libnxt.a \\ + $nxt_dep_post + +-include $NXT_BUILD_DIR/$nxt_dep + +END + +done + +# The njs object files list. + +$echo "NJS_LIB_OBJS = \\" >> $NXT_MAKEFILE + +for njs_src in $NJS_LIB_SRCS +do + fname=$(basename $njs_src) + njs_obj="src/${fname%.c}.o" + $echo " $NXT_BUILD_DIR/$njs_obj \\" >> $NXT_MAKEFILE +done + +$echo >> $NXT_MAKEFILE + + +# The njs static library. + +cat << END >> $NXT_MAKEFILE + +libnjs: $NXT_BUILD_DIR/libnjs.a + +$NXT_BUILD_DIR/libnjs.a: \\ + $NXT_BUILD_DIR/nxt_auto_config.h \\ + \$(NXT_LIB_OBJS) \\ + \$(NJS_LIB_OBJS) + + ar -r -c $NXT_BUILD_DIR/libnjs.a \\ + \$(NXT_LIB_OBJS) \\ + \$(NJS_LIB_OBJS) + +END + + +# object files. + +for njs_src in $NJS_LIB_SRCS +do + fname=$(basename $njs_src) + njs_obj="src/${fname%.c}.o" + njs_dep="src/${fname%.c}.dep" + njs_dep_flags=`nxt_gen_dep_flags $njs_dep $njs_obj` + njs_dep_post=`nxt_gen_dep_post $njs_dep $njs_obj` + cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/$njs_obj: $njs_src + \$(NXT_CC) -c \$(NXT_CFLAGS) $NXT_LIB_AUX_CFLAGS \\ + \$(NXT_LIB_INCS) -Injs \\ + -o $NXT_BUILD_DIR/$njs_obj \\ + $njs_dep_flags \\ + $njs_src + $njs_dep_post + +-include $NXT_BUILD_DIR/$njs_dep + +END + +done + +# njs cli. + +cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/njs: \\ + $NXT_BUILD_DIR/libnxt.a \\ + $NXT_BUILD_DIR/libnjs.a \\ + njs/njs_shell.c + \$(NXT_CC) -o $NXT_BUILD_DIR/njs \$(NXT_CFLAGS) \\ + $NXT_LIB_AUX_CFLAGS \$(NXT_LIB_INCS) \\ + $NXT_EDITLINE_CFLAGS -Injs \\ + njs/njs_shell.c \\ + $NXT_BUILD_DIR/libnjs.a \\ + -lm $NXT_LIBS $NXT_LIB_AUX_LIBS $NXT_EDITLINE_LIB + +END + +# njs tests. + +for njs_src in $NJS_TEST_SRCS +do + fname=$(basename $njs_src) + njs_dep="test/${fname%.c}.dep" + njs_bin="${fname%.c}" + njs_dep_flags=`nxt_gen_dep_flags $njs_dep $fname` + njs_dep_post=`nxt_gen_dep_post $njs_dep $fname` + cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/$njs_bin: $njs_src \\ + $NXT_BUILD_DIR/libnxt.a \\ + $NXT_BUILD_DIR/libnjs.a + \$(NXT_CC) -o $NXT_BUILD_DIR/$njs_bin \$(NXT_CFLAGS) \\ + $NXT_LIB_AUX_CFLAGS \$(NXT_LIB_INCS) \\ + $njs_dep_flags \\ + -Injs $njs_src $NXT_BUILD_DIR/libnjs.a \\ + -lm $NXT_LIBS $NXT_LIB_AUX_LIBS + $njs_dep_post + +-include $NXT_BUILD_DIR/$njs_dep + +END + +done + +# main targets. + +cat << END >> $NXT_MAKEFILE + +$NXT_BUILD_DIR/nxt_auto_config.h: + @echo + @echo " Please run ./configure before make" + @echo + @exit 1 + +all: $NXT_BUILD_DIR/nxt_auto_config.h test lib_test benchmark + +njs: $NXT_BUILD_DIR/nxt_auto_config.h $NXT_BUILD_DIR/njs + +lib_test: $NXT_BUILD_DIR/nxt_auto_config.h \\ + $NXT_BUILD_DIR/random_unit_test \\ + $NXT_BUILD_DIR/rbtree_unit_test \\ + $NXT_BUILD_DIR/lvlhsh_unit_test \\ + $NXT_BUILD_DIR/utf8_unit_test + + $NXT_BUILD_DIR/random_unit_test + $NXT_BUILD_DIR/rbtree_unit_test + $NXT_BUILD_DIR/lvlhsh_unit_test + $NXT_BUILD_DIR/utf8_unit_test + +test: $NXT_BUILD_DIR/nxt_auto_config.h \\ + njs_expect_test \\ + $NXT_BUILD_DIR/njs_unit_test \\ + $NXT_BUILD_DIR/njs_interactive_test + + $NXT_BUILD_DIR/njs_unit_test + $NXT_BUILD_DIR/njs_interactive_test + +benchmark: $NXT_BUILD_DIR/nxt_auto_config.h \\ + $NXT_BUILD_DIR/njs_benchmark + + $NXT_BUILD_DIR/njs_benchmark v + +dist: + NJS_VER=`grep NJS_VERSION njs/njs.h | sed -e 's/.*"\(.*\)".*/\1/'`; \\ + rm -rf njs-\$\${NJS_VER} \\ + && hg archive njs-\$\${NJS_VER}.tar.gz \\ + -p njs-\$\${NJS_VER} \\ + -X ".hg*" \\ + && echo njs-\$\${NJS_VER}.tar.gz done +END + + +# Makefile. + +cat << END > Makefile + +# This file is auto-generated by configure + +include $NXT_MAKEFILE + +.PHONY: clean +clean: + rm -rf $NXT_BUILD_DIR Makefile + +END diff --git a/nxt/auto/memalign b/auto/memalign similarity index 95% rename from nxt/auto/memalign rename to auto/memalign index 2c7936e1..799fea2b 100644 --- a/nxt/auto/memalign +++ b/auto/memalign @@ -22,7 +22,7 @@ nxt_feature_test="#include free(p); return 0; }" -. ${NXT_AUTO}feature +. auto/feature if [ $nxt_found = no ]; then @@ -46,5 +46,5 @@ if [ $nxt_found = no ]; then free(p); return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi diff --git a/nxt/auto/os b/auto/os similarity index 80% rename from nxt/auto/os rename to auto/os index e4f6d26a..0476647e 100644 --- a/nxt/auto/os +++ b/auto/os @@ -9,11 +9,11 @@ NXT_SYSTEM=`uname -s 2>/dev/null` case "$NXT_SYSTEM" in Linux) - nxt_define=NXT_LINUX . ${NXT_AUTO}define + nxt_define=NXT_LINUX . auto/define NXT_SYSTEM_VERSION=`uname -r 2>/dev/null` # Linux uname -p can return "unknown". NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` - nxt_echo=echo + echo=echo CC=${CC:-cc} # NAN and INFINITY require _GNU_SOURCE on old Linux. @@ -23,16 +23,16 @@ case "$NXT_SYSTEM" in FreeBSD | NetBSD | OpenBSD) NXT_SYSTEM_VERSION=`uname -r 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` - nxt_echo=echo + echo=echo CC=${CC:-cc} ;; SunOS) - nxt_define=NXT_SOLARIS . ${NXT_AUTO}define + nxt_define=NXT_SOLARIS . auto/define NXT_SYSTEM_VERSION=`uname -r 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null` # Solaris /bin/sh and /bin/echo do not support "-n" option. - nxt_echo=auto/echo + echo=auto/echo CC=${CC:-gcc} ;; @@ -41,17 +41,17 @@ case "$NXT_SYSTEM" in NXT_SYSTEM_PLATFORM=`uname -m 2>/dev/null` # MacOSX /bin/sh is bash and its embedded "echo" command # does not support "-n" option. - nxt_echo=/bin/echo + echo=/bin/echo CC=${CC:-cc} ;; *) NXT_SYSTEM_VERSION=`uname -r 2>/dev/null` NXT_SYSTEM_PLATFORM=`uname -p 2>/dev/null` - nxt_echo=echo + echo=echo CC=${CC:-gcc} ;; esac -$nxt_echo configuring for $NXT_SYSTEM $NXT_SYSTEM_VERSION $NXT_SYSTEM_PLATFORM +$echo configuring for $NXT_SYSTEM $NXT_SYSTEM_VERSION $NXT_SYSTEM_PLATFORM diff --git a/nxt/auto/pcre b/auto/pcre similarity index 75% rename from nxt/auto/pcre rename to auto/pcre index 4e15d57c..38057ce7 100644 --- a/nxt/auto/pcre +++ b/auto/pcre @@ -28,20 +28,14 @@ if /bin/sh -c "(pcre-config --version)" >> $NXT_AUTOCONF_ERR 2>&1; then return 1; return 0; }" - . ${NXT_AUTO}feature + . auto/feature fi if [ $nxt_found = no ]; then - $nxt_echo - $nxt_echo $0: error: no PCRE library found. - $nxt_echo + $echo + $echo $0: error: no PCRE library found. + $echo exit 1; fi -$nxt_echo " + PCRE version: `pcre-config --version`" - -cat << END >> $NXT_MAKEFILE_CONF - -NXT_PCRE_CFLAGS = ${NXT_PCRE_CFLAGS} -NXT_PCRE_LIB = ${NXT_PCRE_LIB} -END +$echo " + PCRE version: `pcre-config --version`" diff --git a/auto/sources b/auto/sources new file mode 100644 index 00000000..525e5467 --- /dev/null +++ b/auto/sources @@ -0,0 +1,65 @@ +NXT_LIB_SRCS=" \ + nxt/nxt_diyfp.c \ + nxt/nxt_dtoa.c \ + nxt/nxt_strtod.c \ + nxt/nxt_murmur_hash.c \ + nxt/nxt_djb_hash.c \ + nxt/nxt_utf8.c \ + nxt/nxt_array.c \ + nxt/nxt_rbtree.c \ + nxt/nxt_lvlhsh.c \ + nxt/nxt_trace.c \ + nxt/nxt_random.c \ + nxt/nxt_md5.c \ + nxt/nxt_sha1.c \ + nxt/nxt_sha2.c \ + nxt/nxt_pcre.c \ + nxt/nxt_time.c \ + nxt/nxt_file.c \ + nxt/nxt_malloc.c \ + nxt/nxt_mp.c \ + nxt/nxt_sprintf.c \ +" + +NXT_TEST_SRCS=" \ + nxt/test/lvlhsh_unit_test.c \ + nxt/test/random_unit_test.c \ + nxt/test/rbtree_unit_test.c \ + nxt/test/utf8_unit_test.c \ +" + +NJS_LIB_SRCS=" \ + njs/njs.c \ + njs/njs_vm.c \ + njs/njs_boolean.c \ + njs/njs_number.c \ + njs/njs_string.c \ + njs/njs_object.c \ + njs/njs_array.c \ + njs/njs_json.c \ + njs/njs_function.c \ + njs/njs_regexp.c \ + njs/njs_date.c \ + njs/njs_error.c \ + njs/njs_math.c \ + njs/njs_time.c \ + njs/njs_module.c \ + njs/njs_event.c \ + njs/njs_fs.c \ + njs/njs_crypto.c \ + njs/njs_extern.c \ + njs/njs_variable.c \ + njs/njs_builtin.c \ + njs/njs_lexer.c \ + njs/njs_lexer_keyword.c \ + njs/njs_parser.c \ + njs/njs_parser_expression.c \ + njs/njs_generator.c \ + njs/njs_disassembler.c \ +" + +NJS_TEST_SRCS=" \ + njs/test/njs_unit_test.c \ + njs/test/njs_interactive_test.c \ + njs/test/njs_benchmark.c \ +" diff --git a/nxt/auto/time b/auto/time similarity index 90% rename from nxt/auto/time rename to auto/time index 85bdabce..0c66c5e9 100644 --- a/nxt/auto/time +++ b/auto/time @@ -17,7 +17,7 @@ nxt_feature_test="#include return 1; return 0; }" -. ${NXT_AUTO}feature +. auto/feature if [ $nxt_found = no ]; then @@ -26,14 +26,10 @@ if [ $nxt_found = no ]; then nxt_feature="clock_gettime(CLOCK_MONOTONIC) in librt" nxt_feature_libs="-lrt" - . ${NXT_AUTO}feature + . auto/feature if [ $nxt_found = yes ]; then - cat << END >> $NXT_MAKEFILE_CONF - -NXT_LIBRT = -lrt -END - + NXT_LIBRT="-lrt" fi fi @@ -54,7 +50,7 @@ nxt_feature_test="#include localtime_r(&t, &tm); return tm.tm_gmtoff; }" -. ${NXT_AUTO}feature +. auto/feature # Solaris @@ -70,4 +66,4 @@ nxt_feature_test="#include altzone = 0; return 0; }" -. ${NXT_AUTO}feature +. auto/feature diff --git a/configure b/configure index d908a370..aa604dc0 100755 --- a/configure +++ b/configure @@ -13,9 +13,53 @@ set -e # Stop on uninitialized variable. set -u -CC=${CC:-} -NXT_BUILDDIR=${NXT_BUILDDIR:-build} -test -d $NXT_BUILDDIR || mkdir $NXT_BUILDDIR +# Initialize variables with null values if they are not defined. +CFLAGS=${CFLAGS=} +NXT_TEST_CFLAGS=${NXT_TEST_CFLAGS=} +NXT_TEST_LIBS=${NXT_TEST_LIBS=} -cd nxt && NXT_BUILDDIR=../${NXT_BUILDDIR} CC=${CC} ./auto/configure + +# Initialize variables with default if they are not defined. +CC=${CC:-cc} +NXT_CFLAGS=${NXT_CFLAGS=} +NXT_CC_OPT=${NXT_CC_OPT:--O} +NXT_LD_OPT=${NXT_CC_OPT:--O} + +NXT_BUILD_DIR=${NXT_BUILD_DIR:-build} + +NXT_AUTOTEST=$NXT_BUILD_DIR/autotest +NXT_AUTOCONF_ERR=$NXT_BUILD_DIR/autoconf.err +NXT_AUTO_CONFIG_H=$NXT_BUILD_DIR/nxt_auto_config.h +NXT_MAKEFILE=$NXT_BUILD_DIR/Makefile + +test -d $NXT_BUILD_DIR || mkdir $NXT_BUILD_DIR + +> $NXT_AUTOCONF_ERR + +cat << END > $NXT_AUTO_CONFIG_H + +/* This file is auto-generated by configure */ + +END + +NXT_LIBRT= + +. auto/os +. auto/clang +. auto/time +. auto/memalign +. auto/getrandom +. auto/explicit_bzero +. auto/pcre +. auto/editline +. auto/sources + +NXT_LIB_AUX_CFLAGS="$NXT_PCRE_CFLAGS" + +NXT_LIBS="$NXT_LIBRT" +NXT_LIB_AUX_LIBS="$NXT_PCRE_LIB" + +. auto/make + +. auto/expect diff --git a/nginx/config b/nginx/config index 0959f8c4..a79c0bb2 100644 --- a/nginx/config +++ b/nginx/config @@ -3,7 +3,7 @@ ngx_addon_name="ngx_js_module" if [ $HTTP != NO ]; then ngx_module_type=HTTP ngx_module_name=ngx_http_js_module - ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs" + ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs $ngx_addon_dir/../build" ngx_module_deps="$ngx_addon_dir/../build/libnjs.a" ngx_module_srcs="$ngx_addon_dir/ngx_http_js_module.c" ngx_module_libs="PCRE $ngx_addon_dir/../build/libnjs.a -lm" @@ -14,7 +14,7 @@ fi if [ $STREAM != NO ]; then ngx_module_type=STREAM ngx_module_name=ngx_stream_js_module - ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs" + ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs $ngx_addon_dir/../build" ngx_module_deps="$ngx_addon_dir/../build/libnjs.a" ngx_module_srcs="$ngx_addon_dir/ngx_stream_js_module.c" ngx_module_libs="PCRE $ngx_addon_dir/../build/libnjs.a -lm" diff --git a/nginx/config.make b/nginx/config.make index a9d5e908..0ad176d4 100644 --- a/nginx/config.make +++ b/nginx/config.make @@ -2,7 +2,7 @@ cat << END >> $NGX_MAKEFILE $ngx_addon_dir/../build/libnjs.a: cd $ngx_addon_dir/.. \\ - && if [ -f nxt/Makefile.conf ]; then \$(MAKE) clean; fi \\ + && if [ -f build/Makefile ]; then \$(MAKE) clean; fi \\ && CFLAGS="\$(CFLAGS)" CC="\$(CC)" ./configure \\ && \$(MAKE) diff --git a/nxt/Makefile b/nxt/Makefile deleted file mode 100644 index f65e7422..00000000 --- a/nxt/Makefile +++ /dev/null @@ -1,273 +0,0 @@ - -NXT_LIB = nxt - - -$(NXT_BUILDDIR)/libnxt.a: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_BUILDDIR)/nxt_diyfp.o \ - $(NXT_BUILDDIR)/nxt_dtoa.o \ - $(NXT_BUILDDIR)/nxt_strtod.o \ - $(NXT_BUILDDIR)/nxt_djb_hash.o \ - $(NXT_BUILDDIR)/nxt_utf8.o \ - $(NXT_BUILDDIR)/nxt_array.o \ - $(NXT_BUILDDIR)/nxt_queue.o \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_lvlhsh.o \ - $(NXT_BUILDDIR)/nxt_random.o \ - $(NXT_BUILDDIR)/nxt_md5.o \ - $(NXT_BUILDDIR)/nxt_sha1.o \ - $(NXT_BUILDDIR)/nxt_sha2.o \ - $(NXT_BUILDDIR)/nxt_pcre.o \ - $(NXT_BUILDDIR)/nxt_malloc.o \ - $(NXT_BUILDDIR)/nxt_trace.o \ - $(NXT_BUILDDIR)/nxt_time.o \ - $(NXT_BUILDDIR)/nxt_file.o \ - $(NXT_BUILDDIR)/nxt_mp.o \ - $(NXT_BUILDDIR)/nxt_sprintf.o \ - - ar -r -c $(NXT_BUILDDIR)/libnxt.a \ - $(NXT_BUILDDIR)/nxt_diyfp.o \ - $(NXT_BUILDDIR)/nxt_dtoa.o \ - $(NXT_BUILDDIR)/nxt_strtod.o \ - $(NXT_BUILDDIR)/nxt_djb_hash.o \ - $(NXT_BUILDDIR)/nxt_utf8.o \ - $(NXT_BUILDDIR)/nxt_array.o \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_lvlhsh.o \ - $(NXT_BUILDDIR)/nxt_random.o \ - $(NXT_BUILDDIR)/nxt_md5.o \ - $(NXT_BUILDDIR)/nxt_sha1.o \ - $(NXT_BUILDDIR)/nxt_sha2.o \ - $(NXT_BUILDDIR)/nxt_pcre.o \ - $(NXT_BUILDDIR)/nxt_malloc.o \ - $(NXT_BUILDDIR)/nxt_time.o \ - $(NXT_BUILDDIR)/nxt_file.o \ - $(NXT_BUILDDIR)/nxt_trace.o \ - $(NXT_BUILDDIR)/nxt_mp.o \ - $(NXT_BUILDDIR)/nxt_sprintf.o \ - -$(NXT_BUILDDIR)/nxt_diyfp.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_diyfp.h \ - $(NXT_LIB)/nxt_diyfp.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_diyfp.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_diyfp.c - -$(NXT_BUILDDIR)/nxt_dtoa.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_dtoa.h \ - $(NXT_LIB)/nxt_dtoa.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_dtoa.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_dtoa.c - -$(NXT_BUILDDIR)/nxt_strtod.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_strtod.h \ - $(NXT_LIB)/nxt_strtod.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_strtod.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_strtod.c - -$(NXT_BUILDDIR)/nxt_murmur_hash.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_murmur_hash.h \ - $(NXT_LIB)/nxt_murmur_hash.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_murmur_hash.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_murmur_hash.c - -$(NXT_BUILDDIR)/nxt_djb_hash.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_djb_hash.h \ - $(NXT_LIB)/nxt_djb_hash.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_djb_hash.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_djb_hash.c - -$(NXT_BUILDDIR)/nxt_utf8.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_utf8.h \ - $(NXT_LIB)/nxt_unicode_lower_case.h \ - $(NXT_LIB)/nxt_unicode_upper_case.h \ - $(NXT_LIB)/nxt_utf8.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_utf8.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_utf8.c - -$(NXT_BUILDDIR)/nxt_array.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_array.h \ - $(NXT_LIB)/nxt_array.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_array.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_array.c - -$(NXT_BUILDDIR)/nxt_queue.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_queue.h \ - $(NXT_LIB)/nxt_queue.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_queue.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_queue.c - -$(NXT_BUILDDIR)/nxt_rbtree.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_rbtree.h \ - $(NXT_LIB)/nxt_rbtree.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_rbtree.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_rbtree.c - -$(NXT_BUILDDIR)/nxt_lvlhsh.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_string.h \ - $(NXT_LIB)/nxt_lvlhsh.h \ - $(NXT_LIB)/nxt_lvlhsh.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_lvlhsh.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_lvlhsh.c - -$(NXT_BUILDDIR)/nxt_random.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_random.h \ - $(NXT_LIB)/nxt_random.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_random.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_random.c - -$(NXT_BUILDDIR)/nxt_md5.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_md5.h \ - $(NXT_LIB)/nxt_md5.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_md5.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_md5.c - -$(NXT_BUILDDIR)/nxt_sha1.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_sha1.h \ - $(NXT_LIB)/nxt_sha1.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_sha1.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_sha1.c - -$(NXT_BUILDDIR)/nxt_sha2.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_sha2.h \ - $(NXT_LIB)/nxt_sha2.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_sha2.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_sha2.c - -$(NXT_BUILDDIR)/nxt_pcre.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_trace.h \ - $(NXT_LIB)/nxt_regex.h \ - $(NXT_LIB)/nxt_pcre.h \ - $(NXT_LIB)/nxt_pcre.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_pcre.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) $(NXT_PCRE_CFLAGS) \ - $(NXT_LIB)/nxt_pcre.c - -$(NXT_BUILDDIR)/nxt_malloc.o: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_malloc.h \ - $(NXT_LIB)/nxt_malloc.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_malloc.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_malloc.c - -$(NXT_BUILDDIR)/nxt_time.o: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_time.h \ - $(NXT_LIB)/nxt_time.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_time.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_time.c - -$(NXT_BUILDDIR)/nxt_file.o: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_file.h \ - $(NXT_LIB)/nxt_file.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_file.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_file.c - -$(NXT_BUILDDIR)/nxt_trace.o: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_malloc.h \ - $(NXT_LIB)/nxt_trace.h \ - $(NXT_LIB)/nxt_trace.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_trace.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_trace.c - -$(NXT_BUILDDIR)/nxt_mp.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_alignment.h \ - $(NXT_LIB)/nxt_queue.h \ - $(NXT_LIB)/nxt_rbtree.h \ - $(NXT_LIB)/nxt_mp.h \ - $(NXT_LIB)/nxt_mp.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_mp.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_mp.c - -$(NXT_BUILDDIR)/nxt_sprintf.o: \ - $(NXT_LIB)/nxt_types.h \ - $(NXT_LIB)/nxt_clang.h \ - $(NXT_LIB)/nxt_alignment.h \ - $(NXT_LIB)/nxt_sprintf.h \ - $(NXT_LIB)/nxt_sprintf.c \ - - $(NXT_CC) -c -o $(NXT_BUILDDIR)/nxt_sprintf.o $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/nxt_sprintf.c - -include $(NXT_LIB)/test/Makefile diff --git a/nxt/auto/configure b/nxt/auto/configure deleted file mode 100755 index e0ad6328..00000000 --- a/nxt/auto/configure +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -# Copyright (C) Igor Sysoev -# Copyright (C) NGINX, Inc. - - -# Disable localized program messages. -LC_ALL=C -export LC_ALL - -# Stop on error exit status. -set -e -# Stop on uninitialized variable. -set -u - - -# Initialize variables with null values if they are not defined. -CFLAGS=${CFLAGS=} -NXT_TEST_CFLAGS=${NXT_TEST_CFLAGS=} -NXT_TEST_LIBS=${NXT_TEST_LIBS=} - - -# Initialize variables with default if they are not defined. -CC=${CC:-cc} -NXT_CFLAGS=${NXT_CFLAGS=} -NXT_CC_OPT=${NXT_CC_OPT:--O} -NXT_LD_OPT=${NXT_CC_OPT:--O} -NXT_AUTO=${NXT_AUTO:-auto/} -NXT_AUTO_CONFIG_H=nxt_auto_config.h -NXT_MAKEFILE_CONF=Makefile.conf - -NXT_BUILDDIR=${NXT_BUILDDIR:-build} -NXT_AUTOTEST=$NXT_BUILDDIR/autotest -NXT_AUTOCONF_ERR=$NXT_BUILDDIR/autoconf.err - -test -d $NXT_BUILDDIR || mkdir $NXT_BUILDDIR - -> $NXT_AUTOCONF_ERR - -cat << END > $NXT_AUTO_CONFIG_H - -/* This file is auto-generated by configure */ - -END - -cat << END > $NXT_MAKEFILE_CONF - -# This file is auto-generated by configure -END - - -. ${NXT_AUTO}os -. ${NXT_AUTO}clang -. ${NXT_AUTO}time -. ${NXT_AUTO}memalign -. ${NXT_AUTO}getrandom -. ${NXT_AUTO}explicit_bzero -. ${NXT_AUTO}pcre -. ${NXT_AUTO}editline -. ${NXT_AUTO}expect diff --git a/nxt/test/Makefile b/nxt/test/Makefile deleted file mode 100644 index 9b3bda70..00000000 --- a/nxt/test/Makefile +++ /dev/null @@ -1,57 +0,0 @@ - -lib_test: \ - $(NXT_LIB)/nxt_auto_config.h \ - $(NXT_BUILDDIR)/random_unit_test \ - $(NXT_BUILDDIR)/rbtree_unit_test \ - $(NXT_BUILDDIR)/lvlhsh_unit_test \ - $(NXT_BUILDDIR)/utf8_unit_test \ - - $(NXT_BUILDDIR)/random_unit_test - $(NXT_BUILDDIR)/rbtree_unit_test - $(NXT_BUILDDIR)/lvlhsh_unit_test - $(NXT_BUILDDIR)/utf8_unit_test - -$(NXT_BUILDDIR)/utf8_unit_test: \ - $(NXT_BUILDDIR)/nxt_utf8.o \ - $(NXT_LIB)/test/utf8_unit_test.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/utf8_unit_test $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/test/utf8_unit_test.c \ - $(NXT_BUILDDIR)/nxt_utf8.o - -$(NXT_BUILDDIR)/rbtree_unit_test: \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_murmur_hash.o \ - $(NXT_LIB)/test/rbtree_unit_test.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/rbtree_unit_test $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/test/rbtree_unit_test.c \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_murmur_hash.o - -$(NXT_BUILDDIR)/lvlhsh_unit_test: \ - $(NXT_BUILDDIR)/nxt_lvlhsh.o \ - $(NXT_BUILDDIR)/nxt_murmur_hash.o \ - $(NXT_BUILDDIR)/nxt_mp.o \ - $(NXT_BUILDDIR)/nxt_malloc.o \ - $(NXT_LIB)/test/lvlhsh_unit_test.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/lvlhsh_unit_test $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/test/lvlhsh_unit_test.c \ - $(NXT_BUILDDIR)/nxt_lvlhsh.o \ - $(NXT_BUILDDIR)/nxt_rbtree.o \ - $(NXT_BUILDDIR)/nxt_murmur_hash.o \ - $(NXT_BUILDDIR)/nxt_mp.o \ - $(NXT_BUILDDIR)/nxt_malloc.o - -$(NXT_BUILDDIR)/random_unit_test: \ - $(NXT_BUILDDIR)/nxt_random.o \ - $(NXT_LIB)/test/random_unit_test.c \ - - $(NXT_CC) -o $(NXT_BUILDDIR)/random_unit_test $(NXT_CFLAGS) \ - -I$(NXT_LIB) \ - $(NXT_LIB)/test/random_unit_test.c \ - $(NXT_BUILDDIR)/nxt_random.o -- 2.47.3