mirror of https://github.com/rusefi/ChibiOS.git
Renames for consistency.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12564 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
parent
b7f28ff2e5
commit
5397ae347a
|
@ -791,9 +791,9 @@ INPUT = ./src \
|
||||||
../../os/nil/src \
|
../../os/nil/src \
|
||||||
../../os/nil/include \
|
../../os/nil/include \
|
||||||
../../os/nil/templates \
|
../../os/nil/templates \
|
||||||
../../os/lib/dox \
|
../../os/oslib/dox \
|
||||||
../../os/lib/src \
|
../../os/oslib/src \
|
||||||
../../os/lib/include
|
../../os/oslib/include
|
||||||
|
|
||||||
# This tag can be used to specify the character encoding of the source files
|
# This tag can be used to specify the character encoding of the source files
|
||||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||||
|
|
|
@ -791,9 +791,9 @@ INPUT = ./src \
|
||||||
../../os/nil/src \
|
../../os/nil/src \
|
||||||
../../os/nil/include \
|
../../os/nil/include \
|
||||||
../../os/nil/templates \
|
../../os/nil/templates \
|
||||||
../../os/lib/dox \
|
../../os/oslib/dox \
|
||||||
../../os/lib/src \
|
../../os/oslib/src \
|
||||||
../../os/lib/include
|
../../os/oslib/include
|
||||||
|
|
||||||
# This tag can be used to specify the character encoding of the source files
|
# This tag can be used to specify the character encoding of the source files
|
||||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||||
|
|
|
@ -792,9 +792,9 @@ INPUT = ./src \
|
||||||
../../os/rt/src \
|
../../os/rt/src \
|
||||||
../../os/rt/include \
|
../../os/rt/include \
|
||||||
../../os/rt/templates \
|
../../os/rt/templates \
|
||||||
../../os/lib/dox \
|
../../os/oslib/dox \
|
||||||
../../os/lib/src \
|
../../os/oslib/src \
|
||||||
../../os/lib/include
|
../../os/oslib/include
|
||||||
|
|
||||||
# This tag can be used to specify the character encoding of the source files
|
# This tag can be used to specify the character encoding of the source files
|
||||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||||
|
|
|
@ -792,9 +792,9 @@ INPUT = ./src \
|
||||||
../../os/rt/src \
|
../../os/rt/src \
|
||||||
../../os/rt/include \
|
../../os/rt/include \
|
||||||
../../os/rt/templates \
|
../../os/rt/templates \
|
||||||
../../os/lib/dox \
|
../../os/oslib/dox \
|
||||||
../../os/lib/src \
|
../../os/oslib/src \
|
||||||
../../os/lib/include
|
../../os/oslib/include
|
||||||
|
|
||||||
# This tag can be used to specify the character encoding of the source files
|
# This tag can be used to specify the character encoding of the source files
|
||||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||||
|
|
|
@ -26,4 +26,4 @@ ALLCSRC += $(KERNSRC)
|
||||||
ALLINC += $(KERNINC)
|
ALLINC += $(KERNINC)
|
||||||
|
|
||||||
# OS Library
|
# OS Library
|
||||||
include $(CHIBIOS)/os/lib/lib.mk
|
include $(CHIBIOS)/os/oslib/oslib.mk
|
||||||
|
|
|
@ -15,34 +15,34 @@ CHLIBCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
LIBSRC :=
|
LIBSRC :=
|
||||||
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)
|
||||||
LIBSRC += $(CHIBIOS)/os/lib/src/chmboxes.c
|
LIBSRC += $(CHIBIOS)/os/oslib/src/chmboxes.c
|
||||||
endif
|
endif
|
||||||
ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),)
|
||||||
LIBSRC += $(CHIBIOS)/os/lib/src/chmemcore.c
|
LIBSRC += $(CHIBIOS)/os/oslib/src/chmemcore.c
|
||||||
endif
|
endif
|
||||||
ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),)
|
||||||
LIBSRC += $(CHIBIOS)/os/lib/src/chmemheaps.c
|
LIBSRC += $(CHIBIOS)/os/oslib/src/chmemheaps.c
|
||||||
endif
|
endif
|
||||||
ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),)
|
||||||
LIBSRC += $(CHIBIOS)/os/lib/src/chmempools.c
|
LIBSRC += $(CHIBIOS)/os/oslib/src/chmempools.c
|
||||||
endif
|
endif
|
||||||
ifneq ($(findstring CH_CFG_USE_PIPES TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_PIPES TRUE,$(CHLIBCONF)),)
|
||||||
LIBSRC += $(CHIBIOS)/os/lib/src/chpipes.c
|
LIBSRC += $(CHIBIOS)/os/oslib/src/chpipes.c
|
||||||
endif
|
endif
|
||||||
ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHLIBCONF)),)
|
||||||
LIBSRC += $(CHIBIOS)/os/lib/src/chfactory.c
|
LIBSRC += $(CHIBIOS)/os/oslib/src/chfactory.c
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
LIBSRC := $(CHIBIOS)/os/lib/src/chmboxes.c \
|
LIBSRC := $(CHIBIOS)/os/oslib/src/chmboxes.c \
|
||||||
$(CHIBIOS)/os/lib/src/chmemcore.c \
|
$(CHIBIOS)/os/oslib/src/chmemcore.c \
|
||||||
$(CHIBIOS)/os/lib/src/chmemheaps.c \
|
$(CHIBIOS)/os/oslib/src/chmemheaps.c \
|
||||||
$(CHIBIOS)/os/lib/src/chmempools.c \
|
$(CHIBIOS)/os/oslib/src/chmempools.c \
|
||||||
$(CHIBIOS)/os/lib/src/chpipes.c \
|
$(CHIBIOS)/os/oslib/src/chpipes.c \
|
||||||
$(CHIBIOS)/os/lib/src/chfactory.c
|
$(CHIBIOS)/os/oslib/src/chfactory.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Required include directories
|
# Required include directories
|
||||||
LIBINC := $(CHIBIOS)/os/lib/include
|
LIBINC := $(CHIBIOS)/os/oslib/include
|
||||||
|
|
||||||
# Shared variables
|
# Shared variables
|
||||||
ALLCSRC += $(LIBSRC)
|
ALLCSRC += $(LIBSRC)
|
|
@ -72,4 +72,4 @@ ALLCSRC += $(KERNSRC)
|
||||||
ALLINC += $(KERNINC)
|
ALLINC += $(KERNINC)
|
||||||
|
|
||||||
# OS Library
|
# OS Library
|
||||||
include $(CHIBIOS)/os/lib/lib.mk
|
include $(CHIBIOS)/os/oslib/oslib.mk
|
||||||
|
|
Loading…
Reference in New Issue