Introducing websocket support in router and libunit.
This commit is contained in:
24
auto/make
24
auto/make
@@ -57,6 +57,7 @@ $echo >> $NXT_MAKEFILE
|
||||
$echo "NXT_LIB_UNIT_OBJS = \\" >> $NXT_MAKEFILE
|
||||
$echo " $NXT_BUILD_DIR/src/nxt_lvlhsh.o \\" >> $NXT_MAKEFILE
|
||||
$echo " $NXT_BUILD_DIR/src/nxt_murmur_hash.o \\" >> $NXT_MAKEFILE
|
||||
$echo " $NXT_BUILD_DIR/src/nxt_websocket.o \\" >> $NXT_MAKEFILE
|
||||
|
||||
for nxt_src in $NXT_LIB_UNIT_SRCS
|
||||
do
|
||||
@@ -108,7 +109,9 @@ END
|
||||
# Object files.
|
||||
|
||||
for nxt_src in $NXT_LIB_SRCS $NXT_TEST_SRCS $NXT_LIB_UNIT_SRCS \
|
||||
src/test/nxt_unit_app_test.c
|
||||
src/test/nxt_unit_app_test.c \
|
||||
src/test/nxt_unit_websocket_chat.c \
|
||||
src/test/nxt_unit_websocket_echo.c
|
||||
do
|
||||
nxt_obj=${nxt_src%.c}.o
|
||||
nxt_dep=${nxt_src%.c}.dep
|
||||
@@ -150,7 +153,8 @@ if [ $NXT_TESTS = YES ]; then
|
||||
|
||||
.PHONY: tests
|
||||
tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\
|
||||
$NXT_BUILD_DIR/unit_app_test
|
||||
$NXT_BUILD_DIR/unit_app_test $NXT_BUILD_DIR/unit_websocket_chat \\
|
||||
$NXT_BUILD_DIR/unit_websocket_echo
|
||||
|
||||
$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\
|
||||
$NXT_BUILD_DIR/$NXT_LIB_STATIC
|
||||
@@ -174,6 +178,22 @@ $NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\
|
||||
$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
|
||||
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
|
||||
|
||||
$NXT_BUILD_DIR/unit_websocket_chat: \\
|
||||
$NXT_BUILD_DIR/src/test/nxt_unit_websocket_chat.o \\
|
||||
$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
|
||||
\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_websocket_chat \\
|
||||
\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_websocket_chat.o \\
|
||||
$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
|
||||
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
|
||||
|
||||
$NXT_BUILD_DIR/unit_websocket_echo: \\
|
||||
$NXT_BUILD_DIR/src/test/nxt_unit_websocket_echo.o \\
|
||||
$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
|
||||
\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_websocket_echo \\
|
||||
\$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_websocket_echo.o \\
|
||||
$NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\
|
||||
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS
|
||||
|
||||
END
|
||||
|
||||
else
|
||||
|
||||
@@ -107,6 +107,7 @@ ${NXT_GO}-install-src: ${NXT_VERSION_H}
|
||||
install -d \$(DESTDIR)\$(NXT_GO_DST)/src/nginx/unit
|
||||
install -p -m644 ./src/*.h ./build/*.h ./src/go/unit/* \
|
||||
./src/nxt_unit.c ./src/nxt_lvlhsh.c ./src/nxt_murmur_hash.c \
|
||||
./src/nxt_websocket.c \
|
||||
\$(DESTDIR)\$(NXT_GO_DST)/src/nginx/unit/
|
||||
|
||||
${NXT_GO}-install-build: ${NXT_GO}-install-src
|
||||
|
||||
@@ -86,6 +86,11 @@ NXT_LIB_SRCS=" \
|
||||
src/nxt_application.c \
|
||||
src/nxt_external.c \
|
||||
src/nxt_port_hash.c \
|
||||
src/nxt_sha1.c \
|
||||
src/nxt_websocket.c \
|
||||
src/nxt_websocket_accept.c \
|
||||
src/nxt_http_websocket.c \
|
||||
src/nxt_h1proto_websocket.c \
|
||||
"
|
||||
|
||||
NXT_LIB_SRC0=" \
|
||||
|
||||
Reference in New Issue
Block a user