Bug 1259553 - Remove dom/media/webspeech/recognition/Makefile.in; r=ted
authorMike Shal <mshal@mozilla.com>
Wed, 23 Mar 2016 17:30:33 -0400
changeset 291283 efbef8878c9f7568b872399574efd7c6c72467e5
parent 291282 4030e1cd45b9abdbff070aa2302c22060d49f3f0
child 291284 bb405b563fc3e4f91cc6d97c437424a8825a9930
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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'