17 files changed, 38 insertions, 46 deletions
diff --git a/extensions/auth/moz.build b/extensions/auth/moz.build
deleted file mode 100644
index 796e67f88..000000000
--- a/extensions/auth/moz.build
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-UNIFIED_SOURCES += [
-    'nsAuthFactory.cpp',
-    'nsAuthGSSAPI.cpp',
-]
-
-SOURCES += [
-    'nsAuthSASL.cpp',
-    'nsHttpNegotiateAuth.cpp', # contains constants whose names conflict with constants in other files
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
-        'nsAuthSSPI.cpp',
-    ]
-    DEFINES['USE_SSPI'] = True
-else:
-    UNIFIED_SOURCES += [
-        'nsAuthSambaNTLM.cpp',
-    ]
-
-FINAL_LIBRARY = 'xul'
diff --git a/system/network/auth/moz.build b/system/network/auth/moz.build
new file mode 100644
index 000000000..e60ce6353
--- /dev/null
+++ b/system/network/auth/moz.build
@@ -0,0 +1,19 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+SOURCES += [
+  'src/nsAuthFactory.cpp',
+  'src/nsAuthGSSAPI.cpp',
+  'src/nsAuthSASL.cpp',
+  'src/nsHttpNegotiateAuth.cpp',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+  SOURCES += ['src/nsAuthSSPI.cpp']
+  DEFINES['USE_SSPI'] = True
+else:
+  SOURCES += ['src/nsAuthSambaNTLM.cpp']
+
+FINAL_LIBRARY = 'xul'
diff --git a/extensions/auth/gssapi.h b/system/network/auth/src/gssapi.h
index a5331d741..a5331d741 100644
--- a/extensions/auth/gssapi.h
+++ b/system/network/auth/src/gssapi.h
diff --git a/extensions/auth/nsAuth.h b/system/network/auth/src/nsAuth.h
index a32072cdb..a32072cdb 100644
--- a/extensions/auth/nsAuth.h
+++ b/system/network/auth/src/nsAuth.h
diff --git a/extensions/auth/nsAuthFactory.cpp b/system/network/auth/src/nsAuthFactory.cpp
index d026a900b..d026a900b 100644
--- a/extensions/auth/nsAuthFactory.cpp
+++ b/system/network/auth/src/nsAuthFactory.cpp
diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/system/network/auth/src/nsAuthGSSAPI.cpp
index bc99d519e..bc99d519e 100644
--- a/extensions/auth/nsAuthGSSAPI.cpp
+++ b/system/network/auth/src/nsAuthGSSAPI.cpp
diff --git a/extensions/auth/nsAuthGSSAPI.h b/system/network/auth/src/nsAuthGSSAPI.h
index 6c663e935..6c663e935 100644
--- a/extensions/auth/nsAuthGSSAPI.h
+++ b/system/network/auth/src/nsAuthGSSAPI.h
diff --git a/extensions/auth/nsAuthSASL.cpp b/system/network/auth/src/nsAuthSASL.cpp
index 2c72cb0ac..2c72cb0ac 100644
--- a/extensions/auth/nsAuthSASL.cpp
+++ b/system/network/auth/src/nsAuthSASL.cpp
diff --git a/extensions/auth/nsAuthSASL.h b/system/network/auth/src/nsAuthSASL.h
index 0cbd79a98..0cbd79a98 100644
--- a/extensions/auth/nsAuthSASL.h
+++ b/system/network/auth/src/nsAuthSASL.h
diff --git a/extensions/auth/nsAuthSSPI.cpp b/system/network/auth/src/nsAuthSSPI.cpp
index 677a4773a..677a4773a 100644
--- a/extensions/auth/nsAuthSSPI.cpp
+++ b/system/network/auth/src/nsAuthSSPI.cpp
diff --git a/extensions/auth/nsAuthSSPI.h b/system/network/auth/src/nsAuthSSPI.h
index 752b22aef..752b22aef 100644
--- a/extensions/auth/nsAuthSSPI.h
+++ b/system/network/auth/src/nsAuthSSPI.h
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/system/network/auth/src/nsAuthSambaNTLM.cpp
index 6b9204c34..6b9204c34 100644
--- a/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/system/network/auth/src/nsAuthSambaNTLM.cpp
diff --git a/extensions/auth/nsAuthSambaNTLM.h b/system/network/auth/src/nsAuthSambaNTLM.h
index 26b21b667..26b21b667 100644
--- a/extensions/auth/nsAuthSambaNTLM.h
+++ b/system/network/auth/src/nsAuthSambaNTLM.h
diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/system/network/auth/src/nsHttpNegotiateAuth.cpp
index 8b6be915e..8b6be915e 100644
--- a/extensions/auth/nsHttpNegotiateAuth.cpp
+++ b/system/network/auth/src/nsHttpNegotiateAuth.cpp
diff --git a/extensions/auth/nsHttpNegotiateAuth.h b/system/network/auth/src/nsHttpNegotiateAuth.h
index 4c84616d8..4c84616d8 100644
--- a/extensions/auth/nsHttpNegotiateAuth.h
+++ b/system/network/auth/src/nsHttpNegotiateAuth.h
diff --git a/system/network/moz.build b/system/network/moz.build
index e6af5fe26..dcb0d021a 100644
--- a/system/network/moz.build
+++ b/system/network/moz.build
@@ -3,27 +3,29 @@
 # 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/.
 
+CONFIGURE_DEFINE_FILES += ['necko-config.h']
+EXPORTS += ['!necko-config.h']
+
 DIRS += [
-    'base',
-    'cookie',
-    'dns',
-    'socket',
-    'mime',
-    'streamconv',
-    'cache',
-    'cache2',
-    'protocol',
-    'system',
-    'ipc',
+  'base',
+  'cookie',
+  'dns',
+  'socket',
+  'mime',
+  'streamconv',
+  'cache',
+  'cache2',
+  'locales',
+  'protocol',
+  'system',
+  'ipc',
 ]
 
-if CONFIG['NECKO_WIFI']:
-    DIRS += ['wifi']
+if CONFIG['MOZ_AUTH_EXTENSION']:
+  DIRS += ['auth']
 
-DIRS += ['locales']
+if CONFIG['NECKO_WIFI']:
+  DIRS += ['wifi']
 
 DIRS += ['build']
 TEST_DIRS += ['test']
-
-CONFIGURE_DEFINE_FILES += ['necko-config.h']
-EXPORTS += ['!necko-config.h']
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index 837b1b2e9..4192f8541 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -11,9 +11,6 @@ DIRS += [
   '/intl',
 ]
 
-if CONFIG['MOZ_AUTH_EXTENSION']:
-  DIRS += ['/extensions/auth']
-
 # Gecko/Core components.
 
 DIRS += [