michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: move library related code to lib/

Browse source 
Cleanup main Makefile and remove all library related code to
lib/ to better support the increasing number of libraries and
to keep the main Makefile clean from library dependencies.

Jira: ZEP-308
Change-Id: Id83cf309020604b8eab8d80cad0021905d5b5f7a
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-05-15 09:34:26 -04:00 • committed by Anas Nashif
commit 083a7ad0df
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -577,20 +577,6 @@ endif
export COMPILER export COMPILER
endif endif
ifdef CONFIG_QMSI_LIBRARY
LIB_INCLUDE_DIR += -L$(CONFIG_QMSI_INSTALL_PATH:"%"=%)/lib
ALL_LIBS += qmsi
endif
ifdef CONFIG_MINIMAL_LIBC
ZEPHYRINCLUDE += -I$(srctree)/lib/libc/minimal/include
endif
ifdef CONFIG_NEWLIB_LIBC
ZEPHYRINCLUDE += $(TOOLCHAIN_CFLAGS)
ALL_LIBS += m c
endif
QEMU_BIN_PATH ?= /usr/bin QEMU_BIN_PATH ?= /usr/bin
QEMU = $(QEMU_BIN_PATH)/$(QEMU_$(ARCH)) QEMU = $(QEMU_BIN_PATH)/$(QEMU_$(ARCH))

16
lib/Makefile
View file

@ -1,4 +1,18 @@
ifeq ($(CONFIG_TINYCRYPT),y) ifdef CONFIG_TINYCRYPT
ZEPHYRINCLUDE += -I$(srctree)/lib/crypto/tinycrypt/include ZEPHYRINCLUDE += -I$(srctree)/lib/crypto/tinycrypt/include
endif endif
ifdef CONFIG_QMSI_LIBRARY
LIB_INCLUDE_DIR += -L$(CONFIG_QMSI_INSTALL_PATH:"%"=%)/lib
ALL_LIBS += qmsi
endif
ifdef CONFIG_MINIMAL_LIBC
ZEPHYRINCLUDE += -I$(srctree)/lib/libc/minimal/include
endif
ifdef CONFIG_NEWLIB_LIBC
ZEPHYRINCLUDE += $(TOOLCHAIN_CFLAGS)
ALL_LIBS += m c
endif