Skip to content

Commit 4c10476

Browse files
hevakehevake
committed
fix: 修复了CMake构建问题
1 parent 5eccc28 commit 4c10476

File tree

96 files changed

+113
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+113
-116
lines changed

‎3rd-party/nlohmann/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ HEAD_FILES = \
2424
json.hpp \
2525
json_fwd.hpp \
2626

27-
include $(TOP_DIR)/tools/lib_header_only_common.mk
27+
include $(TOP_DIR)/mk/lib_header_only_common.mk

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ endif()
160160

161161
if(TBOX_ENABLE_TRACE)
162162
message(STATUS "trace module enabled")
163-
add_subdirectory(modules/trace/lib)
163+
list(APPEND TBOX_COMPONENTS trace)
164164
endif()
165165

166166
if(TBOX_ENABLE_MAIN)

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export TOP_DIR:=$(PWD)
2323
include build_env.mk
2424
include version.mk
2525

26-
.PHONY: all 3rd-party modules examples test clean distclean print
26+
.PHONY: all 3rd-party modules tools examples test clean distclean print
2727

2828
CCFLAGS := -Wall
2929

@@ -59,7 +59,7 @@ CXXFLAGS := $(CCFLAGS) $(CXXFLAGS)
5959
CFLAGS := $(CCFLAGS) $(CFLAGS)
6060
APPS_DIR := $(PWD)
6161

62-
all: 3rd-party modules test examples
62+
all: 3rd-party modules test tools examples
6363

6464
print:
6565
@echo "CXXFLAGS = $(CXXFLAGS)"
@@ -71,7 +71,7 @@ modules 3rd-party:
7171
test: modules
7272
$(MAKE) -C modules test
7373

74-
examples: modules
74+
tools examples: modules
7575
$(MAKE) -C $@
7676

7777
clean:

‎examples/alarm/cron_alarm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ LDFLAGS += \
3030
-ltbox_base \
3131
-ldl
3232

33-
include ${TOP_DIR}/tools/exe_common.mk
33+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/alarm/oneshot_alarm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ LDFLAGS += \
3030
-ltbox_base \
3131
-ldl
3232

33-
include ${TOP_DIR}/tools/exe_common.mk
33+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/alarm/weekly_alarm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ LDFLAGS += \
3030
-ltbox_base \
3131
-ldl
3232

33-
include ${TOP_DIR}/tools/exe_common.mk
33+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/base/assert/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ CPP_SRC_FILES := main.cpp
2626
CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
2727
LDFLAGS += -ltbox_base -ldl
2828

29-
include ${TOP_DIR}/tools/exe_common.mk
29+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/base/object_pool/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ CPP_SRC_FILES := main.cpp
2626
CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
2727
LDFLAGS += -ltbox_base -ldl
2828

29-
include ${TOP_DIR}/tools/exe_common.mk
29+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/base/print_log/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ CFLAGS += -DMODULE_ID='"demo"'
2929

3030
LDFLAGS += -ltbox_base -ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/dbus/00-loop/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ LDFLAGS += \
3232
-ltbox_base \
3333
-ldl
3434

35-
include ${TOP_DIR}/tools/exe_common.mk
35+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/01_io/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/02_timer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/03_signal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/04_run_in_loop/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ LDFLAGS += \
3030
-lpthread \
3131
-ldl
3232

33-
include ${TOP_DIR}/tools/exe_common.mk
33+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/05_run_next_seq/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/06_stdin_timer_signal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/07_delay_delete/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/08_calc_game/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/event/09_named_pipe/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ LDFLAGS += \
2929
-ltbox_base \
3030
-ldl
3131

32-
include ${TOP_DIR}/tools/exe_common.mk
32+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/eventx/thread_pool/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-lpthread \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/eventx/timer_fd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ LDFLAGS += \
3030
-ltbox_base \
3131
-ldl
3232

33-
include ${TOP_DIR}/tools/exe_common.mk
33+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/http/server/async_respond/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ LDFLAGS += \
3434
-ltbox_base \
3535
-lpthread -ldl
3636

37-
include ${TOP_DIR}/tools/exe_common.mk
37+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/http/server/router/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ LDFLAGS += \
3434
-ltbox_base \
3535
-lpthread -ldl
3636

37-
include ${TOP_DIR}/tools/exe_common.mk
37+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/http/server/simple/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ LDFLAGS += \
3434
-ltbox_base \
3535
-lpthread -ldl
3636

37-
include ${TOP_DIR}/tools/exe_common.mk
37+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/jsonrpc/message/ping/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ LDFLAGS += \
3333
-ltbox_base \
3434
-lpthread -ldl
3535

36-
include ${TOP_DIR}/tools/exe_common.mk
36+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/jsonrpc/message/pong/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ LDFLAGS += \
3333
-ltbox_base \
3434
-lpthread -ldl
3535

36-
include ${TOP_DIR}/tools/exe_common.mk
36+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/jsonrpc/req_rsp/ping/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ LDFLAGS += \
3333
-ltbox_base \
3434
-lpthread -ldl
3535

36-
include ${TOP_DIR}/tools/exe_common.mk
36+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/jsonrpc/req_rsp/pong/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ LDFLAGS += \
3333
-ltbox_base \
3434
-lpthread -ldl
3535

36-
include ${TOP_DIR}/tools/exe_common.mk
36+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/00_empty/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ LDFLAGS += \
3737
-ldl \
3838
-rdynamic
3939

40-
include ${TOP_DIR}/tools/exe_common.mk
40+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/01_one_app/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ LDFLAGS += \
4141
-ldl \
4242
-rdynamic
4343

44-
include ${TOP_DIR}/tools/exe_common.mk
44+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/02_more_than_one_apps/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ include app1/app.mk
4444
include app2/app.mk
4545
include app3/app.mk
4646

47-
include ${TOP_DIR}/tools/exe_common.mk
47+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/03_nc_client_and_echo_server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ LDFLAGS += \
4343
include echo_server/app.mk
4444
include nc_client/app.mk
4545

46-
include ${TOP_DIR}/tools/exe_common.mk
46+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/04_runtime_error/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ LDFLAGS += \
4040
-ldl \
4141
-rdynamic
4242

43-
include ${TOP_DIR}/tools/exe_common.mk
43+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/06_run_in_backend/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ LDFLAGS += \
4242
-ldl \
4343
-rdynamic
4444

45-
include ${TOP_DIR}/tools/exe_common.mk
45+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/main/sample/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ TEST_LDFLAGS += $(LDFLAGS)
5151
#pre_build :
5252
# touch build_time.cpp
5353

54-
include $(TOP_DIR)/tools/exe_common.mk
54+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/mqtt/conn/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ LDFLAGS += \
3232
-lpthread \
3333
-ldl
3434

35-
include ${TOP_DIR}/tools/exe_common.mk
35+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/mqtt/pub/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ LDFLAGS += \
3232
-lpthread \
3333
-ldl
3434

35-
include ${TOP_DIR}/tools/exe_common.mk
35+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/mqtt/sub/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ LDFLAGS += \
3232
-lpthread \
3333
-ldl
3434

35-
include ${TOP_DIR}/tools/exe_common.mk
35+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/buffered_fd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/stdio_stream/01_stdin_out/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/stdio_stream/02_stdio/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_acceptor/tcp_echo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_acceptor/tcp_nc_server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_client/tcp_echo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_client/tcp_hex_client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_client/tcp_nc_client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_connector/tcp_echo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_connector/tcp_nc_client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_server/tcp_echo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/tcp_server/tcp_nc_server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/uart/uart_to_uart/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/uart/uart_tool/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/udp_socket/ping_pong/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/udp_socket/recv_only/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/udp_socket/request/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/udp_socket/respond/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/network/udp_socket/send_only/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ LDFLAGS += \
3131
-ltbox_base \
3232
-ldl
3333

34-
include ${TOP_DIR}/tools/exe_common.mk
34+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/run/echo_server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ CXXFLAGS := -DMODULE_ID='"$(LIB_NAME)"' $(CXXFLAGS)
3232
ENABLE_STATIC_LIB = no
3333
ENABLE_SHARED_LIB = yes
3434

35-
include ${TOP_DIR}/tools/lib_common.mk
35+
include $(TOP_DIR)/mk/lib_common.mk

‎examples/run/nc_client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ LDFLAGS += -ltbox_network
3333
ENABLE_STATIC_LIB = no
3434
ENABLE_SHARED_LIB = yes
3535

36-
include ${TOP_DIR}/tools/lib_common.mk
36+
include $(TOP_DIR)/mk/lib_common.mk

‎examples/run/timer_event/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ CXXFLAGS := -DMODULE_ID='"$(LIB_NAME)"' $(CXXFLAGS)
3232
ENABLE_STATIC_LIB = no
3333
ENABLE_SHARED_LIB = yes
3434

35-
include ${TOP_DIR}/tools/lib_common.mk
35+
include $(TOP_DIR)/mk/lib_common.mk

‎examples/terminal/tcp_rpc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ LDFLAGS += \
3232
-ltbox_base \
3333
-ldl
3434

35-
include ${TOP_DIR}/tools/exe_common.mk
35+
include $(TOP_DIR)/mk/exe_common.mk

‎examples/terminal/telnetd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ LDFLAGS += \
3232
-ltbox_base \
3333
-ldl
3434

35-
include ${TOP_DIR}/tools/exe_common.mk
35+
include $(TOP_DIR)/mk/exe_common.mk

0 commit comments

Comments
 (0)