Bug 1051619 - Port |Bug 914274 - Remove MODULE_NAME| to comm-central r=jcranmer a=for CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 13 Aug 2014 22:04:29 +0100
changeset 20734 55ef732fc9617a7eacf7e6f9678ed6d284bf73c7
parent 20733 c92946ba1b289a6ca2ce27938ff1a88a94ebcd8a
child 20735 e2bbde5251cf771c504b96d8aaa82e4a3e691a81
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-beta@12633210f163 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, for
bugs1051619, 914274
Bug 1051619 - Port |Bug 914274 - Remove MODULE_NAME| to comm-central r=jcranmer a=for CLOSED TREE
calendar/base/Makefile.in
calendar/base/backend/libical/Makefile.in
calendar/base/backend/libical/build/Makefile.in
calendar/libical/src/libical/Makefile.in
calendar/providers/Makefile.in
config/config.mk
db/mork/build/Makefile.in
ldap/xpcom/src/Makefile.in
mail/components/build/Makefile.in
mailnews/build/Makefile.in
mailnews/import/build/Makefile.in
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/cthandlers/pgpmime/Makefile.in
suite/build/Makefile.in
--- a/calendar/base/Makefile.in
+++ b/calendar/base/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 USE_EXTENSION_MANIFEST = 1
-MODULE_NAME = calBaseModule
 
 ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
 THEME = linux
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 THEME = osx
 else
 THEME = windows
--- a/calendar/base/backend/libical/Makefile.in
+++ b/calendar/base/backend/libical/Makefile.in
@@ -4,13 +4,12 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE_NAME      = calBaseModule
 USE_STATIC_LIBS = 1
 NO_INTERFACES_MANIFEST = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE_NAME = calBaseModule
 USE_STATIC_LIBS = 1
 NO_COMPONENTS_MANIFEST = 1
 
 EXTRA_LIBS += $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
 # Ensure that we don't embed a manifest referencing the CRT
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH= @DEPTH@
 
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE_NAME      = mozIcalModule
 USE_STATIC_LIBS  = 1
 
 DEFINES += -DHAVE_CONFIG_H
 DEFINES += -DHAVE_SNPRINTF
 
 ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
 DEFINES	+= -D__USE_BSD=1
 endif
deleted file mode 100644
--- a/calendar/providers/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_NAME = calProviderModule
-
-include $(topsrcdir)/config/rules.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -301,19 +301,16 @@ ifeq ($(FINAL_LIBRARY),xul)
   endif
   LIBXUL_LIBRARY := 1
 endif
 
 ifdef LIBXUL_LIBRARY
 ifdef IS_COMPONENT
 $(error IS_COMPONENT is set, but is not compatible with LIBXUL_LIBRARY)
 endif
-ifdef MODULE_NAME
-$(error MODULE_NAME is $(MODULE_NAME) but MODULE_NAME and LIBXUL_LIBRARY are not compatible)
-endif
 SHORT_LIBNAME=
 endif
 
 # No sense in profiling tools
 ifdef INTERNAL_TOOLS
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 endif
 
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -6,15 +6,13 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME	= nsMorkModule
-
 EXTRA_LIBS += $(NSPR_LIBS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -5,20 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME	= nsLDAPProtocolModule
-endif
-
 ifdef MOZ_PREF_EXTENSIONS
 DEFINES += -DMOZ_PREF_EXTENSIONS
 endif
 
 EXTRA_LIBS += $(LDAP_LIBS)
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 EXTRA_LIBS += $(NSPR_LIBS)
 endif
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME	= nsMailCompsModule
 EXTRA_LIBS += $(NSPR_LIBS)
 OS_LIBS += $(GLIB_LIBS)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -5,20 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME	= nsMailModule
-endif
-
 EXTRA_LIBS += $(NSPR_LIBS)
 ifneq (WINNT,$(OS_ARCH))
 OS_LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += $(TK_LIBS)
 OS_LDFLAGS += -framework Cocoa
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME	= nsImportServiceModule
 SHARED_LIBRARY_LIBS = ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_LIBS += $(NSPR_LIBS)
 ifneq (WINNT,$(OS_ARCH))
 OS_LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -5,19 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME	= msgMapiModule
-endif
-
 CSRCS += ../build/msgMapi_i.c
 
 OS_LIBS		+= ole32.lib
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DUNICODE -D_UNICODE
deleted file mode 100644
--- a/mailnews/mime/cthandlers/pgpmime/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
-
-ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MODULE_NAME    = nsPgpMimeModule
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE_NAME	 = nsSuiteModule
-
 USE_STATIC_LIBS	 = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 OS_LIBS += $(TK_LIBS)