diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-06-30 16:29:55 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-06-30 16:29:55 +0000 |
commit | 94aa0d741e8aadff243b6b88092df7b30c1bc6e4 (patch) | |
tree | c60a06dcf7d6749a839def636432d840d9618a5a | |
parent | 6fa312b2217bd09bc86a237298d5acf00b883fb7 (diff) | |
download | rockbox-94aa0d741e8aadff243b6b88092df7b30c1bc6e4.tar.gz rockbox-94aa0d741e8aadff243b6b88092df7b30c1bc6e4.zip |
Change "features" and "genlang-features" targets to no longer use multiple targets in one rule.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27195 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/apps.make | 8 | ||||
-rw-r--r-- | tools/root.make | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/apps.make b/apps/apps.make index 8814147102..ee5cca904d 100644 --- a/apps/apps.make +++ b/apps/apps.make | |||
@@ -18,14 +18,16 @@ SRC += $(call preprocess, $(APPSDIR)/SOURCES) | |||
18 | # Kludge: depends on config.o which only depends on config-*.h to have config.h | 18 | # Kludge: depends on config.o which only depends on config-*.h to have config.h |
19 | # changes trigger a genlang re-run | 19 | # changes trigger a genlang re-run |
20 | # | 20 | # |
21 | features $(BUILDDIR)/apps/features $(BUILDDIR)/apps/genlang-features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/config.o | 21 | $(BUILDDIR)/apps/features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/config.o |
22 | $(SILENT)mkdir -p $(BUILDDIR)/apps | 22 | $(SILENT)mkdir -p $(BUILDDIR)/apps |
23 | $(SILENT)mkdir -p $(BUILDDIR)/lang | 23 | $(SILENT)mkdir -p $(BUILDDIR)/lang |
24 | $(call PRINTS,PP $(<F)) | 24 | $(call PRINTS,PP $(<F)) |
25 | $(SILENT)$(CC) $(PPCFLAGS) \ | 25 | $(SILENT)$(CC) $(PPCFLAGS) \ |
26 | -E -P -imacros "config.h" -imacros "button.h" -x c $< | \ | 26 | -E -P -imacros "config.h" -imacros "button.h" -x c $< | \ |
27 | grep -v "^\#" | grep -v "^ *$$" > $(BUILDDIR)/apps/features; \ | 27 | grep -v "^\#" | grep -v "^ *$$" > $(BUILDDIR)/apps/features; \ |
28 | for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ | 28 | |
29 | echo "$$feat" >$(BUILDDIR)/apps/genlang-features | 29 | $(BUILDDIR)/apps/genlang-features: $(BUILDDIR)/apps/features |
30 | for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ | ||
31 | echo "$$feat" >$(BUILDDIR)/apps/genlang-features | ||
30 | 32 | ||
31 | ASMDEFS_SRC += $(APPSDIR)/core_asmdefs.c | 33 | ASMDEFS_SRC += $(APPSDIR)/core_asmdefs.c |
diff --git a/tools/root.make b/tools/root.make index 686b877491..e30b5b3c18 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -271,7 +271,7 @@ manual-zip: | |||
271 | 271 | ||
272 | ifdef TTS_ENGINE | 272 | ifdef TTS_ENGINE |
273 | 273 | ||
274 | voice: voicetools features | 274 | voice: voicetools $(BUILDDIR)/apps/features |
275 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ | 275 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ |
276 | 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 \ | 276 | 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 \ |
277 | 277 | ||