fix commondefs.

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@7 4ee2a332-4b2b-5046-8439-1ba90f034370
This commit is contained in:
nakasima 2007-04-02 12:03:01 +00:00
parent b02cefe996
commit de3fc04c9b

View File

@ -119,29 +119,31 @@ CRT0_O ?= crt0.o
ifeq ($(TWL_CODEGEN_PROC),ARM9) ifeq ($(TWL_CODEGEN_PROC),ARM9)
TWL_LIBS ?= \ TWL_LIBS_BASE ?= \
libos$(TWL_LIBSUFFIX).a \ libos \
libmi$(TWL_LIBSUFFIX).a \ libmi \
libvlink$(TWL_LIBSUFFIX).a \ libvlink \
ifdef TWL_PROFILE_TYPE ifdef TWL_PROFILE_TYPE
TWL_LIBS += libos.$(TWL_PROFILE_TYPE)$(TWL_LIBSUFFIX).a TWL_LIBS_BASE += libos.$(TWL_PROFILE_TYPE)
endif endif
else # ($(TWL_CODEGEN_PROC),ARM7) else # ($(TWL_CODEGEN_PROC),ARM7)
TWL_LIBS ?= \ TWL_LIBS_BASE ?= \
libos_sp$(TWL_LIBSUFFIX).a \ libos_sp \
libmi_sp$(TWL_LIBSUFFIX).a \ libmi_sp \
libvlink_sp$(TWL_LIBSUFFIX).a \ libvlink_sp \
libnvram_sp$(TWL_LIBSUFFIX).a \ libnvram_sp \
ifdef TWL_PROFILE_TYPE ifdef TWL_PROFILE_TYPE
TWL_LIBS += libos_sp.$(TWL_PROFILE_TYPE)$(TWL_LIBSUFFIX).a TWL_LIBS_BASE += libos_sp.$(TWL_PROFILE_TYPE)
endif endif
endif endif
TWL_LIBS ?= $(addsuffix $(TWL_LIBSUFFIX).a,$(TWL_LIBS_BASE))
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
### NITRO-commondefs ### NITRO-commondefs
# #
@ -164,10 +166,7 @@ endif
GINCLUDES := $(TWL_INCDIR) $(GINCLUDES) GINCLUDES := $(TWL_INCDIR) $(GINCLUDES)
GLIBRARY_DIRS := $(TWL_LIBDIR) $(GLIBRARY_DIRS) GLIBRARY_DIRS := $(TWL_LIBDIR) $(GLIBRARY_DIRS)
GLIBRARIES := $(TWL_LIBS) \ GLIBRARIES := $(TWL_LIBS) \
$(filter-out libos$(NITRO_LIBSUFFIX).a libos_sp$(NITRO_LIBSUFFIX).a \ $(filter-out $(addsuffix $(NITRO_LIBSUFFIX).a,$(TWL_LIBS_BASE)),$(GLIBRARIES))
libmi$(NITRO_LIBSUFFIX).a libmi_sp$(NITRO_LIBSUFFIX).a \
libnvram_sp$(NITRO_LIBSUFFIX).a \
,$(GLIBRARIES))
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------