Bug 937359 - Make all objects built into xul.dll built with -MD/-MDd, not -MT/-MTd. r=bsmedberg

--HG--
rename : toolkit/mozapps/update/common/Makefile.in => toolkit/mozapps/update/common-standalone/Makefile.in

toolkit/components/maintenanceservice/Makefile.in

@@ -13,9 +13,11 @@ MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 STL_FLAGS=
 
-LIBS += \
-  ../../mozapps/update/common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
-  $(NULL)
+ifeq ($(OS_ARCH),WINNT)
+LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../../mozapps/update/common-standalone)
+else
+LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../../mozapps/update/common)
+endif
 
 USE_STATIC_LIBS = 1
 RCINCLUDE = maintenanceservice.rc

toolkit/mozapps/update/common-standalone/moz.build

@@ -0,0 +1,9 @@
+# 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/.
+
+LIBRARY_NAME = 'updatecommon-standalone'
+
+srcdir = '../common'
+
+include('../common/sources.mozbuild')

toolkit/mozapps/update/common/moz.build

@@ -19,18 +19,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'updatehelper.cpp',
         'updatehelper.h',
     ]
-    SOURCES += [
-        'pathhash.cpp',
-        'uachelper.cpp',
-        'updatehelper.cpp',
-    ]
-
-SOURCES += [
-    'readstrings.cpp',
-    'updatelogging.cpp',
-]
 
 LIBRARY_NAME = 'updatecommon'
 
 LIBXUL_LIBRARY = True
 
+srcdir = '.'
+
+include('sources.mozbuild')

toolkit/mozapps/update/common/sources.mozbuild

@@ -0,0 +1,19 @@
+# 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 = []
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    sources += [
+        'pathhash.cpp',
+        'uachelper.cpp',
+        'updatehelper.cpp',
+    ]
+
+sources += [
+    'readstrings.cpp',
+    'updatelogging.cpp',
+]
+
+SOURCES += sorted(['%s/%s' % (srcdir, s) for s in sources])

toolkit/mozapps/update/moz.build

@@ -5,14 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
-    if CONFIG['MOZ_UPDATER']:
-        DIRS += ['common', 'updater']
-    elif CONFIG['MOZ_MAINTENANCE_SERVICE']:
+    if CONFIG['MOZ_UPDATER'] or CONFIG['MOZ_MAINTENANCE_SERVICE']:
         # If only the maintenance service is installed and not
         # the updater, then the maintenance service may still be
         # used for other things.  We need to build update/common
         # which the maintenance service uses.
         DIRS += ['common']
+        if CONFIG['OS_ARCH'] == 'WINNT':
+            DIRS += ['common-standalone']
+
+    if CONFIG['MOZ_UPDATER']:
+        DIRS += ['updater']
 
 MODULE = 'update'
 

toolkit/mozapps/update/tests/Makefile.in

@@ -83,9 +83,11 @@ LOCAL_INCLUDES += \
 
 MOZ_WINCONSOLE = 1
 
-LIBS += \
-  ../common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
-  $(NULL)
+ifeq ($(OS_ARCH),WINNT)
+LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone)
+else
+LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common)
+endif
 
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1

toolkit/mozapps/update/updater/Makefile.in

@@ -12,14 +12,19 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/xpcom/glue \
   $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone)
+else
+LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common)
+endif
+
 LIBS += \
-  ../common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
-  $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+  $(call EXPAND_LIBNAME_PATH,mar,$(DEPTH)/modules/libmar/src) \
   $(MOZ_BZ2_LIBS) \
   $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-LIBS += $(DEPTH)/modules/libmar/verify/$(LIB_PREFIX)verifymar.$(LIB_SUFFIX)
+LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify)
 USE_STATIC_LIBS = 1
 RCINCLUDE = updater.rc
 OS_LIBS += $(call EXPAND_LIBNAME,delayimp comctl32 ws2_32 shell32 shlwapi)

xpcom/typelib/xpt/src/Makefile.in

@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL	= 1
-USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk