Deleted
Added
make (953:00d8049418cf) | make (1131:ec7d924d8dfb) |
---|---|
1 2# Copyright (C) Igor Sysoev 3# Copyright (C) Valentin V. Bartenev 4# Copyright (C) NGINX, Inc. 5 6. auto/cc/deps 7 8$echo "creating $NXT_MAKEFILE" --- 43 unchanged lines hidden (view full) --- 52 $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE 53done 54 55$echo >> $NXT_MAKEFILE 56 57$echo "NXT_LIB_UNIT_OBJS = \\" >> $NXT_MAKEFILE 58$echo " $NXT_BUILD_DIR/src/nxt_lvlhsh.o \\" >> $NXT_MAKEFILE 59$echo " $NXT_BUILD_DIR/src/nxt_murmur_hash.o \\" >> $NXT_MAKEFILE | 1 2# Copyright (C) Igor Sysoev 3# Copyright (C) Valentin V. Bartenev 4# Copyright (C) NGINX, Inc. 5 6. auto/cc/deps 7 8$echo "creating $NXT_MAKEFILE" --- 43 unchanged lines hidden (view full) --- 52 $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE 53done 54 55$echo >> $NXT_MAKEFILE 56 57$echo "NXT_LIB_UNIT_OBJS = \\" >> $NXT_MAKEFILE 58$echo " $NXT_BUILD_DIR/src/nxt_lvlhsh.o \\" >> $NXT_MAKEFILE 59$echo " $NXT_BUILD_DIR/src/nxt_murmur_hash.o \\" >> $NXT_MAKEFILE |
60$echo " $NXT_BUILD_DIR/src/nxt_websocket.o \\" >> $NXT_MAKEFILE |
|
60 61for nxt_src in $NXT_LIB_UNIT_SRCS 62do 63 nxt_obj=${nxt_src%.c}.o 64 $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE 65done 66 67$echo >> $NXT_MAKEFILE --- 35 unchanged lines hidden (view full) --- 103 \$(NXT_LIB_UNIT_OBJS) 104 105END 106 107 108# Object files. 109 110for nxt_src in $NXT_LIB_SRCS $NXT_TEST_SRCS $NXT_LIB_UNIT_SRCS \ | 61 62for nxt_src in $NXT_LIB_UNIT_SRCS 63do 64 nxt_obj=${nxt_src%.c}.o 65 $echo " $NXT_BUILD_DIR/$nxt_obj \\" >> $NXT_MAKEFILE 66done 67 68$echo >> $NXT_MAKEFILE --- 35 unchanged lines hidden (view full) --- 104 \$(NXT_LIB_UNIT_OBJS) 105 106END 107 108 109# Object files. 110 111for nxt_src in $NXT_LIB_SRCS $NXT_TEST_SRCS $NXT_LIB_UNIT_SRCS \ |
111 src/test/nxt_unit_app_test.c | 112 src/test/nxt_unit_app_test.c \ 113 src/test/nxt_unit_websocket_chat.c \ 114 src/test/nxt_unit_websocket_echo.c |
112do 113 nxt_obj=${nxt_src%.c}.o 114 nxt_dep=${nxt_src%.c}.dep 115 nxt_dep_flags=`nxt_gen_dep_flags` 116 nxt_dep_post=`nxt_gen_dep_post` 117 cat << END >> $NXT_MAKEFILE 118 119$NXT_BUILD_DIR/$nxt_obj: $nxt_src --- 25 unchanged lines hidden (view full) --- 145 done 146 147 # Test executables. 148 149 cat << END >> $NXT_MAKEFILE 150 151.PHONY: tests 152tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\ | 115do 116 nxt_obj=${nxt_src%.c}.o 117 nxt_dep=${nxt_src%.c}.dep 118 nxt_dep_flags=`nxt_gen_dep_flags` 119 nxt_dep_post=`nxt_gen_dep_post` 120 cat << END >> $NXT_MAKEFILE 121 122$NXT_BUILD_DIR/$nxt_obj: $nxt_src --- 25 unchanged lines hidden (view full) --- 148 done 149 150 # Test executables. 151 152 cat << END >> $NXT_MAKEFILE 153 154.PHONY: tests 155tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\ |
153 $NXT_BUILD_DIR/unit_app_test | 156 $NXT_BUILD_DIR/unit_app_test $NXT_BUILD_DIR/unit_websocket_chat \\ 157 $NXT_BUILD_DIR/unit_websocket_echo |
154 155$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\ 156 $NXT_BUILD_DIR/$NXT_LIB_STATIC 157 \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\ 158 \$(CFLAGS) \$(NXT_TEST_OBJS) \\ 159 $NXT_BUILD_DIR/$NXT_LIB_STATIC \\ 160 $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS 161 --- 7 unchanged lines hidden (view full) --- 169 170$NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ 171 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC 172 \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_app_test \\ 173 \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ 174 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\ 175 $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS 176 | 158 159$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\ 160 $NXT_BUILD_DIR/$NXT_LIB_STATIC 161 \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\ 162 \$(CFLAGS) \$(NXT_TEST_OBJS) \\ 163 $NXT_BUILD_DIR/$NXT_LIB_STATIC \\ 164 $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS 165 --- 7 unchanged lines hidden (view full) --- 173 174$NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ 175 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC 176 \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_app_test \\ 177 \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ 178 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\ 179 $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS 180 |
181$NXT_BUILD_DIR/unit_websocket_chat: \\ 182 $NXT_BUILD_DIR/src/test/nxt_unit_websocket_chat.o \\ 183 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC 184 \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_websocket_chat \\ 185 \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_websocket_chat.o \\ 186 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\ 187 $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS 188 189$NXT_BUILD_DIR/unit_websocket_echo: \\ 190 $NXT_BUILD_DIR/src/test/nxt_unit_websocket_echo.o \\ 191 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC 192 \$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/unit_websocket_echo \\ 193 \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_unit_websocket_echo.o \\ 194 $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC \\ 195 $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS 196 |
|
177END 178 179else 180 181 cat << END >> $NXT_MAKEFILE 182 183.PHONY: tests 184tests: --- 151 unchanged lines hidden --- | 197END 198 199else 200 201 cat << END >> $NXT_MAKEFILE 202 203.PHONY: tests 204tests: --- 151 unchanged lines hidden --- |