Port bug 970727 (move DEFFILE to moz.build) to comm-central, r=Standard8 CLOSED TREE
authorJoshua Cranmer <Pidgeot18@gmail.com>
Mon, 11 Aug 2014 15:26:16 -0500
changeset 16452 d45a97508921ce29357c58c83788b186d503773e
parent 16451 5acb98d2b4fc8eac28c02fdbdf04b227cf086a82
child 16453 e522d49c397757b2ef9564ae9177f4002c8ba1be
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs970727
Port bug 970727 (move DEFFILE to moz.build) to comm-central, r=Standard8 CLOSED TREE
mailnews/mapi/mapiDll/Makefile.in
mailnews/mapi/mapiDll/moz.build
mailnews/mapi/mapihook/build/Makefile.in
mailnews/mapi/mapihook/build/moz.build
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # Statically link against the CRT, so that we don't go hunting around for it
 # and not find it when we're loaded into explorer.exe or similar
 USE_STATIC_LIBS = 1
 
-DEFFILE		= $(win_srcdir)/Mapi32.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 OS_LIBS		+= ole32.lib
 
 EMBED_MANIFEST_AT = 2
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -6,8 +6,9 @@
 LIBRARY_NAME = 'mozMapi32'
 
 SOURCES += [
     'MapiDll.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 
+DEFFILE	= SRCDIR + '/Mapi32.def'
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFFILE		= $(win_srcdir)/MapiProxy.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 OS_LIBS		+= rpcrt4.lib
 
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
 
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -2,8 +2,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 = 'MapiProxy'
 
 FORCE_SHARED_LIB = True
 
+DEFFILE = SRCDIR + '/MapiProxy.def'