Bug 514665 - fix stupid module name differences on windows. r=ted
authorMitchell Field <mitch_1_2@live.com.au>
Fri, 25 Sep 2009 18:41:16 +0200
changeset 33050 614e3c4ba3c1032f7a7db60a18ef236f174ccd8e
parent 33049 d42a008d9e02a4b7d850cf183024aa96ef3ea45b
child 33052 4b153a70bfcfcd6574d69d6b2a8c609f0e6b4ca2
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs514665
milestone1.9.3a1pre
Bug 514665 - fix stupid module name differences on windows. r=ted
accessible/build/Makefile.in
browser/app/Makefile.in
browser/components/dirprovider/Makefile.in
browser/installer/package-manifest.in
browser/installer/removed-files.in
build/automation-build.mk
config/autoconf.mk.in
config/rules.mk
configure.in
docshell/base/Makefile.in
embedding/components/build/Makefile.in
embedding/config/basebrowser-installer-win.pkg
embedding/config/basebrowser-win
extensions/access-builtin/accessproxy/Makefile.in
extensions/java/xpcom/glue/Makefile.in
extensions/pref/autoconfig/src/Makefile.in
extensions/pref/system-pref/src/Makefile.in
extensions/universalchardet/src/xpcom/Makefile.in
extensions/widgetutils/src/Makefile.in
gfx/src/thebes/Makefile.in
intl/uconv/src/Makefile.in
js/src/config/autoconf.mk.in
js/src/config/rules.mk
js/src/configure.in
modules/libjar/zipwriter/src/Makefile.in
xpcom/build/Makefile.in
xpcom/proxy/public/Makefile.in
xpcom/sample/Makefile.in
xpcom/threads/Makefile.in
xulrunner/app/Makefile.in
xulrunner/examples/simple/components/src/Makefile.in
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -41,25 +41,22 @@ topsrcdir	= @top_srcdir@
 srcdir	= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= accessibility
 LIBRARY_NAME	= accessibility
 EXPORT_LIBRARY = 1
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= access
-endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
-
 CPPSRCS		= nsAccessibilityFactory.cpp
 
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
 	../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
 	../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
 	../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -81,23 +81,22 @@ endif
 
 LIBS += $(JEMALLOC_LIBS)
 
 ifdef LIBXUL_SDK
 include $(topsrcdir)/config/rules.mk
 else
 # Build a binary bootstrapping with XRE_main
 
-ifeq ($(USE_SHORT_LIBNAME), 1)
+ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
-
 CPPSRCS = nsBrowserApp.cpp
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 
 ifdef BUILD_STATIC_LIBS
 ifdef _MSC_VER
 STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
 else
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -39,30 +39,27 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE               = browsercomps
 LIBRARY_NAME         = browserdirprovider
-ifeq (,$(filter WINNT WINCE,$(OS_ARCH)))
 SHORT_LIBNAME        = brwsrdir
-endif
 IS_COMPONENT         = 1
 MODULE_NAME          = BrowserDirProvider
 FORCE_SHARED_LIB     = 1
 
 # Because we are an application component, link against the CRT statically
 # (on Windows, but only if we're not building our own CRT for jemalloc)
 ifndef MOZ_MEMORY
 USE_STATIC_LIBS      = 1
 endif
 
-
 CPPSRCS = nsBrowserDirectoryProvider.cpp
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -130,22 +130,17 @@
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_xmldoc.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/contentprefs.xpt
 @BINPATH@/components/cookie.xpt
 @BINPATH@/components/directory.xpt
-#ifdef XP_WIN32
-;XXX: this is stupid. fix this.
-@BINPATH@/components/docshell_base.xpt
-#else
 @BINPATH@/components/docshell.xpt
-#endif
 @BINPATH@/components/dom.xpt
 @BINPATH@/components/dom_base.xpt
 @BINPATH@/components/dom_canvas.xpt
 @BINPATH@/components/dom_core.xpt
 @BINPATH@/components/dom_css.xpt
 @BINPATH@/components/dom_events.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_html.xpt
@@ -217,22 +212,17 @@
 @BINPATH@/components/necko_wifi.xpt
 @BINPATH@/components/necko.xpt
 @BINPATH@/components/loginmgr.xpt
 @BINPATH@/components/places.xpt
 @BINPATH@/components/plugin.xpt
 @BINPATH@/components/pref.xpt
 @BINPATH@/components/prefetch.xpt
 @BINPATH@/components/profile.xpt
-;XXX: stupid, fix this!
-#ifdef XP_WIN32
 @BINPATH@/components/proxyObject.xpt
-#else
-@BINPATH@/components/proxyObjInst.xpt
-#endif
 @BINPATH@/components/rdf.xpt
 @BINPATH@/components/satchel.xpt
 @BINPATH@/components/saxparser.xpt
 @BINPATH@/components/sessionstore.xpt
 @BINPATH@/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/spellchecker.xpt
 @BINPATH@/components/storage.xpt
@@ -257,22 +247,17 @@
 @BINPATH@/components/widget.xpt
 @BINPATH@/components/windowds.xpt
 @BINPATH@/components/windowwatcher.xpt
 @BINPATH@/components/xpcom_base.xpt
 @BINPATH@/components/xpcom_system.xpt
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
-;XXX: stupid, fix this!
-#ifdef XP_WIN32
-@BINPATH@/components/xpcom_thread.xpt
-#else
 @BINPATH@/components/xpcom_threads.xpt
-#endif
 @BINPATH@/components/xpcom_xpti.xpt
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xpinstall.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 
@@ -310,22 +295,17 @@
 @BINPATH@/components/nsExtensionManager.js
 @BINPATH@/components/nsBlocklistService.js
 @BINPATH@/components/nsUpdateService.js
 @BINPATH@/components/pluginGlue.js
 @BINPATH@/components/nsSessionStartup.js
 @BINPATH@/components/nsSessionStore.js
 @BINPATH@/components/nsURLFormatter.js
 @BINPATH@/components/@DLL_PREFIX@browserdirprovider@DLL_SUFFIX@
-#ifdef XP_WIN32
-;XXX: lame, kill use_short_libname
-@BINPATH@/components/brwsrcmp.dll
-#else
 @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
-#endif
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/nsLivemarkService.js
 @BINPATH@/components/nsTaggingService.js
 @BINPATH@/components/nsPlacesDBFlush.js
 @BINPATH@/components/nsPlacesAutoComplete.js
 @BINPATH@/components/nsDefaultCLH.js
 @BINPATH@/components/nsContentPrefService.js
 @BINPATH@/components/nsContentDispatchChooser.js
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -803,8 +803,11 @@ msvcr80.dll
 #else
 mozcrt19.dll
 #endif
 #endif
 xpicleanup@BIN_SUFFIX@
 chrome.manifest
 install.rdf
 @DLL_PREFIX@jsj@DLL_SUFFIX@
+#ifdef XP_WIN
+components/brwsrcmp.dll
+#endif
\ No newline at end of file
--- a/build/automation-build.mk
+++ b/build/automation-build.mk
@@ -1,10 +1,9 @@
-
-ifeq ($(USE_SHORT_LIBNAME), 1)
+ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
 TARGET_DIST = $(TARGET_DEPTH)/dist
 
 ifeq ($(MOZ_BUILD_APP),camino)
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -322,17 +322,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
@@ -224,22 +224,20 @@ 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)))
-ifdef SHORT_LIBNAME
+ifeq (OS2,$(OS_ARCH))
 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
 
 ifndef HOST_LIBRARY
 ifdef HOST_LIBRARY_NAME
 HOST_LIBRARY		:= $(LIB_PREFIX)$(HOST_LIBRARY_NAME).$(LIB_SUFFIX)
 endif
--- a/configure.in
+++ b/configure.in
@@ -2048,17 +2048,16 @@ case "$target" in
     AC_DEFINE(STDC_HEADERS)
     AC_DEFINE(NEW_H, <new>)
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
     AC_DEFINE(HAVE_LOCALTIME_R)
 
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
     BIN_SUFFIX='.exe'
-    USE_SHORT_LIBNAME=1
     MOZ_ENABLE_POSTSCRIPT=
     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
@@ -2166,17 +2165,16 @@ case "$target" in
     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_ENABLE_POSTSCRIPT=
     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
@@ -2409,17 +2407,16 @@ case "$target" in
 
 *-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
@@ -7677,17 +7674,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_PLATFORM_HILDON)
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -39,19 +39,16 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= docshell
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
-XPIDL_MODULE	= docshell_base
-endif
 LIBRARY_NAME	= basedocshell_s
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
 SDK_XPIDLSRCS = \
 		nsIGlobalHistory.idl \
 		$(NULL)
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -39,19 +39,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= embedcomponents
 LIBRARY_NAME	= embedcomponents
 EXPORT_LIBRARY = 1
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= embedcmp
-endif
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsEmbeddingModule.cpp
 
 SHARED_LIBRARY_LIBS = \
--- a/embedding/config/basebrowser-installer-win.pkg
+++ b/embedding/config/basebrowser-installer-win.pkg
@@ -45,17 +45,17 @@ plugins\npmozax.dll
 ; 
 ; XPCOM:
 ; 
 components\xpcom_base.xpt
 components\xpcom_components.xpt
 components\xpcom_ds.xpt
 components\xpcom_io.xpt
 components\xpcom_nativeapp.xpt
-components\xpcom_thread.xpt
+components\xpcom_threads.xpt
 components\xpcom_xpti.xpt
 
 ; xpconnect
 components\xpc3250.dll
 components\xpconnect.xpt
 
 ; 
 ; XP widgets/graphics
@@ -101,17 +101,17 @@ components\caps.xpt
 ; cookies
 components\cookie.dll                   
 
 ; embedding glue:
 ; appshell, docshell, uriloader, chrome, components
 components\appshell.dll                 
 components\appshell.xpt                 
 components\docshell.dll                 
-components\docshell_base.xpt            
+components\docshell.xpt
 components\uriloader.xpt
 components\chrome.dll                   
 components\chrome.xpt                   
 components\webbrwsr.dll              
 components\webBrowser_core.xpt
 components\embedcomponents.dll
 components\windowwatcher.xpt
 
--- a/embedding/config/basebrowser-win
+++ b/embedding/config/basebrowser-win
@@ -46,17 +46,17 @@ js3250.dll
 ; 
 xpcom.dll
 xpcom_core.dll
 components\xpcom_base.xpt
 components\xpcom_components.xpt
 components\xpcom_ds.xpt
 components\xpcom_io.xpt
 components\xpcom_nativeapp.xpt
-components\xpcom_thread.xpt
+components\xpcom_threads.xpt
 components\xpcom_xpti.xpt
 components\mozreg.dll
 ;components\mozreg.xpt
 
 ; required prefs files
 greprefs\*
 
 ; xpconnect
@@ -108,17 +108,17 @@ components\caps.xpt
 ; cookies
 components\cookie.dll                   
 
 ; embedding glue:
 ; appshell, docshell, uriloader, chrome, components
 components\appshell.dll                 
 components\appshell.xpt                 
 components\docshell.dll                 
-components\docshell_base.xpt            
+components\docshell.xpt
 components\uriloader.xpt
 components\chrome.dll                   
 components\chrome.xpt                   
 components\webbrwsr.dll              
 components\webBrowser_core.xpt
 components\embedcomponents.dll
 components\windowwatcher.xpt
 
--- a/extensions/access-builtin/accessproxy/Makefile.in
+++ b/extensions/access-builtin/accessproxy/Makefile.in
@@ -40,19 +40,17 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessproxy
 XPIDL_MODULE = accessproxy
 LIBRARY_NAME = accessproxy
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = accproxy
-endif
 MOZILLA_INTERNAL_API = 1
 
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME	= nsAccessProxy
 
 # Don't install. At the moment we only want to build this extension
 # for inclusion in 3rd party assistive technology installers, 
--- a/extensions/java/xpcom/glue/Makefile.in
+++ b/extensions/java/xpcom/glue/Makefile.in
@@ -39,19 +39,17 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= javaxpcomglue
 LIBRARY_NAME	= javaxpcomglue
-ifeq ($(OS_ARCH),OS2)
 SHORT_LIBNAME	= jxpcmglu
-endif
 
 # On Mac OS X, JNI libraries must end with a '.jnilib' extension
 ifeq ($(OS_ARCH),Darwin)
 DLL_SUFFIX = .jnilib
 endif
 
 CPPSRCS	= nsJavaXPCOMGlue.cpp
 
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -40,19 +40,17 @@ DEPTH            = ../../../..
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE           = autoconfig
 LIBRARY_NAME     = autoconfig
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME    = autocfg
-endif
 EXPORT_LIBRARY   = 1
 IS_COMPONENT     = 1
 MODULE_NAME      = nsAutoConfigModule
 LIBXUL_LIBRARY   = 1
 
 
 include $(topsrcdir)/config/config.mk
 
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -39,19 +39,17 @@ DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = system-pref
 LIBRARY_NAME = system-pref_s
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = syspref
-endif
 
 # We want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_ENABLE_GTK2
 DIRS		= gconf
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -45,22 +45,19 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= universalchardet
 LIBRARY_NAME	= universalchardet
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUniversalCharDetModule
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= ucdet
-endif
 LIBXUL_LIBRARY = 1
 
-
 CPPSRCS = \
 		nsUniversalCharDetModule.cpp \
 		nsUdetXPCOMWrapper.cpp \
                $(NULL)
 
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 SHARED_LIBRARY_LIBS = \
--- a/extensions/widgetutils/src/Makefile.in
+++ b/extensions/widgetutils/src/Makefile.in
@@ -40,23 +40,20 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widgetutils
 XPI_NAME	= widgetutils
 LIBRARY_NAME    = widgetutils
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = widgetutils
-endif
 FORCE_SHARED_LIB = 1
 IS_COMPONENT = 1
 
-
 CPPSRCS		= nsWidgetUtils.cpp
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -39,19 +39,17 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = gfx
 LIBRARY_NAME = gkgfxthebes
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = gkgfxthb
-endif
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsGfxModule
 GRE_MODULE = 1
 LIBXUL_LIBRARY = 1
 
 
 
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -44,21 +44,18 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= uconv
 LIBRARY_NAME	= uconv
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUConvModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
-ifneq ($(OS_ARCH),WINNT)
 # To avoid conflict with OS/2 system uconv.dll
 SHORT_LIBNAME  = mozuconv
-endif
-
 
 CPPSRCS		= \
 		nsUConvModule.cpp \
 		nsCharsetAliasImp.cpp \
 		nsConverterInputStream.cpp \
 		nsConverterOutputStream.cpp \
 		nsTextToSubURI.cpp \
 		nsGREResProperties.cpp \
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -176,17 +176,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@
 _MSC_VER	= @_MSC_VER@
 
 DLL_PREFIX	= @DLL_PREFIX@
 LIB_PREFIX	= @LIB_PREFIX@
 OBJ_SUFFIX	= @OBJ_SUFFIX@
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -224,22 +224,20 @@ 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)))
-ifdef SHORT_LIBNAME
+ifeq (OS2,$(OS_ARCH))
 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
 
 ifndef HOST_LIBRARY
 ifdef HOST_LIBRARY_NAME
 HOST_LIBRARY		:= $(LIB_PREFIX)$(HOST_LIBRARY_NAME).$(LIB_SUFFIX)
 endif
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1846,17 +1846,16 @@ case "$target" in
     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='windows'
     BIN_SUFFIX='.exe'
-    USE_SHORT_LIBNAME=1
     MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
 ;;
 
 *-symbian*)
 
     AC_DEFINE(XP_UNIX)
     AC_DEFINE(SYMBIAN)
@@ -1980,17 +1979,16 @@ case "$target" in
     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_ENABLE_POSTSCRIPT=
     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
@@ -2140,17 +2138,16 @@ case "$target" in
 
 *-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
@@ -4813,17 +4810,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_JS_LIBS)
 AC_SUBST(MOZ_PSM)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_MODULES)
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -39,25 +39,22 @@ DEPTH                 = ../../../..
 topsrcdir             = @top_srcdir@
 srcdir                = @srcdir@
 VPATH                 = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE                = zipwriter
 LIBRARY_NAME          = zipwriter
-ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 SHORT_LIBNAME         = zipwrite
-endif
 MODULE_NAME           = ZipWriterModule
 EXPORT_LIBRARY        = 1
 LIBXUL_LIBRARY        = 1
 IS_COMPONENT          = 1
 
-
 CPPSRCS = \
   StreamFunctions.cpp \
   nsDeflateConverter.cpp \
   nsZipHeader.cpp \
   nsZipDataStream.cpp \
   nsZipWriter.cpp \
   ZipWriterModule.cpp \
   $(NULL)
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -43,33 +43,27 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../glue/objs.mk
 
 EXTRA_DEPS += $(srcdir)/../glue/objs.mk
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpcom_core
-
-ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 SHORT_LIBNAME	= xpcomcor
-endif
-
 LIBXUL_LIBRARY = 1
 
 # This is only a static library in libxul builds
 ifdef MOZ_ENABLE_LIBXUL
 EXPORT_LIBRARY = 1
 endif
 
 GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
-
-
 CSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \
 		$(NULL)
 
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCPPSRCS) \
 		$(XPCOM_GLUENS_SRC_LCPPSRCS) \
 		nsXPComInit.cpp \
--- a/xpcom/proxy/public/Makefile.in
+++ b/xpcom/proxy/public/Makefile.in
@@ -38,21 +38,17 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 XPIDL_MODULE	= proxyObject
-else
-XPIDL_MODULE	= proxyObjInst
-endif
 
 EXPORTS		= \
 		nsProxiedService.h \
 		$(NULL)
 
 XPIDLSRCS	= \
 		nsIProxyObjectManager.idl  \
 		$(NULL)
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -53,18 +53,18 @@ MODULE		= xpcomsample
 # XPIDL_MODULE names the .xpt file generated from IDL files
 # i.e. dist/bin/components/xpcomsample.xpt
 XPIDL_MODULE	= xpcomsample
 
 # LIBRARY_NAME names the library generated by this makefile,
 # i.e. dist/bin/components/libxpcomsample.so
 LIBRARY_NAME	= xpcomsample
 
-# On MS Windows and OS/2, SHORT_LIBNAME is used to generate a library
-# with an 8.3 filename, e.g. dist/bin/components/xpcomsmp.dll
+# On OS/2, SHORT_LIBNAME is used to generate a library with an 8.3 filename,
+# e.g. dist/bin/components/xpcomsmp.dll
 SHORT_LIBNAME	= xpcomsmp
 
 # IS_COMPONENT indicates that this makefile builds a component shared library.
 IS_COMPONENT	= 1
 
 # If this is Makefile builds a component, MODULE_NAME must match the module
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -38,21 +38,17 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
-XPIDL_MODULE	= xpcom_thread
-else
 XPIDL_MODULE	= xpcom_threads
-endif
 LIBRARY_NAME	= xpcomthreads_s
 GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
 
 CPPSRCS		= \
 		nsEventQueue.cpp \
 		nsEnvironment.cpp \
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -49,25 +49,21 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= profile
 
 PREF_JS_EXPORTS = $(srcdir)/xulrunner.js
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 
 DEFINES += -DAB_CD=$(AB_CD)
 
-ifeq ($(USE_SHORT_LIBNAME), 1)
-PROGRAM = xulrunner$(BIN_SUFFIX)
-else
-ifeq ($(OS_ARCH), BeOS)
+ifneq (,$(filter BeOS OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = xulrunner$(BIN_SUFFIX)
 else
 PROGRAM = xulrunner-bin$(BIN_SUFFIX)
 endif
-endif
 
 DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\"
 
 ifdef MOZ_JAVAXPCOM
 DEFINES += -DMOZ_JAVAXPCOM
 endif
 
 ifdef TARGET_XPCOM_ABI
--- a/xulrunner/examples/simple/components/src/Makefile.in
+++ b/xulrunner/examples/simple/components/src/Makefile.in
@@ -40,19 +40,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= simple
 XPI_NAME	= simple
 LIBRARY_NAME    = simpletest
-ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = simpltst
-endif
 IS_COMPONENT	= 1
 
 CPPSRCS		= SimpleTest.cpp
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)