Bug 856370 - Add a Makefile.in in webspeech/recognition and remove webspeech top-level VPATH. r=smaug

--HG--
rename : content/media/webspeech/Makefile.in => content/media/webspeech/recognition/Makefile.in
rename : content/media/webspeech/moz.build => content/media/webspeech/recognition/moz.build

b2g/installer/package-manifest.in

@@ -214,7 +214,7 @@
 @BINPATH@/components/dom_traversal.xpt
 @BINPATH@/components/dom_views.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeech.xpt
+@BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt

b2g/installer/removed-files.in

@@ -11,6 +11,7 @@ run-mozilla.sh
 defaults/preferences/services-sync.js
 defaults/preferences/healthreport-prefs.js
 components/dom_sms.xpt
+components/dom_webspeech.xpt
 #ifdef MOZ_FOLD_LIBS
 @DLL_PREFIX@nspr4@DLL_SUFFIX@
 @DLL_PREFIX@plds4@DLL_SUFFIX@

browser/installer/package-manifest.in

@@ -213,7 +213,7 @@
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_traversal.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeech.xpt
+@BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt

browser/installer/removed-files.in

@@ -91,6 +91,7 @@ components/dom_wifi.xpt
 components/dom_system_b2g.xpt
 #endif
 components/dom_sms.xpt
+components/dom_webspeech.xpt
 components/uconvd.dll
 components/WeaveCrypto.js
 components/WeaveCrypto.manifest

content/media/webspeech/Makefile.in

@@ -2,53 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
+DEPTH = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/dom/dom-config.mk
 
-VPATH += \
-  $(srcdir)/recognition \
-  $(srcdir)/recognition/test \
-  $(NULL)
-
-LIBRARY_NAME   := gkconwebspeech_s
-LIBXUL_LIBRARY := 1
-
-LOCAL_INCLUDES += $(VPATH:%=-I%)
-
-CPPSRCS := \
-  EnableWebSpeechRecognitionCheck.cpp \
-  SpeechGrammar.cpp \
-  SpeechGrammarList.cpp \
-  SpeechRecognitionAlternative.cpp \
-  SpeechRecognition.cpp \
-  SpeechRecognitionResult.cpp \
-  SpeechRecognitionResultList.cpp \
-  SpeechStreamListener.cpp \
-  endpointer.cc \
-  energy_endpointer.cc \
-  energy_endpointer_params.cc \
-  FakeSpeechRecognitionService.cpp \
-  $(NULL)
-
-EXPORTS_NAMESPACES := mozilla/dom
-EXPORTS_mozilla/dom := \
-  FakeSpeechRecognitionService.h \
-  SpeechGrammar.h \
-  SpeechGrammarList.h \
-  SpeechRecognitionAlternative.h \
-  SpeechRecognition.h \
-  SpeechRecognitionResult.h \
-  SpeechRecognitionResultList.h \
-  SpeechStreamListener.h \
-  $(NULL)
-
-FORCE_STATIC_LIB := 1
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

content/media/webspeech/moz.build

@@ -3,14 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
-XPIDL_MODULE = 'dom_webspeech'
-
-XPIDL_SOURCES = [
-  'nsIDOMSpeechRecognitionEvent.idl',
-  'nsIDOMSpeechRecognitionError.idl',
-  'nsISpeechRecognitionService.idl'
-]
-
-TEST_DIRS += ['recognition/test']
+PARALLEL_DIRS = ['recognition']

content/media/webspeech/recognition/Makefile.in

@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH            := @DEPTH@
+topsrcdir        := @top_srcdir@
+srcdir           := @srcdir@
+VPATH            := @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/dom/dom-config.mk
+
+VPATH += \
+  $(srcdir)/test \
+  $(NULL)
+
+LIBRARY_NAME   := gkconwebspeechrecognition_s
+LIBXUL_LIBRARY := 1
+
+LOCAL_INCLUDES += $(VPATH:%=-I%)
+
+CPPSRCS := \
+  EnableWebSpeechRecognitionCheck.cpp \
+  SpeechGrammar.cpp \
+  SpeechGrammarList.cpp \
+  SpeechRecognitionAlternative.cpp \
+  SpeechRecognition.cpp \
+  SpeechRecognitionResult.cpp \
+  SpeechRecognitionResultList.cpp \
+  SpeechStreamListener.cpp \
+  endpointer.cc \
+  energy_endpointer.cc \
+  energy_endpointer_params.cc \
+  FakeSpeechRecognitionService.cpp \
+  $(NULL)
+
+EXPORTS_NAMESPACES := mozilla/dom
+EXPORTS_mozilla/dom := \
+  FakeSpeechRecognitionService.h \
+  SpeechGrammar.h \
+  SpeechGrammarList.h \
+  SpeechRecognitionAlternative.h \
+  SpeechRecognition.h \
+  SpeechRecognitionResult.h \
+  SpeechRecognitionResultList.h \
+  SpeechStreamListener.h \
+  $(NULL)
+
+FORCE_STATIC_LIB := 1
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
+include $(topsrcdir)/config/rules.mk

content/media/webspeech/recognition/moz.build

@@ -0,0 +1,16 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MODULE = 'content'
+
+XPIDL_MODULE = 'dom_webspeechrecognition'
+
+XPIDL_SOURCES = [
+  'nsIDOMSpeechRecognitionEvent.idl',
+  'nsIDOMSpeechRecognitionError.idl',
+  'nsISpeechRecognitionService.idl'
+]
+
+TEST_DIRS += ['test']

layout/build/Makefile.in

@@ -210,7 +210,7 @@ endif
 
 ifdef MOZ_WEBSPEECH
 SHARED_LIBRARY_LIBS += \
-  $(DEPTH)/content/media/webspeech/$(LIB_PREFIX)gkconwebspeech_s.$(LIB_SUFFIX) \
+  $(DEPTH)/content/media/webspeech/recognition/$(LIB_PREFIX)gkconwebspeechrecognition_s.$(LIB_SUFFIX) \
   $(NULL)
 endif
 

mobile/android/installer/package-manifest.in

@@ -143,7 +143,7 @@
 @BINPATH@/components/dom_traversal.xpt
 @BINPATH@/components/dom_views.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeech.xpt
+@BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt

mobile/android/installer/removed-files.in

@@ -1,3 +1,4 @@
 update.locale
 README.txt
 defaults/preferences/healthreport-prefs.js
+components/dom_webspeech.xpt