Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change "features" and "genlang-features" targets to no longer use multiple targets in one rule.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27195 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2010-06-30 16:29:55 +00:00
parent 6fa312b221
commit 94aa0d741e
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/apps.make
View file

@ -18,14 +18,16 @@ SRC += $(call preprocess, $(APPSDIR)/SOURCES)
# Kludge: depends on config.o which only depends on config-*.h to have config.h
# changes trigger a genlang re-run
#
features $(BUILDDIR)/apps/features $(BUILDDIR)/apps/genlang-features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/config.o
$(BUILDDIR)/apps/features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/config.o
$(SILENT)mkdir -p $(BUILDDIR)/apps
$(SILENT)mkdir -p $(BUILDDIR)/lang
$(call PRINTS,PP $(<F))
$(SILENT)$(CC) $(PPCFLAGS) \
-E -P -imacros "config.h" -imacros "button.h" -x c $< | \
grep -v "^\#" | grep -v "^ *$$" > $(BUILDDIR)/apps/features; \
for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \
echo "$$feat" >$(BUILDDIR)/apps/genlang-features
$(BUILDDIR)/apps/genlang-features: $(BUILDDIR)/apps/features
for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \
echo "$$feat" >$(BUILDDIR)/apps/genlang-features
ASMDEFS_SRC += $(APPSDIR)/core_asmdefs.c

2
tools/root.make
View file

@ -271,7 +271,7 @@ manual-zip:
ifdef TTS_ENGINE
voice: voicetools features
voice: voicetools $(BUILDDIR)/apps/features
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \
for lang in `echo $(VOICELANGUAGE) |sed "s/,/ /g"`; do $(TOOLSDIR)/voice.pl -V -l=$$lang -t=$(MODELNAME)$$feat -i=$(TARGET_ID) -e="$(ENCODER)" -E="$(ENC_OPTS)" -s=$(TTS_ENGINE) -S="$(TTS_OPTS)"; done \