move embedlog from system to logging
This commit is contained in:
parent
6e6df7dca8
commit
efdc1ebf3f
@ -3,7 +3,7 @@
|
||||
# see the file kconfig-language.txt in the NuttX tools repository.
|
||||
#
|
||||
|
||||
if SYSTEM_EMBEDLOG
|
||||
if LOGGING_EMBEDLOG
|
||||
|
||||
config EXAMPLES_EMBEDLOG
|
||||
tristate "embedlog example"
|
||||
@ -39,4 +39,4 @@ config EXAMPLES_EMBEDLOG_STACKSIZE
|
||||
default DEFAULT_TASK_STACKSIZE
|
||||
|
||||
endif #EXAMPLES_EMBEDLOG
|
||||
endif #SYSTEM_EMBEDLOG
|
||||
endif #LOGGING_EMBEDLOG
|
||||
|
@ -22,7 +22,7 @@
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <system/embedlog.h>
|
||||
#include <logging/embedlog.h>
|
||||
#include <errno.h>
|
||||
#include <nuttx/config.h>
|
||||
#include <stdio.h>
|
||||
|
@ -3,7 +3,7 @@
|
||||
# see the file kconfig-language.txt in the NuttX tools repository.
|
||||
#
|
||||
|
||||
menuconfig SYSTEM_EMBEDLOG
|
||||
menuconfig LOGGING_EMBEDLOG
|
||||
bool "embedlog library"
|
||||
default n
|
||||
---help---
|
||||
@ -21,7 +21,7 @@ menuconfig SYSTEM_EMBEDLOG
|
||||
Library is licensed under BSD 2-clause license. See LICENSE file in
|
||||
the downloaded code for license details
|
||||
|
||||
if SYSTEM_EMBEDLOG
|
||||
if LOGGING_EMBEDLOG
|
||||
|
||||
config EMBEDLOG_ENABLE_PTHREAD
|
||||
bool "Enable thread safety"
|
||||
@ -222,4 +222,4 @@ config EMBEDLOG_DEMO_PROGRAMS_STACKSIZE
|
||||
default DEFAULT_TASK_STACKSIZE
|
||||
|
||||
endif # EMBEDLOG_DEMO_PROGRAMS
|
||||
endif # SYSTEM_EMBEDLOG
|
||||
endif # LOGGING_EMBEDLOG
|
@ -1,5 +1,5 @@
|
||||
############################################################################
|
||||
# apps/system/embedlog/Make.defs
|
||||
# apps/logging/embedlog/Make.defs
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed with
|
||||
@ -18,6 +18,6 @@
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifneq ($(CONFIG_SYSTEM_EMBEDLOG),)
|
||||
CONFIGURED_APPS += $(APPDIR)/system/embedlog
|
||||
ifneq ($(CONFIG_LOGGING_EMBEDLOG),)
|
||||
CONFIGURED_APPS += $(APPDIR)/logging/embedlog
|
||||
endif
|
@ -1,5 +1,5 @@
|
||||
############################################################################
|
||||
# apps/system/embedlog/Makefile
|
||||
# apps/logging/embedlog/Makefile
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed with
|
||||
@ -32,7 +32,7 @@ EMBEDLOG_EXT = tar.gz
|
||||
EMBEDLOG_SOURCES = embedlog-$(EMBEDLOG_VERSION)
|
||||
EMBEDLOG_TARBALL = $(EMBEDLOG_SOURCES).$(EMBEDLOG_EXT)
|
||||
|
||||
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)include$(DELIM)system
|
||||
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)$(DELIM)include$(DELIM)logging
|
||||
|
||||
CSRCS = $(EMBEDLOG_SOURCES)/src/el-options.c \
|
||||
$(EMBEDLOG_SOURCES)/src/el-perror.c \
|
||||
@ -234,13 +234,13 @@ $(EMBEDLOG_SOURCES)/include/embedlog.h: $(EMBEDLOG_SOURCES)/include/embedlog.h.i
|
||||
-e "s/^#if n$$/#if 0/" $< > $@
|
||||
|
||||
create_includes: $(EMBEDLOG_SOURCES)/include/embedlog.h
|
||||
$(Q) $(CP) $< $(APPDIR)/include/system
|
||||
$(Q) $(CP) $< $(APPDIR)/include/logging
|
||||
|
||||
context:: $(EMBEDLOG_SOURCES)
|
||||
$(Q) $(MAKE) create_includes
|
||||
|
||||
clean::
|
||||
$(Q) $(call DELFILE, $(APPDIR)/include/system/embedlog.h)
|
||||
$(Q) $(call DELFILE, $(APPDIR)/include/logging/embedlog.h)
|
||||
$(Q) $(foreach COBJ, $(COBJS), $(call DELFILE, $(COBJ)))
|
||||
|
||||
distclean::
|
@ -3,13 +3,13 @@
|
||||
# see the file kconfig-language.txt in the NuttX tools repository.
|
||||
#
|
||||
|
||||
comment "psmq requires SYSTEM_EMBEDLOG and !DISABLE_MQUEUE"
|
||||
depends on DISABLE_MQUEUE || !SYSTEM_EMBEDLOG
|
||||
comment "psmq requires LOGGING_EMBEDLOG and !DISABLE_MQUEUE"
|
||||
depends on DISABLE_MQUEUE || !LOGGING_EMBEDLOG
|
||||
|
||||
menuconfig SYSTEM_PSMQ
|
||||
bool "psmq"
|
||||
default n
|
||||
depends on !DISABLE_MQUEUE && SYSTEM_EMBEDLOG
|
||||
depends on !DISABLE_MQUEUE && LOGGING_EMBEDLOG
|
||||
---help---
|
||||
psmq is tool set which allows IPC communication in publish/subscribe way
|
||||
created on top of posix messege queue. Full documentation is available
|
||||
|
Loading…
Reference in New Issue
Block a user