diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:24:57 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:27:40 +0200 |
| commit | f269aa0060950f7b9c42216267c639a2fb556196 (patch) | |
| tree | 218ad3a737f11cb18e48676f300bc22038cfa140 /firmware/target/hosted | |
| parent | 9445d4625a3d47b28d756a5763165eb73d6b4ada (diff) | |
| download | rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz rockbox-f269aa0060950f7b9c42216267c639a2fb556196.zip | |
build system: unify/simplify library handling a bit.
libs in $ROOT/lib now add to $(CORE_LIBS) and $(EXTRA_LIBS) and are
automatically linked by the core and codecs/plugins respectively.
Change-Id: Iff482c792a8c8142718f6a16a450c6e2f1497c9a
Diffstat (limited to 'firmware/target/hosted')
| -rw-r--r-- | firmware/target/hosted/ypr0/ypr0.make | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/firmware/target/hosted/ypr0/ypr0.make b/firmware/target/hosted/ypr0/ypr0.make index d74b9058f5..68f53902ad 100644 --- a/firmware/target/hosted/ypr0/ypr0.make +++ b/firmware/target/hosted/ypr0/ypr0.make | |||
| @@ -13,13 +13,11 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS) | |||
| 13 | 13 | ||
| 14 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this | 14 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this |
| 15 | 15 | ||
| 16 | 16 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) | |
| 17 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(RBCODEC_LIB) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(UNWARMINDER) | ||
| 18 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \ | 17 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \ |
| 19 | -L$(BUILDDIR)/firmware -lfirmware \ | 18 | -L$(BUILDDIR)/firmware -lfirmware \ |
| 20 | $(RBCODEC_LIB) \ | 19 | -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \ |
| 21 | -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \ | 20 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ |
| 22 | -L$(BUILDDIR)/lib -lskin_parser \ | ||
| 23 | $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map | 21 | $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map |
| 24 | 22 | ||
| 25 | $(BUILDDIR)/rockbox : $(BUILDDIR)/rockbox.elf | 23 | $(BUILDDIR)/rockbox : $(BUILDDIR)/rockbox.elf |