summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-09-30 14:42:31 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-09-30 14:42:31 +0000
commit410c75bd06e2499cdb1175edaf7b9483df211a2c (patch)
tree1b7eb79f5df3048529118c106c3ed5aeed10527d
parent4324504d061daf8d1970801a1f365c95c54816af (diff)
downloadrockbox-410c75bd06e2499cdb1175edaf7b9483df211a2c.zip
rockbox-410c75bd06e2499cdb1175edaf7b9483df211a2c.tar.gz
rockbox-410c75bd06e2499cdb1175edaf7b9483df211a2c.tar.bz2
rockbox-410c75bd06e2499cdb1175edaf7b9483df211a2c.tar.xz
Crude kludge to prevent people from running 'make' in the apps and firmware dirs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2449 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/Makefile5
-rw-r--r--firmware/Makefile6
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 88fd32b..ecac408 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -19,8 +19,9 @@ FIRMWARE := ../firmware
INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I. -I$(OBJDIR)
-# store output files in this directory:
-OBJDIR = .
+ifndef OBJDIR
+ "Don't run make in the apps dir!"
+endif
CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES)
AFLAGS += -small -relax
diff --git a/firmware/Makefile b/firmware/Makefile
index 6a9aca3..98507d9 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -15,8 +15,10 @@ OC = sh-elf-objcopy
INCLUDES=-Iinclude -I. -Icommon -Idrivers
-# store output files in this directory:
-OBJDIR = .
+ifndef OBJDIR
+ "Don't run make in the firmware dir!"
+endif
+
TOOLSDIR = ../tools
CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES)