summaryrefslogtreecommitdiffstats
path: root/apps/Makefile
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-01-23 10:59:17 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-01-23 10:59:17 +0000
commit9759c035f40e67015762effc9a0a0a29b45e3bf2 (patch)
treedcb85a58167b734b28bf88bb1b3496a848770e3c /apps/Makefile
parentebe5acfb9dd80bfce2c915a568e2c86244b67510 (diff)
downloadrockbox-9759c035f40e67015762effc9a0a0a29b45e3bf2.tar.gz
rockbox-9759c035f40e67015762effc9a0a0a29b45e3bf2.tar.bz2
rockbox-9759c035f40e67015762effc9a0a0a29b45e3bf2.zip
Renamed 'archos' to 'modelname' in the configure script and the Makefiles
using it, to reduce confusion for newcomers who never even had an Archos. Those innocent youngsters. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16149 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/Makefile')
-rw-r--r--apps/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 649dd48496..eee9c034dd 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -62,7 +62,7 @@ endif
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \
-DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} \
- -DTARGET_NAME=\"$(ARCHOS)\"
+ -DTARGET_NAME=\"$(MODELNAME)\"
OBJS2 := $(OBJDIR)/lang.o $(patsubst %.c, $(OBJDIR)/%.o, $(SRC))
OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
@@ -218,11 +218,12 @@ $(OBJDIR)/features: features.txt
$(SILENT)cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \
grep -v "^\#" | grep -v "^$$" > $@; \
- echo "" >/dev/null
+ for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done ; \
+ echo "$$feat" >$(OBJDIR)/genlang-features
$(OBJDIR)/lang.o: lang/$(LANGUAGE).lang $(OBJDIR)/features
$(SILENT)for f in `cat $(OBJDIR)/features`; do feat="$$feat:$$f" ; done; \
- perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS)$$feat $<
+ perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $<
$(call PRINTS,CC lang.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@
clean: