-g on DEBUG builds, generate the librockbox.a properly if absent

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@674 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 4 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 4fea03db47..311a34903c 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -25,16 +25,17 @@ TARGET = -DARCHOS_PLAYER_OLD=1
 # store output files in this directory:
 OBJDIR = .
 
+CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES)
+AFLAGS += -small -relax
+
 ifdef DEBUG
     DEFINES := -DDEBUG
+    CFLAGS += -g
     LDS := $(FIRMWARE)/gdb.lds
 else
     LDS := $(FIRMWARE)/app.lds
 endif
 
-CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES)
-AFLAGS += -small -relax
-
 SRC := $(wildcard *.c)
 
 ifeq ($(TARGET),-DARCHOS_RECORDER)
@@ -46,7 +47,7 @@ OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
 all : $(OBJDIR)/archos.mod # archos.asm 
 
 $(OBJDIR)/librockbox.a:
-        make -C $FIRMWARE OBJDIR=$(OBJDIR)
+        make -C $(FIRMWARE) OBJDIR=$(OBJDIR)
 
 $(OBJDIR)/archos.elf : $(OBJS) $(LDS) $(OBJDIR)/librockbox.a
         $(CC) -Os -nostdlib -o $(OBJDIR)/archos.elf $(OBJS) -lrockbox -lgcc -lc -L$(FIRMWARE) -T$(LDS) -Wl,-Map,archos.map