Bug 1259553 - Remove dom/media/webspeech/recognition/Makefile.in; r?ted draft
authorMike Shal <mshal@mozilla.com>
Wed, 23 Mar 2016 17:30:33 -0400
changeset 344548 d1b526c1791ae0e5ac805abdfd93ba3ad9e6575a
parent 344547 49b34b54841882bc8098db9515d5902198b70152
child 344549 98a8c747a560553aadb74d8eb4ffe1b360b7362b
push id13851
push userbmo:mshal@mozilla.com
push dateThu, 24 Mar 2016 20:09:21 +0000
reviewersted
bugs1259553
milestone48.0a1
Bug 1259553 - Remove dom/media/webspeech/recognition/Makefile.in; r?ted MozReview-Commit-ID: FQFTk9LYoEt
dom/media/webspeech/recognition/Makefile.in
dom/media/webspeech/recognition/moz.build
deleted file mode 100644
--- a/dom/media/webspeech/recognition/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-ifdef MOZ_WEBSPEECH_MODELS
-MODELSPS_KEEP_PATH := 1
-
-MODELSPS_FILES := models/dict/en-US.dic \
-		models/dict/en-US.dic.dmp \
-		models/en-US/mixture_weights \
-		models/en-US/feat.params \
-		models/en-US/mdef \
-		models/en-US/means \
-		models/en-US/noisedict \
-		models/en-US/sendump \
-		models/en-US/transition_matrices \
-		models/en-US/variances
-
-MODELSPS_DEST := $(DIST)/bin
-INSTALL_TARGETS += MODELSPS
-endif
--- a/dom/media/webspeech/recognition/moz.build
+++ b/dom/media/webspeech/recognition/moz.build
@@ -59,11 +59,27 @@ LOCAL_INCLUDES += [
     '/media/sphinxbase',
 ]
 
 if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
     LOCAL_INCLUDES += [
         '/media/pocketsphinx',
     ]
 
+if CONFIG['MOZ_WEBSPEECH_MODELS']:
+    FINAL_TARGET_FILES.models.dict += [
+        'models/dict/en-US.dic',
+        'models/dict/en-US.dic.dmp',
+    ]
+    FINAL_TARGET_FILES.models['en-US'] += [
+		'models/en-US/feat.params',
+		'models/en-US/mdef',
+		'models/en-US/means',
+		'models/en-US/mixture_weights',
+		'models/en-US/noisedict',
+		'models/en-US/sendump',
+		'models/en-US/transition_matrices',
+		'models/en-US/variances',
+    ]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'