Bug 891167 - Port bug 886526 - kill IS_COMPONENT and MODULE_NAME for things that go into libxul to comm-central. blanket-rs=build peer port of m-c bug. a=bustage fix for CLOSED TREE

config/config.mk

@@ -208,11 +208,10 @@ endif
 
 ifdef LIBXUL_LIBRARY
 ifdef IS_COMPONENT
-ifdef MODULE_NAME
-DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1
-else
-$(error Component makefile does not specify MODULE_NAME.)
+$(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
 FORCE_STATIC_LIB=1
 SHORT_LIBNAME=

db/mork/build/Makefile.in

@@ -12,14 +12,14 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mork
 EXPORT_LIBRARY = 1
+
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
-
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+FORCE_SHARED_LIB = 1
+else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
-else
-FORCE_SHARED_LIB = 1
 endif
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)

ldap/xpcom/src/Makefile.in

@@ -12,14 +12,14 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mozldap
 EXPORT_LIBRARY	= 1
+
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
-
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+FORCE_SHARED_LIB = 1
+else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
-else
-FORCE_SHARED_LIB = 1
 endif
 
 ifdef MOZ_PREF_EXTENSIONS

mail/components/build/Makefile.in

@@ -15,8 +15,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= mailcomps
 SHORT_LIBNAME	= mailcmp
 EXPORT_LIBRARY	= 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsMailCompsModule
 LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 FORCE_USE_PIC = 1

mailnews/build/Makefile.in

@@ -12,16 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mail
 EXPORT_LIBRARY = 1
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+MODULE_NAME	= nsMailModule
+FORCE_SHARED_LIB = 1
+else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
-else
-FORCE_SHARED_LIB = 1
 endif
 FORCE_USE_PIC   = 1
 
-MODULE_NAME	= nsMailModule
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES		+= -DMOZ_LDAP_XPCOM

mailnews/extensions/smime/build/Makefile.in

@@ -12,9 +12,10 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgsmime
 EXPORT_LIBRARY = 1
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif

mailnews/import/build/Makefile.in

@@ -11,8 +11,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = import
-IS_COMPONENT	= 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+IS_COMPONENT	= 1
+MODULE_NAME	= nsImportServiceModule
 FORCE_SHARED_LIB=1
 else
 EXPORT_LIBRARY = 1
@@ -20,7 +21,6 @@ MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
-MODULE_NAME	= nsImportServiceModule
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)import_s.$(LIB_SUFFIX) \

mailnews/mapi/mapihook/src/Makefile.in

@@ -11,12 +11,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= $(MODULE)
-MODULE_NAME	= msgMapiModule
-EXPORT_LIBRARY  = 1
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
-LIBXUL_LIBRARY  = 1
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+MODULE_NAME	= msgMapiModule
+else
+EXPORT_LIBRARY  = 1
 MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY  = 1
 endif
 
 

mailnews/mime/cthandlers/pgpmime/Makefile.in

@@ -11,9 +11,10 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = pgpmime_s
 EXPORT_LIBRARY = 1
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT   = 1
 MODULE_NAME    = nsPgpMimeModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif

mailnews/mime/cthandlers/smimestub/Makefile.in

@@ -12,9 +12,10 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= smimestb
 EXPORT_LIBRARY = 1
+ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSMIMEModule
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
+else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif