Bug 852869 - Remove some redundant Makefile.in files in comm-central. More complicated removals to clean up files with redundant MODULE definitions. r=jcranmer
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 07 May 2013 14:13:16 +0100
changeset 13867 e80ecf705881aa45e26bfdf6d9fbda7509fedb11
parent 13866 a9ccae227c13a44b55eb6b8b3bd0a88d1dedf83e
child 13868 741a7f4c5e1677ea20fbc34da9d4576b809192d8
push id933
push userbugzilla@standard8.plus.com
push dateMon, 13 May 2013 17:31:10 +0000
treeherdercomm-aurora@09630b06812b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs852869
Bug 852869 - Remove some redundant Makefile.in files in comm-central. More complicated removals to clean up files with redundant MODULE definitions. r=jcranmer
bridge/bridge.mozbuild
db/mork/Makefile.in
db/mork/moz.build
db/moz.build
mailnews/extensions/Makefile.in
mailnews/extensions/fts3/Makefile.in
mailnews/extensions/fts3/moz.build
mailnews/extensions/mailviews/Makefile.in
mailnews/extensions/mailviews/moz.build
mailnews/extensions/moz.build
mailnews/imap/Makefile.in
mailnews/imap/moz.build
mailnews/import/Makefile.in
mailnews/import/moz.build
mailnews/local/Makefile.in
mailnews/local/moz.build
mailnews/mime/cthandlers/Makefile.in
mailnews/mime/cthandlers/moz.build
mailnews/moz.build
--- a/bridge/bridge.mozbuild
+++ b/bridge/bridge.mozbuild
@@ -7,12 +7,12 @@ app_libxul_dirs += [bridge_reldir + 'moz
 
 component_libs = CONFIG.get('MOZ_APP_COMPONENT_LIBS', '').split()
 
 if 'mozldap' in component_libs or CONFIG['MOZ_LDAP_XPCOM']:
     app_libxul_static_dirs += [bridge_reldir + 'ldap/sdks/c-sdk']
     app_libxul_dirs += [bridge_reldir + 'ldap/xpcom']
 
 if 'mork' in component_libs or CONFIG['MOZ_MORK']:
-    app_libxul_dirs += [bridge_reldir + 'db/mork']
+    app_libxul_dirs += [bridge_reldir + 'db']
 
 app_libxul_dirs += [bridge_reldir + 'mailnews']
 
deleted file mode 100644
--- a/db/mork/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
-
-MODULE = mork
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/db/mork/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-DIRS += [
-    'public',
-    'src',
-    'build',
-]
-
--- a/db/moz.build
+++ b/db/moz.build
@@ -1,8 +1,11 @@
 # 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/.
 
 if not CONFIG['NSS_DISABLE_DBM'] and CONFIG['MOZ_MORK']:
-    PARALLEL_DIRS += ['mork']
-
+    DIRS += [
+        'mork/public',
+        'mork/src',
+        'mork/build',
+    ]
deleted file mode 100644
--- a/mailnews/extensions/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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
-
-ifdef MOZ_PSM
-BUILD_SMIME=1
-endif
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/extensions/fts3/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
-
-MODULE		= fts3tok
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/fts3/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/.
-
-PARALLEL_DIRS += [
-    'public',
-    'src',
-]
-
deleted file mode 100644
--- a/mailnews/extensions/mailviews/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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
-
-MODULE		= mailview
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/mailviews/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-PARALLEL_DIRS += [
-    'public',
-    'src',
-    'content',
-]
-
--- a/mailnews/extensions/moz.build
+++ b/mailnews/extensions/moz.build
@@ -1,18 +1,21 @@
 # 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/.
 
 # These extensions are not optional.
 PARALLEL_DIRS += [
     'mdn',
-    'mailviews',
+    'mailviews/public',
+    'mailviews/src',
+    'mailviews/content',
     'bayesian-spam-filter',
     'offline-startup',
     'newsblog',
-    'fts3',
+    'fts3/public',
+    'fts3/src',
 ]
 
-if CONFIG['BUILD_SMIME'] or CONFIG['MOZ_PSM']:
+if CONFIG['MOZ_PSM']:
     PARALLEL_DIRS += ['smime']
 
deleted file mode 100644
--- a/mailnews/imap/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
-
-MODULE		= msgimap
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/imap/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/.
-
-PARALLEL_DIRS += [
-    'public',
-    'src',
-]
-
-TEST_TOOL_DIRS += ['test']
-
deleted file mode 100644
--- a/mailnews/import/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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
-
-MODULE		= import
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/import/moz.build
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/.
-
-PARALLEL_DIRS += [
-    'public',
-    'src',
-    'text/src',
-    'vcard/src',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    PARALLEL_DIRS += [
-        'eudora/src',
-        'applemail/src',
-    ]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    PARALLEL_DIRS += ['eudora/src']
-
-    if not CONFIG['GNU_CC']:
-        PARALLEL_DIRS += [
-            'oexpress',
-            'outlook/src',
-            'winlivemail',
-        ]
-
-TEST_TOOL_DIRS += ['test']
-
-DIRS += ['build']
-
deleted file mode 100644
--- a/mailnews/local/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
-
-MODULE		= msglocal
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/local/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/.
-
-PARALLEL_DIRS += [
-    'public',
-    'src',
-]
-
-TEST_DIRS += ['test']
-
deleted file mode 100644
--- a/mailnews/mime/cthandlers/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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
-
-ifdef MOZ_PSM
-BUILD_SMIME=1
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/mime/cthandlers/moz.build
+++ b/mailnews/mime/cthandlers/moz.build
@@ -6,12 +6,12 @@
 PARALLEL_DIRS += [
     'glue',
     'vcard',
 ]
 
 # pgpmime depends on glue.
 DIRS += ['pgpmime']
 
-if not CONFIG['MOZ_PSM'] and not CONFIG['BUILD_SMIME']:
+if not CONFIG['MOZ_PSM']:
     # smimestub always depends on glue, so always build that afterwards.
     DIRS += ['smimestub']
 
--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -5,25 +5,54 @@
 
 PARALLEL_DIRS += [
     'addrbook',
     'base',
     'compose',
     'db/gloda',
     'db/msgdb',
     'extensions',
-    'imap',
-    'import',
-    'local',
+    'imap/public',
+    'imap/src',
+    'import/public',
+    'import/src',
+    'import/text/src',
+    'import/vcard/src',
+    'local/public',
+    'local/src',
     'mime',
     'news',
 ]
 
-TEST_DIRS += ['test/performance/bloat']
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    PARALLEL_DIRS += [
+        'import/eudora/src',
+        'import/applemail/src',
+    ]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    PARALLEL_DIRS += ['import/eudora/src']
+
+    if not CONFIG['GNU_CC']:
+        PARALLEL_DIRS += [
+            'import/oexpress',
+            'import/outlook/src',
+            'import/winlivemail',
+        ]
+
+TEST_TOOL_DIRS += [
+    'test/performance/bloat',
+    'imap/test',
+    'import/test',
+    'local/test',
+]
 
 if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
     PARALLEL_DIRS += [
         'mapi/mapiDLL',
         'mapi/mapihook',
     ]
 
-DIRS += ['build']
+DIRS += [
+    'build',
+    'import/build',
+]