summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichiel Van Der Kolk <not.valid@email.address>2005-05-08 15:00:06 +0000
committerMichiel Van Der Kolk <not.valid@email.address>2005-05-08 15:00:06 +0000
commitfda0d43172255536aa4cbb61ea1f262cbac1bdb4 (patch)
treeecac204e7c60208612f5caa66bbae385019289bf
parentb0e010fc5142acc09b10aa4f6453dd6fbdcb8265 (diff)
downloadrockbox-fda0d43172255536aa4cbb61ea1f262cbac1bdb4.tar.gz
rockbox-fda0d43172255536aa4cbb61ea1f262cbac1bdb4.zip
Whoops. it seems my makefile format was out of date compared to cvs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6433 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/databox/Makefile38
1 files changed, 19 insertions, 19 deletions
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile
index 25457b8c6c..a8a6baa557 100644
--- a/apps/plugins/databox/Makefile
+++ b/apps/plugins/databox/Makefile
@@ -7,8 +7,8 @@
# $Id$
#
-INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR)
+INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR)
CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} -DPLUGIN
@@ -18,7 +18,7 @@ endif
LINKFILE := $(OBJDIR)/link.lds
DEPFILE = $(OBJDIR)/dep-databox
-SRC = databox.c editparser.c edittoken.c
+SRC = databox.c editparser.c edittoken.c
SOURCES = $(SRC)
OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
@@ -30,13 +30,13 @@ OUTPUT = $(OUTDIR)/databox.rock
all: $(OUTPUT)
ifndef SIMVER
-$(OBJDIR)/databox.elf: $(OBJS) $(LINKFILE) $(OUTDIR)/libplugin.a
- @echo "LD $@"
- @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(OUTDIR) -lplugin -lgcc \
- -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map
+$(OBJDIR)/databox.elf: $(OBJS) $(LINKFILE)
+ @echo "LD "`basename $@`
+ @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
+ -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/databox.map
$(OUTPUT): $(OBJDIR)/databox.elf
- @echo "OBJCOPY $<"
+ @echo "OBJCOPY "`basename $@`
@$(OC) -O binary $< $@
else
@@ -44,9 +44,9 @@ ifeq ($(SIMVER), x11)
###################################################
# This is the X11 simulator version
-$(OUTPUT): $(OBJS) $(OUTDIR)/libplugin.a
- @echo "LD $@"
- @$(CC) $(CFLAGS) -shared $(OBJS) -L$(OUTDIR) -lplugin -o $@
+$(OUTPUT): $(OBJS)
+ @echo "LD $<"
+ @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
# 'x' must be kept or you'll have "Win32 error 5"
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
@@ -61,11 +61,11 @@ else # end of x11-simulator
DLLTOOLFLAGS = --export-all
DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
-$(OUTPUT): $(OBJS) $(OUTDIR)/libplugin.a
- @echo "DLL $@"
+$(OUTPUT): $(OBJS)
+ @echo "DLL "`basename $@`
@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
- $(OUTDIR)/libplugin.a -o $@
+ $(BUILDDIR)/libplugin.a -o $@
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
# 'x' must be kept or you'll have "Win32 error 5"
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
@@ -80,12 +80,12 @@ endif # end of simulator section
include $(TOOLSDIR)/make.inc
-# MEM should be passed on to this makefile with the chosen memory size given
-# in number of MB
+# MEMORYSIZE should be passed on to this makefile with the chosen memory size
+# given in number of MB
$(LINKFILE): $(LDS)
- @echo "build $@"
- @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \
- -E -P - >$@
+ @echo "build "`basename $@`
+ @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
+ $(DEFINES) -E -P - >$@
clean:
@echo "cleaning databox"