Bug 534408 - Core bug 514665 dropped/replaced USE_SHORT_LIBNAME uses: port that to c-c (apps); (Gv2) Get rid of USE_SHORT_LIBNAME and useless SHORT_LIBNAMEs.
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 07 May 2010 16:14:57 +0200
changeset 5603 6f1c84f4a88ea7619234e4e73e1fb1f36a089c23
parent 5602 0315af2cc3b4ed87be8e528e3322ed85b0c8dc59
child 5604 aa187bdfe978f1a56bf60f9c947876370a3e850f
push idunknown
push userunknown
push dateunknown
bugs534408, 514665
Bug 534408 - Core bug 514665 dropped/replaced USE_SHORT_LIBNAME uses: port that to c-c (apps); (Gv2) Get rid of USE_SHORT_LIBNAME and useless SHORT_LIBNAMEs. r=(Callek, kairo, standard8) sr=standard8 a-seamonkey2.1a1=kairo. (CLOSED TREE)
config/autoconf.mk.in
config/rules.mk
configure.in
directory/xpcom/base/src/Makefile.in
mail/installer/package-manifest.in
mail/installer/removed-files.in
mailnews/addrbook/build/Makefile.in
mailnews/base/build/Makefile.in
mailnews/base/test/Makefile.in
mailnews/compose/build/Makefile.in
mailnews/db/msgdb/build/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/Makefile.in
mailnews/extensions/fts3/build/Makefile.in
mailnews/extensions/mailviews/build/Makefile.in
mailnews/extensions/mdn/build/Makefile.in
mailnews/extensions/smime/build/Makefile.in
mailnews/imap/build/Makefile.in
mailnews/imap/test/Makefile.in
mailnews/import/build/Makefile.in
mailnews/local/build/Makefile.in
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/build/Makefile.in
mailnews/mime/cthandlers/calendar/Makefile.in
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/emitters/build/Makefile.in
mailnews/news/build/Makefile.in
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -277,17 +277,16 @@ AR_LIST		= @AR_LIST@
 AR_DELETE	= @AR_DELETE@
 AS		= @AS@
 ASFLAGS		= @ASFLAGS@
 AS_DASH_C_FLAG	= @AS_DASH_C_FLAG@
 LD		= @LD@
 RC		= @RC@
 RCFLAGS		= @RCFLAGS@
 WINDRES		= @WINDRES@
-USE_SHORT_LIBNAME = @USE_SHORT_LIBNAME@
 IMPLIB		= @IMPLIB@
 FILTER		= @FILTER@
 BIN_FLAGS	= @BIN_FLAGS@
 MIDL		= @MIDL@
 MIDL_FLAGS	= @MIDL_FLAGS@
 _MSC_VER	= @_MSC_VER@
 
 DLL_PREFIX	= @DLL_PREFIX@
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -230,17 +230,17 @@ endif # ENABLE_TESTS
 # Library rules
 #
 # If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set, build a static library.
 # Otherwise, build a shared library.
 #
 
 ifndef LIBRARY
 ifdef STATIC_LIBRARY_NAME
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifeq (OS2,$(OS_ARCH))
 ifdef SHORT_LIBNAME
 STATIC_LIBRARY_NAME	:= $(SHORT_LIBNAME)
 SHARED_LIBRARY_NAME	:= $(SHORT_LIBNAME)
 endif
 endif
 LIBRARY			:= $(LIB_PREFIX)$(STATIC_LIBRARY_NAME).$(LIB_SUFFIX)
 endif # STATIC_LIBRARY_NAME
 endif # LIBRARY
--- a/configure.in
+++ b/configure.in
@@ -2231,17 +2231,16 @@ fi
     AC_DEFINE(HW_THREADS)
     AC_DEFINE(STDC_HEADERS)
     AC_DEFINE(NEW_H, <new>)
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
 
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
     BIN_SUFFIX='.exe'
-    USE_SHORT_LIBNAME=1
     MOZ_USER_DIR="Mozilla"
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
 
     # Sanity check for WINCE_WINDOWS_MOBILE
     # XXX disabled until we can fix the mobile tinderbox
     ##if test "$WINCE_WINDOWS_MOBILE"; then
     ##   AC_CHECK_HEADER(tpcshell.h, [],
@@ -2371,17 +2370,16 @@ fi
     AC_DEFINE(XP_WIN32)
     AC_DEFINE(HW_THREADS)
     AC_DEFINE(STDC_HEADERS)
     AC_DEFINE(NEW_H, <new>)
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
     BIN_SUFFIX='.exe'
-    USE_SHORT_LIBNAME=1
     MOZ_USER_DIR="Mozilla"
 
     dnl Hardcode to win95 for now - cls
     TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"'
 
     dnl set NO_X11 defines here as the general check is skipped on win32
     no_x=yes
     AC_DEFINE(NO_X11)
@@ -2580,17 +2578,16 @@ fi
 
 *-os2*)
     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     AC_DEFINE(OS2)
     AC_DEFINE(XP_OS2)
     AC_DEFINE(OS2EMX_PLAIN_CHAR)
     AC_DEFINE(TCPV40HDRS)
-    USE_SHORT_LIBNAME=1
     DLL_PREFIX=
     LIB_PREFIX=
     LIB_SUFFIX=lib
     BIN_SUFFIX=".exe"
     DLL_SUFFIX=".dll"
     IMPORT_LIB_SUFFIX=lib
     DSO_PIC_CFLAGS=
     AR=emxomfar
@@ -7177,17 +7174,16 @@ AC_SUBST(AR_EXTRACT)
 AC_SUBST(AR_DELETE)
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 AC_SUBST(AS_DASH_C_FLAG)
 AC_SUBST(LD)
 AC_SUBST(RC)
 AC_SUBST(RCFLAGS)
 AC_SUBST(WINDRES)
-AC_SUBST(USE_SHORT_LIBNAME)
 AC_SUBST(IMPLIB)
 AC_SUBST(FILTER)
 AC_SUBST(BIN_FLAGS)
 AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MINIMO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
--- a/directory/xpcom/base/src/Makefile.in
+++ b/directory/xpcom/base/src/Makefile.in
@@ -40,17 +40,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mozldap
 LIBRARY_NAME	= mozldap
-SHORT_LIBNAME	= mozldap
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  necko \
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -687,59 +687,50 @@
 @BINPATH@/components/@DLL_PREFIX@autocfg@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@caps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@chardet@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@chrome@DLL_SUFFIX@
 #ifndef MOZILLA_1_9_2_BRANCH
-#ifndef XP_OS2
-@BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
-#endif
-#ifndef XP_UNIX
-@BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
-#else
-@BINPATH@/components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
-#endif
 #ifdef XP_OS2
 @BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
 #else
+@BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
 #endif
 #elifndef XP_UNIX
 @BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
 #endif
@@ -781,16 +772,21 @@
 @BINPATH@/components/@DLL_PREFIX@imglib2@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@import@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #ifdef BUILD_CTYPES
 @BINPATH@/components/@DLL_PREFIX@jsctypes@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@mail@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
+#else
+@BINPATH@/components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
+#endif
 @BINPATH@/components/@DLL_PREFIX@mork@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@mozfind@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@mozldap@DLL_SUFFIX@
 #ifdef XP_WIN32
 @BINPATH@/components/@DLL_PREFIX@msgMapi@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@msgsmime@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@necko@DLL_SUFFIX@
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -463,19 +463,22 @@ components/@DLL_PREFIX@i18n@DLL_SUFFIX@
 #ifndef UNIX_BUT_NOT_MAC
 components/@DLL_PREFIX@imgicon@DLL_SUFFIX@
 #endif
 components/@DLL_PREFIX@imglib2@DLL_SUFFIX@
 components/@DLL_PREFIX@import@DLL_SUFFIX@
 components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 components/@DLL_PREFIX@mail@DLL_SUFFIX@
+#ifdef XP_OS2
+components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
+#else
 #ifdef XP_WIN
 components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
-#else
+#endif
 components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
 #endif
 components/@DLL_PREFIX@mork@DLL_SUFFIX@
 components/@DLL_PREFIX@mozfind@DLL_SUFFIX@
 components/@DLL_PREFIX@mozldap@DLL_SUFFIX@
 components/@DLL_PREFIX@msgMapi@DLL_SUFFIX@
 components/@DLL_PREFIX@msgsmime@DLL_SUFFIX@
 components/@DLL_PREFIX@necko@DLL_SUFFIX@
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@@ -80,17 +80,17 @@ REQUIRES	+= mozldap \
                    $(NULL)
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 SHARED_LIBRARY_LIBS = \
 	../src/$(LIB_PREFIX)addrbook_s.$(LIB_SUFFIX) \
 	$(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS += msgbsutl
 else
 EXTRA_DSO_LIBS += msgbaseutil
 endif
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS = \
 	$(LIBS_DIR) \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -89,17 +89,17 @@ endif
 
 CPPSRCS		= nsMsgFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msgbase_s.$(LIB_SUFFIX) \
 		../search/src/$(LIB_PREFIX)msgsearch_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS = \
 		$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
--- a/mailnews/base/test/Makefile.in
+++ b/mailnews/base/test/Makefile.in
@@ -80,17 +80,17 @@ endif
 LIBS +=   \
     $(NULL)
 
 ifdef MOZ_STATIC_MAIL_BUILD
 LIBS +=   \
     ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
     $(NULL)
 else
-ifeq ($(USE_SHORT_LIBNAME), 1)
+ifeq (OS2,$(OS_ARCH))
 LIBS +=   $(call EXPAND_LIBNAME_PATH,msgbsutl,../../base/util)
 else
 LIBS +=   $(call EXPAND_LIBNAME_PATH,msgbaseutil,../../base/util)
 endif
 endif
 
 LIBS +=   \
   $(XPCOM_LIBS) \
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@@ -70,17 +70,17 @@ REQUIRES	= xpcom \
 		  pref \
 		  widget \
 		  msgdb \
 		  appcomps \
 		  toolkitcomps \
 		  nkcache \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsMsgCompFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
@@ -104,9 +104,8 @@ EXTRA_DSO_LDOPTS = \
 	$(NULL)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(TK_LIBS)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@@ -57,17 +57,17 @@ REQUIRES	= xpcom \
 		  locale \
 		  mork \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  necko \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsMsgDBFactory.cpp
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX)
@@ -83,9 +83,8 @@ EXTRA_DSO_LDOPTS = \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@@ -41,30 +41,29 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= bayesflt
 LIBRARY_NAME	= bayesflt
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= bayesflt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 REQUIRES	= xpcom \
 		  msgbase \
 		  lwbrk \
 		  string \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsBayesianFilterFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
@@ -86,9 +85,8 @@ EXTRA_DSO_LDOPTS = \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/fts3/build/Makefile.in
+++ b/mailnews/extensions/fts3/build/Makefile.in
@@ -42,30 +42,29 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= fts3tok
 LIBRARY_NAME	= fts3tok
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= fts3tok
 IS_COMPONENT	= 1
 MODULE_NAME	= nsFts3TokenizerModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 REQUIRES	= xpcom \
 		  string \
 		  sqlite3 \
 		  storage \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsFts3TokenizerFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
--- a/mailnews/extensions/mailviews/build/Makefile.in
+++ b/mailnews/extensions/mailviews/build/Makefile.in
@@ -41,34 +41,33 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 LIBRARY_NAME	= mailview
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= mailview
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMailViewModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  necko \
 		  msgbaseutil \
           	  msgdb \
           	  mime \
 		  intl \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsMsgMailViewsFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
@@ -88,9 +87,8 @@ EXTRA_DSO_LDOPTS = \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ b/mailnews/extensions/mdn/build/Makefile.in
@@ -41,33 +41,32 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
 LIBRARY_NAME	= msgmdn
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= msgmdn
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMdnModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  msgdb \
 		  necko \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsMsgMdnFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
@@ -87,9 +86,8 @@ EXTRA_DSO_LDOPTS = \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -41,17 +41,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= msgsmime
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 REQUIRES	= xpcom \
 		  string \
@@ -59,17 +58,17 @@ REQUIRES	= xpcom \
 		  msgcompose \
 		  pipnss \
 		  necko \
 		  intl \
 		  $(NULL)
 
 ifndef MOZ_STATIC_MAIL_BUILD
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 endif
 
 CPPSRCS		= nsMsgSMIMEFactory.cpp
@@ -95,9 +94,8 @@ EXTRA_DSO_LDOPTS = \
 	$(LIBS_DIR) \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@@ -65,17 +65,17 @@ REQUIRES	= xpcom \
 		  mime \
 		  pref \
 		  intl \
 		  msglocal \
 		  nkcache \
       uriloader \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS	= msgbsutl
 else
 EXTRA_DSO_LIBS	= msgbaseutil
 endif
 
 CPPSRCS		= nsImapFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
@@ -97,9 +97,8 @@ EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -86,17 +86,17 @@ LIBS += 	\
 		../src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef MOZ_STATIC_MAIL_BUILD
 LIBS +=		\
 		../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
 		$(NULL)
 else
-ifeq ($(USE_SHORT_LIBNAME), 1)
+ifeq (OS2,$(OS_ARCH))
 LIBS +=		$(call EXPAND_LIBNAME_PATH,msgbsutl,../../base/util)
 else
 LIBS +=		$(call EXPAND_LIBNAME_PATH,msgbaseutil,../../base/util)
 endif
 endif
 
 LIBS +=		\
 		$(XPCOM_LIBS) \
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -118,17 +118,17 @@ LOCAL_INCLUDES += -I$(srcdir)/../oexpres
 	-I$(srcdir)/../winlivemail  \
 	$(NULL)
 endif
 endif
 
 ifdef MOZ_STATIC_MAIL_BUILD
 EXTRA_DSO_LDOPTS += ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
 else
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif # ifeq
 endif # MOZ_STATIC_MAIL_BUILD
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS += \
--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@@ -63,17 +63,17 @@ REQUIRES	= xpcom \
 		  rdf \
 		  rdfutil \
 		  mime \
 		  intl \
 		  pref \
 		  nkcache \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsMsgLocalFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
@@ -99,9 +99,8 @@ EXTRA_DSO_LDOPTS = \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_MOVEMAIL
 DEFINES	+= -DHAVE_MOVEMAIL
 endif
-
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -85,17 +85,17 @@ CPPSRCS		= \
 		msgMapiSupport.cpp \
 		Registry.cpp \
 		$(NULL)
 
 LOBJS		= ../build/msgMapi_i.$(OBJ_SUFFIX)
 
 ifndef MOZ_STATIC_MAIL_BUILD
 
-ifdef USE_SHORT_LIBNAME
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS	= msgbsutl
 else
 EXTRA_DSO_LIBS	= msgbaseutil
 endif
 
 else
 SHARED_LIBRARY_LIBS = ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
 endif
@@ -118,9 +118,8 @@ endif
 
 OS_LIBS		+= ole32.lib
 
 SRCS_IN_OBJDIR	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DUNICODE -D_UNICODE
-
--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@@ -56,17 +56,17 @@ LOCAL_INCLUDES += -I$(srcdir)/../src
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  msgbase \
 		  pref \
 		  uconv \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS			= nsMimeModule.cpp
 
 SHARED_LIBRARY_LIBS = \
@@ -86,9 +86,8 @@ EXTRA_DSO_LDOPTS = \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mailnews/mime/cthandlers/calendar/Makefile.in
@@ -82,18 +82,17 @@ LOCAL_INCLUDES = -I$(srcdir)/../glue
 CPPSRCS		= \
 		mimecal.cpp \
 		$(NULL)
 
 ifndef MOZ_STATIC_MAIL_BUILD
 
 CPPSRCS += nsCalendarFactory.cpp
 
-
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 EXTRA_DSO_LIBS += mimecthglue_s
 
 ifdef MOZILLA_INTERNAL_API
@@ -113,11 +112,9 @@ endif
 
 else
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 endif
 
-
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -81,18 +81,17 @@ LOCAL_INCLUDES = -I$(srcdir)/../glue
 CPPSRCS		= \
 		mimevcrd.cpp \
 		$(NULL)
 
 ifndef MOZ_STATIC_MAIL_BUILD
 
 CPPSRCS += nsVCardFactory.cpp
 
-
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
@@ -112,12 +111,9 @@ endif
 
 else
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 endif
 
-
-
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/mime/emitters/build/Makefile.in
+++ b/mailnews/mime/emitters/build/Makefile.in
@@ -58,17 +58,17 @@ REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  necko \
 		  intl \
 		  locale \
 		  msgbase \
 		  $(NULL)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS = msgbsutl
 else
 EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsEmitterFactory.cpp
 
 SHARED_LIBRARY_LIBS = \
@@ -88,9 +88,8 @@ EXTRA_DSO_LDOPTS = \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@@ -72,17 +72,17 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= nsMsgNewsFactory.cpp
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgnews_s.$(LIB_SUFFIX)
 
-ifeq ($(USE_SHORT_LIBNAME),1)
+ifeq (OS2,$(OS_ARCH))
 EXTRA_DSO_LIBS += msgbsutl
 else
 EXTRA_DSO_LIBS += msgbaseutil
 endif
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
@@ -98,9 +98,8 @@ EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
 	$(NSPR_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -773,33 +773,38 @@ bin/libfreebl_32int64_3.so
 #ifdef MOZ_STATIC_MAIL_BUILD
 @BINPATH@/components/@DLL_PREFIX@mail@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@addrbook@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@bayesflt@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@fts3tok@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@mailview@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@mime@DLL_SUFFIX@
-#ifdef WIN_OR_OS2
-; To become |#ifdef XP_OS2| in bug 534408.
+#ifdef XP_OS2
 @BINPATH@/components/mimeemit.dll
-@BINPATH@/msgbsutl.dll
+#else
+@BINPATH@/components/@DLL_PREFIX@mimeemitter@DLL_SUFFIX@
+#endif
+@BINPATH@/components/@DLL_PREFIX@msgbase@DLL_SUFFIX@
+#ifdef XP_OS2
 @BINPATH@/components/msgcompo.dll
 #else
-@BINPATH@/components/@DLL_PREFIX@mimeemitter@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@msgbaseutil@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@msgcompose@DLL_SUFFIX@
 #endif
-@BINPATH@/components/@DLL_PREFIX@msgbase@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@msgdb@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@msgimap@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@msglocal@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@msgmdn@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@msgnews@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@vcard@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/msgbsutl.dll
+#else
+@BINPATH@/@DLL_PREFIX@msgbaseutil@DLL_SUFFIX@
+#endif
 ; ! MOZ_STATIC_MAIL_BUILD
 #endif
 ; ! MOZ_STATIC_BUILD
 #endif
 
 ; MailNews component xpts
 @BINPATH@/components/addrbook.xpt
 @BINPATH@/components/fts3tok.xpt
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -208,34 +208,38 @@ xpicleanup@BIN_SUFFIX@
 ; '! MOZ_STATIC_BUILD' case.
 components/@DLL_PREFIX@mail@DLL_SUFFIX@
 #else
 components/@DLL_PREFIX@addrbook@DLL_SUFFIX@
 components/@DLL_PREFIX@bayesflt@DLL_SUFFIX@
 components/@DLL_PREFIX@fts3tok@DLL_SUFFIX@
 components/@DLL_PREFIX@mailview@DLL_SUFFIX@
 components/@DLL_PREFIX@mime@DLL_SUFFIX@
-#ifdef WIN_OR_OS2
-; To become |#ifdef XP_OS2| in bug 534408.
-; At that time, copy these entries into the following |#ifdef XP_WIN| block. (Or just don't.!.)
+#ifdef XP_OS2
 components/mimeemit.dll
-msgbsutl.dll
+#else
+components/@DLL_PREFIX@mimeemitter@DLL_SUFFIX@
+#endif
+components/@DLL_PREFIX@msgbase@DLL_SUFFIX@
+#ifdef XP_OS2
 components/msgcompo.dll
 #else
-components/@DLL_PREFIX@mimeemitter@DLL_SUFFIX@
-@DLL_PREFIX@msgbaseutil@DLL_SUFFIX@
 components/@DLL_PREFIX@msgcompose@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@msgbase@DLL_SUFFIX@
 components/@DLL_PREFIX@msgdb@DLL_SUFFIX@
 components/@DLL_PREFIX@msgimap@DLL_SUFFIX@
 components/@DLL_PREFIX@msglocal@DLL_SUFFIX@
 components/@DLL_PREFIX@msgmdn@DLL_SUFFIX@
 components/@DLL_PREFIX@msgnews@DLL_SUFFIX@
 components/@DLL_PREFIX@vcard@DLL_SUFFIX@
+#ifdef XP_OS2
+msgbsutl.dll
+#else
+@DLL_PREFIX@msgbaseutil@DLL_SUFFIX@
+#endif
 
 #ifdef MOZ_STATIC_BUILD
 components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
 components/@DLL_PREFIX@appcomps@DLL_SUFFIX@
 components/@DLL_PREFIX@auth@DLL_SUFFIX@
 components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
 components/@DLL_PREFIX@caps@DLL_SUFFIX@
 components/@DLL_PREFIX@chardet@DLL_SUFFIX@