Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 939071 - Kill SHORT_LIBNAME. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2013-11-19 11:47:47 +09:00
parent b2e90f6233
commit a58f7369ea
12 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/build/Makefile.in
View File

@ -2,7 +2,6 @@
# 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/.
SHORT_LIBNAME = brwsrcmp
MODULE_NAME = nsBrowserCompsModule
ifeq ($(OS_ARCH),WINNT)

5
config/config.mk
View File

@ -74,6 +74,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
_DEPRECATED_VARIABLES := \
MOCHITEST_FILES_PARTS \
MOCHITEST_BROWSER_FILES_PARTS \
SHORT_LIBNAME \
$(NULL)
ifndef EXTERNALLY_MANAGED_MAKE_FILE
@ -134,7 +135,6 @@ CHECK_VARS := \
LIBRARY_NAME \
MODULE \
DEPTH \
SHORT_LIBNAME \
XPI_PKGNAME \
INSTALL_EXTENSION_ID \
SHARED_LIBRARY_NAME \
@ -341,9 +341,6 @@ ifdef MODULE_NAME
$(error MODULE_NAME is $(MODULE_NAME) but MODULE_NAME and LIBXUL_LIBRARY are not compatible)
endif
FORCE_STATIC_LIB=1
ifneq ($(SHORT_LIBNAME),)
$(error SHORT_LIBNAME is $(SHORT_LIBNAME) but SHORT_LIBNAME is not compatable with LIBXUL_LIBRARY)
endif
endif
# If we are building this component into an extension/xulapp, it cannot be

7
config/rules.mk
View File

@ -212,12 +212,6 @@ ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
IMPORT_LIBRARY := $(LIB_PREFIX)$(SHARED_LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
endif
ifeq (OS2,$(OS_ARCH))
ifdef SHORT_LIBNAME
SHARED_LIBRARY_NAME := $(SHORT_LIBNAME)
endif
endif
ifdef MAKE_FRAMEWORK
SHARED_LIBRARY := $(SHARED_LIBRARY_NAME)
else
@ -1689,7 +1683,6 @@ FREEZE_VARIABLES = \
DIRS \
LIBRARY \
MODULE \
SHORT_LIBNAME \
TIERS \
EXTRA_COMPONENTS \
EXTRA_PP_COMPONENTS \

1
db/sqlite3/src/Makefile.in
View File

@ -3,7 +3,6 @@
# 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/.
SHORT_LIBNAME = mozsqlt3
LIB_IS_C_ONLY = 1
ifeq ($(OS_ARCH),WINNT)

2
extensions/gnomevfs/Makefile.in
View File

@ -3,8 +3,6 @@
# 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/.
SHORT_LIBNAME = nkgnomevfs
LOCAL_INCLUDES = $(MOZ_GNOMEVFS_CFLAGS)
EXTRA_DSO_LDOPTS = \

2
extensions/widgetutils/src/Makefile.in
View File

@ -3,8 +3,6 @@
# 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/.
SHORT_LIBNAME = widgetutils
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \

5
js/src/config/config.mk
View File

@ -74,6 +74,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
_DEPRECATED_VARIABLES := \
MOCHITEST_FILES_PARTS \
MOCHITEST_BROWSER_FILES_PARTS \
SHORT_LIBNAME \
$(NULL)
ifndef EXTERNALLY_MANAGED_MAKE_FILE
@ -134,7 +135,6 @@ CHECK_VARS := \
LIBRARY_NAME \
MODULE \
DEPTH \
SHORT_LIBNAME \
XPI_PKGNAME \
INSTALL_EXTENSION_ID \
SHARED_LIBRARY_NAME \
@ -341,9 +341,6 @@ ifdef MODULE_NAME
$(error MODULE_NAME is $(MODULE_NAME) but MODULE_NAME and LIBXUL_LIBRARY are not compatible)
endif
FORCE_STATIC_LIB=1
ifneq ($(SHORT_LIBNAME),)
$(error SHORT_LIBNAME is $(SHORT_LIBNAME) but SHORT_LIBNAME is not compatable with LIBXUL_LIBRARY)
endif
endif
# If we are building this component into an extension/xulapp, it cannot be

7
js/src/config/rules.mk
View File

@ -212,12 +212,6 @@ ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
IMPORT_LIBRARY := $(LIB_PREFIX)$(SHARED_LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
endif
ifeq (OS2,$(OS_ARCH))
ifdef SHORT_LIBNAME
SHARED_LIBRARY_NAME := $(SHORT_LIBNAME)
endif
endif
ifdef MAKE_FRAMEWORK
SHARED_LIBRARY := $(SHARED_LIBRARY_NAME)
else
@ -1689,7 +1683,6 @@ FREEZE_VARIABLES = \
DIRS \
LIBRARY \
MODULE \
SHORT_LIBNAME \
TIERS \
EXTRA_COMPONENTS \
EXTRA_PP_COMPONENTS \

1
media/libsoundtouch/src/Makefile.in
View File

@ -2,7 +2,6 @@
# 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/.
SHORT_LIBNAME = soundt
EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
# Use abort() instead of exception in SoundTouch.

2
toolkit/components/ctypes/tests/Makefile.in
View File

@ -2,8 +2,6 @@
# 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/.
SHORT_LIBNAME = jscttest
LOCAL_INCLUDES = \
-I$(topsrcdir)/js/src/ctypes \
$(NULL)

4
xpcom/sample/Makefile.in
View File

@ -3,10 +3,6 @@
# 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/.
# 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
# If this is Makefile builds a component, MODULE_NAME must match the module
# name specified in NS_IMPL_NSGETMODULE
MODULE_NAME = nsSampleModule

2
xulrunner/examples/simple/components/src/Makefile.in
View File

@ -3,8 +3,6 @@
# 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/.
SHORT_LIBNAME = simpltst
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \