Bug 901567 - Move EXTRA_PP_JS_MODULES to moz.build, r=Standard8, a=Standard8.

CLOSED TREE seamonkey changes, too.

chat/modules/Makefile.in

@@ -10,11 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_JS_MODULES = \
-	hiddenWindow.jsm \
-	imTextboxUtils.jsm \
-	$(NULL)
-
 ifdef ENABLE_TESTS
 TESTING_JS_MODULES := test/appInfoUtils.jsm
 endif

chat/modules/moz.build

@@ -15,3 +15,9 @@ EXTRA_JS_MODULES += [
     'jsProtoHelper.jsm',
     'socket.jsm',
 ]
+
+EXTRA_PP_JS_MODULES += [
+    'hiddenWindow.jsm',
+    'imTextboxUtils.jsm',
+]
+

mail/components/search/Makefile.in

@@ -9,18 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Include SearchIntegration.js on all platforms
-EXTRA_PP_JS_MODULES = \
-  SearchIntegration.js \
-  $(NULL)
-
-# If on Mac, build Spotlight integration
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_PP_JS_MODULES += \
-  SpotlightIntegration.js \
-  $(NULL)
-endif
-
 # If on Windows, build Windows Search integration
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
 LIBRARY_NAME = winsearch_s
@@ -29,11 +17,6 @@ ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 
-# Windows Search component
-EXTRA_PP_JS_MODULES += \
-  WinSearchIntegration.js \
-  $(NULL)
-
 FORCE_STATIC_LIB = 1
 endif
 

mail/components/search/moz.build

@@ -5,11 +5,17 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['mdimporter']
+    EXTRA_PP_JS_MODULES += ['SpotlightIntegration.js']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
     CPP_SOURCES += ['nsMailWinSearchHelper.cpp']
+    EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
 
 MODULE = 'mailwinsearch'
 
 DIRS += ['public']
 
+EXTRA_PP_JS_MODULES += [
+    'SearchIntegration.js',
+]
+