From 985b53e5005bd744eb462ea403b8542ba432a9d8 Mon Sep 17 00:00:00 2001
From: Björn Stenberg <bjorn@haxx.se>
Date: Sat, 3 Jan 2009 22:40:29 +0000
Subject: Cleaner solution to plugin-included core files.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19664 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/doom/SOURCES         | 1 -
 apps/plugins/doom/doom.make       | 7 +------
 apps/plugins/rockboy/rockboy.make | 8 +-------
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'apps/plugins')

diff --git a/apps/plugins/doom/SOURCES b/apps/plugins/doom/SOURCES
index 6ee2d95c96..6cd69faee6 100644
--- a/apps/plugins/doom/SOURCES
+++ b/apps/plugins/doom/SOURCES
@@ -60,4 +60,3 @@ i_video.c
 w_wad.c
 rockdoom.c
 d_deh.c
-sscanf.c
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make
index 666128c432..fc73729c22 100644
--- a/apps/plugins/doom/doom.make
+++ b/apps/plugins/doom/doom.make
@@ -13,6 +13,7 @@ DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom
 ROCKS += $(DOOMBUILDDIR)/doom.rock
 
 DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES)
+DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c
 DOOM_OBJ := $(call c2obj, $(DOOM_SRC))
 
 # add source files to OTHER_SRC to get automatic dependencies
@@ -32,12 +33,6 @@ else
     DOOMCFLAGS += -O2
 endif
 
-$(DOOMBUILDDIR)/sscanf.c: $(FIRMDIR)/common/sscanf.c
-	$(SILENT)mkdir -p $(dir $@)
-	$(call PRINTS,CP $<)cp $< $@
-
-$(DOOMBUILDDIR)/sscanf.o: $(DOOMBUILDDIR)/sscanf.c
-
 $(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ)
 # for some reason, this doesn't match the implicit rule in plugins.make,
 # so we have to duplicate the link command here
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make
index 428211f702..bce549c43c 100644
--- a/apps/plugins/rockboy/rockboy.make
+++ b/apps/plugins/rockboy/rockboy.make
@@ -11,8 +11,8 @@ ROCKBOY_SRCDIR = $(APPSDIR)/plugins/rockboy
 ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy
 
 ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES)
+ROCKBOY_SRC += $(ROOTDIR)/firmware/common/sscanf.c
 ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC))
-ROCKBOY_OBJ += $(ROCKBOY_OBJDIR)/sscanf.o
 
 OTHER_SRC += $(ROCKBOY_SRC)
 
@@ -34,12 +34,6 @@ else
     ROCKBOY_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile
 endif
 
-$(ROCKBOY_OBJDIR)/sscanf.c: $(FIRMDIR)/common/sscanf.c
-	$(SILENT)mkdir -p $(dir $@)
-	$(call PRINTS,CP $<)cp $< $@
-
-$(ROCKBOY_OBJDIR)/sscanf.o: $(ROCKBOY_OBJDIR)/sscanf.c
-
 $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ)
 	$(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@)
 
-- 
cgit v1.2.3