Bug 850389 - Part 3: Move XPIDL variables into moz.build (manual); r=Callek
authorGregory Szorc <gps@mozilla.com>
Wed, 13 Mar 2013 08:26:35 -0700
changeset 15124 10b5d6673cdaffd3e698f546cdb6674f757ecc9a
parent 15123 fef8c51030cce56c417c583b86b97a44038f7cce
child 15125 08b6532424bf9540c455d04811a283b6b21f5bee
push id898
push userbugzilla@standard8.plus.com
push dateMon, 13 May 2013 17:03:31 +0000
treeherdercomm-beta@3106694b14de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs850389
Bug 850389 - Part 3: Move XPIDL variables into moz.build (manual); r=Callek
ldap/xpcom/public/Makefile.in
ldap/xpcom/public/moz.build
mailnews/addrbook/public/Makefile.in
mailnews/addrbook/public/moz.build
suite/shell/public/Makefile.in
suite/shell/public/moz.build
--- a/ldap/xpcom/public/Makefile.in
+++ b/ldap/xpcom/public/Makefile.in
@@ -6,14 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mozldap
-ifdef MOZ_PREF_EXTENSIONS
-XPIDLSRCS += nsILDAPSyncQuery.idl
-endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/ldap/xpcom/public/moz.build
+++ b/ldap/xpcom/public/moz.build
@@ -13,10 +13,13 @@ XPIDL_SOURCES += [
     'nsILDAPMessageListener.idl',
     'nsILDAPModification.idl',
     'nsILDAPOperation.idl',
     'nsILDAPServer.idl',
     'nsILDAPService.idl',
     'nsILDAPURL.idl',
 ]
 
-XPIDL_MODULE = 'mozldap'
+if CONFIG['MOZ_PREF_EXTENSIONS']:
+    XPIDL_SOURCES += [
+        'nsILDAPSyncQuery.idl',
+    ]
 
--- a/mailnews/addrbook/public/Makefile.in
+++ b/mailnews/addrbook/public/Makefile.in
@@ -7,30 +7,13 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= addrbook
 
-ifdef MOZ_LDAP_XPCOM
-ifndef MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE
-XPIDLSRCS       += \
-		nsILDAPAutoCompleteSession.idl \
-		nsILDAPAutoCompFormatter.idl \
-		nsIAbLDAPAutoCompFormatter.idl \
-		$(NULL)
-endif
-XPIDLSRCS       += \
-                nsIAbLDAPReplicationService.idl \
-                nsIAbLDAPReplicationQuery.idl \
-                nsIAbLDAPReplicationData.idl \
-		nsIAbLDAPDirectory.idl \
-		nsIAbLDAPCard.idl \
-		$(NULL)
-endif
-
 EXPORTS		= \
 		nsAbBaseCID.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/addrbook/public/moz.build
+++ b/mailnews/addrbook/public/moz.build
@@ -25,8 +25,23 @@ XPIDL_SOURCES += [
     'nsIAbView.idl',
     'nsIAddbookUrl.idl',
     'nsIAddrDBAnnouncer.idl',
     'nsIAddrDBListener.idl',
     'nsIAddrDatabase.idl',
     'nsIMsgVCardService.idl',
 ]
 
+if CONFIG['MOZ_LDAP_XPCOM']:
+    XPIDL_SOURCES += [
+        'nsIAbLDAPCard.idl',
+        'nsIAbLDAPDirectory.idl',
+        'nsIAbLDAPReplicationData.idl',
+        'nsIAbLDAPReplicationQuery.idl',
+        'nsIAbLDAPReplicationService.idl',
+    ]
+
+    if not CONFIG['MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE']:
+        XPIDL_SOURCES += [
+            'nsILDAPAutoCompleteSession.idl',
+            'nsILDAPAutoCompFormatter.idl',
+            'nsIAbLDAPAutoCompFormatter.idl',
+        ]
--- a/suite/shell/public/Makefile.in
+++ b/suite/shell/public/Makefile.in
@@ -5,13 +5,10 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = shellservice
-ifneq (,$(filter WINNT,$(OS_ARCH)))
-XPIDLSRCS += nsIWindowsShellService.idl
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/suite/shell/public/moz.build
+++ b/suite/shell/public/moz.build
@@ -2,10 +2,13 @@
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIShellService.idl',
 ]
 
-XPIDL_MODULE = 'shellservice'
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]