bug 941736 - unify sources in extensions/ r=ehsan

extensions/auth/moz.build

@@ -4,10 +4,14 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsAuthFactory.cpp',
     'nsAuthGSSAPI.cpp',
     'nsAuthSASL.cpp',
+]
+
+# contains constants whose names conflict with constants in other files
+SOURCES += [
     'nsHttpNegotiateAuth.cpp',
 ]
 
@@ -17,7 +21,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
     DEFINES['USE_SSPI'] = True
 else:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 

extensions/cookie/moz.build

@@ -13,7 +13,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'cookie'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsCookiePromptService.cpp',

extensions/permissions/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]

extensions/pref/autoconfig/src/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
     'nsJSConfigTriggers.cpp',

extensions/pref/autoconfig/src/nsAutoConfig.h

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifndef nsAutoConfig_h
+#define nsAutoConfig_h
+
 #include "nsIAutoConfig.h"
 #include "nsITimer.h"
 #include "nsIFile.h"
@@ -46,3 +49,5 @@ class nsAutoConfig : public nsIAutoConfig,
         nsCOMPtr<nsITimer> mTimer;
         nsCString mConfigURL;
 };
+
+#endif

extensions/pref/autoconfig/src/nsReadConfig.h

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifndef nsReadConfig_h
+#define nsReadConfig_h
+
 #include "nsCOMPtr.h"
 #include "nsIReadConfig.h"
 #include "nsIAutoConfig.h"
@@ -33,3 +36,5 @@ class nsReadConfig : public nsIReadConfig,
 private:
         nsCOMPtr<nsIAutoConfig> mAutoConfig;
 };
+
+#endif

extensions/universalchardet/src/base/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'CharDistribution.cpp',
     'JpCntx.cpp',
     'LangBulgarianModel.cpp',

extensions/universalchardet/src/xpcom/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]