bug 856349 - remove useless SHORT_LIBNAME assignments r=glandium
authorTrevor Saunders <trev.saunders@gmail.com>
Sat, 30 Mar 2013 15:42:45 -0400
changeset 127993 be4612e105b16c67a92a7668d3fea71b00f23dfe
parent 127992 eebe60eebd95fa807ee6b93706a8b9e2b5828f68
child 127994 e59593a4baa1ed0db7e2b69b31104b1e07051f01
push id26081
push usertrev.saunders@gmail.com
push dateMon, 08 Apr 2013 16:29:43 +0000
treeherdermozilla-inbound@be4612e105b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs856349
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 856349 - remove useless SHORT_LIBNAME assignments r=glandium
accessible/build/Makefile.in
config/config.mk
embedding/components/build/Makefile.in
extensions/gio/Makefile.in
extensions/permissions/Makefile.in
extensions/pref/autoconfig/src/Makefile.in
extensions/spellcheck/src/Makefile.in
extensions/universalchardet/src/xpcom/Makefile.in
intl/uconv/src/Makefile.in
js/src/config/config.mk
modules/libjar/zipwriter/src/Makefile.in
parser/htmlparser/src/Makefile.in
startupcache/Makefile.in
storage/build/Makefile.in
toolkit/components/autocomplete/Makefile.in
toolkit/components/build/Makefile.in
toolkit/components/commandlines/Makefile.in
toolkit/components/filepicker/Makefile.in
xpcom/build/Makefile.in
xpfe/appshell/src/Makefile.in
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= accessibility
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= access
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsAccessibilityFactory.cpp
 
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
--- a/config/config.mk
+++ b/config/config.mk
@@ -241,17 +241,19 @@ 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.)
 endif
 endif
 FORCE_STATIC_LIB=1
-SHORT_LIBNAME=
+ifneq ($(SHORT_LIBNAME),)
+$(error make file is in libxul but  gives SHORT_LIBNAME as $(SHORT_LIBNAME))
+endif
 endif
 
 # If we are building this component into an extension/xulapp, it cannot be
 # statically linked. In the future we may want to add a xulapp meta-component
 # build option.
 
 ifdef XPI_NAME
 ifdef IS_COMPONENT
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= embedcomponents
 EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS		= nsEmbeddingModule.cpp
 
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
--- a/extensions/gio/Makefile.in
+++ b/extensions/gio/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= nkgio
-SHORT_LIBNAME	= nkgio
 IS_COMPONENT	= 1
 EXPORT_LIBRARY	= 1
 MODULE_NAME	= nsGIOModule
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 CPPSRCS		= \
 		nsGIOProtocolHandler.cpp \
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= permissions
-SHORT_LIBNAME	= perms
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPermissionsModule
 LIBXUL_LIBRARY = 1
 
 
 CPPSRCS		= \
 		  nsModuleFactory.cpp \
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = autoconfig
-SHORT_LIBNAME    = autocfg
 EXPORT_LIBRARY   = 1
 IS_COMPONENT     = 1
 MODULE_NAME      = nsAutoConfigModule
 LIBXUL_LIBRARY   = 1
 
 
 include $(topsrcdir)/config/config.mk
 
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= spellchecker
 MODULE_NAME     = mozSpellCheckerModule
-SHORT_LIBNAME   = spellchk
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 LIBXUL_LIBRARY  = 1
 
 
 CPPSRCS		= \
 		mozSpellCheckerFactory.cpp	\
 		mozSpellChecker.cpp		\
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= universalchardet
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUniversalCharDetModule
-SHORT_LIBNAME	= ucdet
 LIBXUL_LIBRARY = 1
 
 CPPSRCS = \
 		nsUniversalCharDetModule.cpp \
 		nsUdetXPCOMWrapper.cpp \
                $(NULL)
 
 LOCAL_INCLUDES = -I$(srcdir)/../base
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -10,18 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= uconv
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUConvModule
 LIBXUL_LIBRARY = 1
-# To avoid conflict with OS/2 system uconv.dll
-SHORT_LIBNAME  = mozuconv
 
 CPPSRCS		= \
 		nsUConvModule.cpp \
 		nsConverterInputStream.cpp \
 		nsConverterOutputStream.cpp \
 		nsTextToSubURI.cpp \
 		nsCharsetConverterManager.cpp \
 		nsUTF8ConverterService.cpp \
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -241,17 +241,19 @@ 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.)
 endif
 endif
 FORCE_STATIC_LIB=1
-SHORT_LIBNAME=
+ifneq ($(SHORT_LIBNAME),)
+$(error make file is in libxul but  gives SHORT_LIBNAME as $(SHORT_LIBNAME))
+endif
 endif
 
 # If we are building this component into an extension/xulapp, it cannot be
 # statically linked. In the future we may want to add a xulapp meta-component
 # build option.
 
 ifdef XPI_NAME
 ifdef IS_COMPONENT
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH                 = @DEPTH@
 topsrcdir             = @top_srcdir@
 srcdir                = @srcdir@
 VPATH                 = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME          = zipwriter
-SHORT_LIBNAME         = zipwrite
 MODULE_NAME           = ZipWriterModule
 EXPORT_LIBRARY        = 1
 LIBXUL_LIBRARY        = 1
 IS_COMPONENT          = 1
 
 CPPSRCS = \
   StreamFunctions.cpp \
   nsDeflateConverter.cpp \
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -8,17 +8,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = htmlpars
 EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsParserModule
-SHORT_LIBNAME  = gkparser
 LIBXUL_LIBRARY = 1
 
 
 SHARED_LIBRARY_LIBS = \
 		$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
 		$(NULL)
 
 CPPSRCS = \
--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -7,17 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = StartupCacheModule
 LIBRARY_NAME = startupcache
-SHORT_LIBNAME = scache
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT = 1
 
 CPPSRCS = StartupCache.cpp \
   StartupCacheUtils.cpp \
   StartupCacheModule.cpp \
   $(NULL)
--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = storagecomps
-SHORT_LIBNAME = strgcmps
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = mozStorageModule
 LIBXUL_LIBRARY = 1
 
 
 EXPORTS = mozStorageCID.h
 
--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = tkAutoCompleteModule
 LIBRARY_NAME = tkautocomplete
-SHORT_LIBNAME = tkautoc
 IS_COMPONENT = 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 CPPSRCS = \
   nsAutoCompleteController.cpp \
   nsAutoCompleteSimpleResult.cpp \
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = toolkitcomps
-SHORT_LIBNAME = tkitcmps
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsToolkitCompsModule
 LIBXUL_LIBRARY = 1
 
 EXPORTS = nsToolkitCompsCID.h
 
 CPPSRCS = nsToolkitCompsModule.cpp
--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = commandlines
-SHORT_LIBNAME = cmdlines
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = CommandLineModule
 LIBXUL_LIBRARY = 1
 
 CPPSRCS = \
   nsCommandLine.cpp \
   $(NULL)
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -9,17 +9,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_XUL
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 LIBRARY_NAME = fileview
-SHORT_LIBNAME = fileview
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsFileViewModule
 LIBXUL_LIBRARY = 1
 CPPSRCS = \
   nsFileView.cpp \
   $(NULL)
 EXTRA_COMPONENTS = nsFilePicker.js
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -10,17 +10,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../glue/objs.mk
 
 EXTRA_DEPS += $(srcdir)/../glue/objs.mk
 
 LIBRARY_NAME	= xpcom_core
-SHORT_LIBNAME	= xpcomcor
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 MOZILLA_INTERNAL_API = 1
 
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -DXP_LINUX
 endif
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 IS_COMPONENT=1
 MODULE_NAME	= appshell
 LIBRARY_NAME	= nsappshell
 EXPORT_LIBRARY  = 1
-SHORT_LIBNAME	= appshell
 LIBXUL_LIBRARY	= 1
 
 
 CPPSRCS		= \
 		nsChromeTreeOwner.cpp \
 		nsContentTreeOwner.cpp \
 		nsXULWindow.cpp \
 		nsAppShellService.cpp \