diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 15112a431..15da7d333 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -3611,17 +3611,17 @@ exit: } // namespace ot #if OPENTHREAD_ENABLE_LEGACY -extern "C" void otNcpRegisterLegacyHandlers(const otNcpLegacyHandlers *aHandlers) +OT_TOOL_WEAK void otNcpRegisterLegacyHandlers(const otNcpLegacyHandlers *aHandlers) { OT_UNUSED_VARIABLE(aHandlers); } -extern "C" void otNcpHandleDidReceiveNewLegacyUlaPrefix(const uint8_t *aUlaPrefix) +OT_TOOL_WEAK void otNcpHandleDidReceiveNewLegacyUlaPrefix(const uint8_t *aUlaPrefix) { OT_UNUSED_VARIABLE(aUlaPrefix); } -extern "C" void otNcpHandleLegacyNodeDidJoin(const otExtAddress *aExtAddr) +OT_TOOL_WEAK void otNcpHandleLegacyNodeDidJoin(const otExtAddress *aExtAddr) { OT_UNUSED_VARIABLE(aExtAddr); } diff --git a/src/posix/Makefile.am b/src/posix/Makefile.am index 3857b563c..b4e4009e4 100644 --- a/src/posix/Makefile.am +++ b/src/posix/Makefile.am @@ -140,9 +140,11 @@ ot_daemon_SOURCES = \ ot_daemon_LDADD = \ $(top_builddir)/src/cli/libopenthread-cli-ftd.a \ + $(top_builddir)/src/ncp/libopenthread-ncp-ftd.a \ $(top_builddir)/src/core/libopenthread-ftd.a \ $(LDADD_COMMON) \ $(top_builddir)/src/cli/libopenthread-cli-ftd.a \ + $(top_builddir)/src/ncp/libopenthread-ncp-ftd.a \ $(top_builddir)/src/core/libopenthread-ftd.a \ $(LDADD_COMMON) \ $(NULL) @@ -167,9 +169,11 @@ ot_cli_SOURCES = \ ot_cli_LDADD = \ $(top_builddir)/src/cli/libopenthread-cli-ftd.a \ + $(top_builddir)/src/ncp/libopenthread-ncp-ftd.a \ $(top_builddir)/src/core/libopenthread-ftd.a \ $(LDADD_COMMON) \ $(top_builddir)/src/cli/libopenthread-cli-ftd.a \ + $(top_builddir)/src/ncp/libopenthread-ncp-ftd.a \ $(top_builddir)/src/core/libopenthread-ftd.a \ $(LDADD_COMMON) \ $(NULL) diff --git a/src/posix/platform/Makefile.am b/src/posix/platform/Makefile.am index e4874e4c0..b0aa68e70 100644 --- a/src/posix/platform/Makefile.am +++ b/src/posix/platform/Makefile.am @@ -32,8 +32,8 @@ lib_LIBRARIES = libopenthread-posix.a libopenthread_posix_a_CPPFLAGS = \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ - -I$(top_srcdir)/src/ncp \ -I$(top_srcdir)/src/posix/platform \ -D_GNU_SOURCE \ $(OPENTHREAD_TARGET_DEFINES) \ @@ -53,18 +53,6 @@ libopenthread_posix_a_SOURCES = \ uart.c \ $(NULL) -INC_NCP_SOURCES = \ - inc_spinel.c \ - inc_hdlc.cpp \ - $(NULL) - -nodist_libopenthread_posix_a_SOURCES = \ - $(INC_NCP_SOURCES) \ - $(NULL) - -inc_%: ../../ncp/% - echo '#include "$<"' > $@ - if OPENTHREAD_ENABLE_PLATFORM_UDP libopenthread_posix_a_SOURCES += \ udp.cpp \ diff --git a/src/posix/platform/hdlc_interface.hpp b/src/posix/platform/hdlc_interface.hpp index fb3d63f75..c3416ee0d 100644 --- a/src/posix/platform/hdlc_interface.hpp +++ b/src/posix/platform/hdlc_interface.hpp @@ -36,7 +36,7 @@ #include "platform-config.h" -#include "hdlc.hpp" +#include "ncp/hdlc.hpp" namespace ot { namespace PosixApp { diff --git a/src/posix/platform/radio_spinel.hpp b/src/posix/platform/radio_spinel.hpp index 234407211..567547858 100644 --- a/src/posix/platform/radio_spinel.hpp +++ b/src/posix/platform/radio_spinel.hpp @@ -37,7 +37,7 @@ #include #include "hdlc_interface.hpp" -#include "spinel.h" +#include "ncp/spinel.h" namespace ot { namespace PosixApp {