summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/apps.make8
-rw-r--r--tools/root.make2
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)
# 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
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:
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 \