diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-09-30 14:42:31 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-09-30 14:42:31 +0000 |
commit | 410c75bd06e2499cdb1175edaf7b9483df211a2c (patch) | |
tree | 1b7eb79f5df3048529118c106c3ed5aeed10527d | |
parent | 4324504d061daf8d1970801a1f365c95c54816af (diff) | |
download | rockbox-410c75bd06e2499cdb1175edaf7b9483df211a2c.tar.gz rockbox-410c75bd06e2499cdb1175edaf7b9483df211a2c.zip |
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/Makefile | 5 | ||||
-rw-r--r-- | firmware/Makefile | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile index 88fd32bafd..ecac408a85 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -19,8 +19,9 @@ FIRMWARE := ../firmware | |||
19 | 19 | ||
20 | INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I. -I$(OBJDIR) | 20 | INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I. -I$(OBJDIR) |
21 | 21 | ||
22 | # store output files in this directory: | 22 | ifndef OBJDIR |
23 | OBJDIR = . | 23 | "Don't run make in the apps dir!" |
24 | endif | ||
24 | 25 | ||
25 | CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) | 26 | CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) |
26 | AFLAGS += -small -relax | 27 | AFLAGS += -small -relax |
diff --git a/firmware/Makefile b/firmware/Makefile index 6a9aca303d..98507d979c 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -15,8 +15,10 @@ OC = sh-elf-objcopy | |||
15 | 15 | ||
16 | INCLUDES=-Iinclude -I. -Icommon -Idrivers | 16 | INCLUDES=-Iinclude -I. -Icommon -Idrivers |
17 | 17 | ||
18 | # store output files in this directory: | 18 | ifndef OBJDIR |
19 | OBJDIR = . | 19 | "Don't run make in the firmware dir!" |
20 | endif | ||
21 | |||
20 | TOOLSDIR = ../tools | 22 | TOOLSDIR = ../tools |
21 | 23 | ||
22 | CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) | 24 | CFLAGS = -W -Wall -O -m1 -nostdlib -ffreestanding -Wstrict-prototypes $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) |