Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Deprecate the EXTRA_LIBS variable.

Browse source 
Instead specify explicit library dependencies for codecs and plugins.
This commit is contained in:
Björn Stenberg 2013-01-24 16:01:28 +01:00
parent 02a9089034
commit 1501df045f
7 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/mikmod/mikmod.make
View file

@ -20,7 +20,7 @@ OTHER_SRC += $(MIKMOD_SRC)
MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2 MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2
$(MIKMODBUILDDIR)/mikmod.rock: $(MIKMOD_OBJ) $(MIKMODBUILDDIR)/mikmod.rock: $(MIKMOD_OBJ) $(TLSFLIB)
# new rule needed to use extra compile flags # new rule needed to use extra compile flags
$(MIKMODBUILDDIR)/%.o: $(MIKMODSRCDIR)/%.c $(MIKMODBUILDDIR)/%.o: $(MIKMODSRCDIR)/%.c

2
apps/plugins/pdbox/pdbox.make
View file

@ -26,7 +26,7 @@ ifdef APP_TYPE
PDBOXLDFLAGS += -lm PDBOXLDFLAGS += -lm
endif endif
$(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(TLSFLIB)
# Compile PDBox with extra flags (adapted from ZXBox) # Compile PDBox with extra flags (adapted from ZXBox)
$(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make

2
apps/plugins/plugins.make
View file

@ -53,7 +53,7 @@ else
PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS)
endif endif
PLUGIN_LIBS := $(EXTRA_LIBS) $(PLUGINLIB) $(PLUGINBITMAPLIB) PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB)
# include <dir>.make from each subdir (yay!) # include <dir>.make from each subdir (yay!)
$(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make))

1
lib/libsetjmp/libsetjmp.make
View file

@ -14,7 +14,6 @@ SETJMPLIB = $(BUILDDIR)/lib/libsetjmp.a
INCLUDES += -I$(SETJMPLIB_DIR) INCLUDES += -I$(SETJMPLIB_DIR)
OTHER_SRC += $(SETJMPLIB_SRC) OTHER_SRC += $(SETJMPLIB_SRC)
EXTRA_LIBS += $(SETJMPLIB)
$(SETJMPLIB): $(SETJMPLIB_OBJ) $(SETJMPLIB): $(SETJMPLIB_OBJ)
$(SILENT)$(shell rm -f $@) $(SILENT)$(shell rm -f $@)

4
lib/rbcodec/codecs/codecs.make
View file

@ -19,7 +19,7 @@ include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
# extra libraries # extra libraries
CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB) CODEC_LIBS := $(CODECLIB)
# the codec libraries # the codec libraries
include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
@ -140,7 +140,7 @@ $(CODECDIR)/spc.codec : $(CODECDIR)/libspc.a
$(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a
$(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a
$(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a
$(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) $(SETJMPLIB)
$(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a
$(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a
$(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a

1
lib/tlsf/libtlsf.make
View file

@ -14,7 +14,6 @@ TLSFLIB := $(BUILDDIR)/lib/libtlsf.a
OTHER_SRC += $(TLSFLIB_SRC) OTHER_SRC += $(TLSFLIB_SRC)
INCLUDES += -I$(TLSFLIB_DIR)/src INCLUDES += -I$(TLSFLIB_DIR)/src
EXTRA_LIBS += $(TLSFLIB)
TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS)

6
tools/root.make
View file

@ -62,8 +62,8 @@ endif
all: $(DEPFILE) build all: $(DEPFILE) build
# Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC, # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC,
# ASMDEFS_SRC, CORE_LIBS and EXTRA_LIBS. But they also define special # ASMDEFS_SRC and CORE_LIBS. But they also define special dependencies and
# dependencies and compile rules # compile rules
include $(TOOLSDIR)/tools.make include $(TOOLSDIR)/tools.make
ifeq (,$(findstring checkwps,$(APP_TYPE))) ifeq (,$(findstring checkwps,$(APP_TYPE)))
@ -71,7 +71,7 @@ ifeq (,$(findstring checkwps,$(APP_TYPE)))
ifeq (,$(findstring warble,$(APP_TYPE))) ifeq (,$(findstring warble,$(APP_TYPE)))
include $(FIRMDIR)/firmware.make include $(FIRMDIR)/firmware.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make include $(ROOTDIR)/apps/bitmaps/bitmaps.make
ifeq (,$(findstring bootloader,$(APPSDIR))) ifeq (,$(findstring bootloader,$(APPSDIR)))
include $(ROOTDIR)/lib/skin_parser/skin_parser.make include $(ROOTDIR)/lib/skin_parser/skin_parser.make
include $(ROOTDIR)/lib/tlsf/libtlsf.make include $(ROOTDIR)/lib/tlsf/libtlsf.make
endif endif