summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--auto/make2
-rw-r--r--auto/modules/conf4
-rw-r--r--auto/sources10
3 files changed, 9 insertions, 7 deletions
diff --git a/auto/make b/auto/make
index 7d3bcb35..bf81b44a 100644
--- a/auto/make
+++ b/auto/make
@@ -237,7 +237,7 @@ fi
cat << END > Makefile
-all: libnxt $NXT_BIN
+all: $NXT_BIN
libnxt:
make -f $NXT_MAKEFILE libnxt
diff --git a/auto/modules/conf b/auto/modules/conf
index 141bd098..f060bdeb 100644
--- a/auto/modules/conf
+++ b/auto/modules/conf
@@ -18,7 +18,7 @@ NXT_MODULES_SRC=$NXT_BUILD_DIR/nxt_modules.c
cat << END > $NXT_MODULES_SRC
#include <nxt_main.h>
-#include <nxt_cycle.h>
+#include <nxt_runtime.h>
END
@@ -26,7 +26,7 @@ END
for nxt_init in $NXT_MODULES_INIT
do
- $echo "extern nxt_int_t $nxt_init(nxt_thread_t *thr, nxt_cycle_t *cycle);" \
+ $echo "extern nxt_int_t $nxt_init(nxt_thread_t *thr, nxt_runtime_t *rt);" \
>> $NXT_MODULES_SRC
done
diff --git a/auto/sources b/auto/sources
index af9a21f4..5fb97779 100644
--- a/auto/sources
+++ b/auto/sources
@@ -82,6 +82,7 @@ NXT_LIB_SRCS=" \
src/nxt_process_title.c \
src/nxt_signal.c \
src/nxt_port_socket.c \
+ src/nxt_port.c \
src/nxt_dyld.c \
src/nxt_random.c \
src/nxt_queue.c \
@@ -320,7 +321,7 @@ if [ $NXT_LIB_UNIT_TEST = YES ]; then
fi
NXT_DEPS=" \
- src/nxt_cycle.h \
+ src/nxt_runtime.h \
src/nxt_application.h \
src/nxt_master_process.h \
"
@@ -328,10 +329,11 @@ NXT_DEPS=" \
NXT_SRCS=" \
src/nxt_main.c \
src/nxt_app_log.c \
- src/nxt_cycle.c \
- src/nxt_port.c \
- src/nxt_application.c \
+ src/nxt_runtime.c \
src/nxt_stream_module.c \
src/nxt_master_process.c \
src/nxt_worker_process.c \
+ src/nxt_controller.c \
+ src/nxt_router.c \
+ src/nxt_application.c \
"