From 9759c035f40e67015762effc9a0a0a29b45e3bf2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 23 Jan 2008 10:59:17 +0000 Subject: 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 --- apps/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'apps') 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: -- cgit v1.2.3