From cf333a61c7861361b4025cb0f67c8f75b0b07eef Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Tue, 17 Jan 2012 07:36:08 +0100
Subject: Move supprt-arm.S to separate library.

Core, codecs and plugins link it separately so this gets rid of SOURCES trickery.
Don't build it for hosted targets.

Change-Id: If15ef90e93cd218a4352ae8e89eea95d3122452f
---
 apps/codecs/codecs.make | 2 +-
 apps/codecs/lib/SOURCES | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'apps/codecs')

diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index d3525791cd..e18b92c1f0 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -201,7 +201,7 @@ $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECLIB
 		$(CODECLIB) \
 		-lgcc $(subst .map,-pre.map,$(CODECLDFLAGS))
 
-$(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP)
+$(CODECDIR)/%.codec: $(CODECDIR)/%.o $(LIBSETJMP) $(LIBARMSUPPORT)
 	$(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \
diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES
index cd38dc1545..257dcb5838 100644
--- a/apps/codecs/lib/SOURCES
+++ b/apps/codecs/lib/SOURCES
@@ -7,10 +7,6 @@ mdct_lookup.c
 fft-ffmpeg.c
 mdct.c
 
-#ifdef CPU_ARM
-../../../firmware/target/arm/support-arm.S
-#endif
-
 #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
 osx.dummy.c
 #endif
-- 
cgit v1.2.3