mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 886526 - disallow MODULE_NAME and IS_COMPONENT for makefiles in libxul r=bsmedberg

This commit is contained in:
Trevor Saunders 2013-06-25 11:15:21 -04:00
Родитель 38ca368790
Коммит 4fda35a773
87 изменённых файлов: 43 добавлений и 208 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
config/config.mk
Просмотреть файл

@ -239,9 +239,10 @@ _ENABLE_PIC=1
ifdef LIBXUL_LIBRARY
ifdef IS_COMPONENT
ifndef MODULE_NAME
$(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
ifneq ($(SHORT_LIBNAME),)

2
docshell/build/Makefile.in
Просмотреть файл

@ -8,8 +8,6 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
IS_COMPONENT = 1
MODULE_NAME = docshell_provider
include $(DEPTH)/config/autoconf.mk

2
dom/media/bridge/Makefile.in
Просмотреть файл

@ -9,9 +9,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = peerconnection
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

2
dom/plugins/base/Makefile.in
Просмотреть файл

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = gkplugin
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPluginModule
LIBXUL_LIBRARY = 1
ifeq ($(MOZ_WIDGET_TOOLKIT),android)

1
dom/src/jsurl/Makefile.in
Просмотреть файл

@ -12,7 +12,6 @@ FAIL_ON_WARNINGS := 1
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = javascript__protocol
LIBXUL_LIBRARY = 1
LOCAL_INCLUDES += \

2
editor/composer/src/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsComposerModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
editor/txmgr/src/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ FAIL_ON_WARNINGS = 1
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTransactionManagerModule
LIBXUL_LIBRARY = 1

1
editor/txtsvc/src/Makefile.in
Просмотреть файл

@ -12,7 +12,6 @@ FAIL_ON_WARNINGS = 1
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = nsTextServicesModule
LIBXUL_LIBRARY = 1

2
embedding/browser/build/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
MODULE_NAME = Browser_Embedding_Module
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
embedding/components/build/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = embedcomponents
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
extensions/auth/Makefile.in
Просмотреть файл

@ -10,9 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsAuthModule
LIBXUL_LIBRARY = 1

2
extensions/cookie/Makefile.in
Просмотреть файл

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = cookie
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsCookieModule
LIBXUL_LIBRARY = 1

2
extensions/gio/Makefile.in
Просмотреть файл

@ -10,9 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsGIOModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
extensions/permissions/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPermissionsModule
LIBXUL_LIBRARY = 1

2
extensions/pref/autoconfig/src/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = autoconfig
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsAutoConfigModule
LIBXUL_LIBRARY = 1

2
extensions/spellcheck/src/Makefile.in
Просмотреть файл

@ -9,9 +9,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = mozSpellCheckerModule
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
LIBXUL_LIBRARY = 1

2
extensions/universalchardet/src/xpcom/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUniversalCharDetModule
LIBXUL_LIBRARY = 1
LOCAL_INCLUDES = -I$(srcdir)/../base

2
gfx/src/Makefile.in
Просмотреть файл

@ -10,11 +10,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = nsGfxModule
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/rules.mk

2
gfx/tests/gtest/Makefile.in
Просмотреть файл

@ -12,9 +12,7 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
# Create a GTest library
MODULE_NAME = gfxtest
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
LOCAL_INCLUDES = \

2
image/build/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsImageLib2Module
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

1
image/decoders/Makefile.in
Просмотреть файл

@ -11,7 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = nsDecodersModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
image/decoders/icon/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
MODULE_NAME = nsIconDecoderModule
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS = 1

1
image/encoders/bmp/Makefile.in
Просмотреть файл

@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = imgEncoderBMPModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

1
image/encoders/ico/Makefile.in
Просмотреть файл

@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = imgEncoderICOModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

1
image/encoders/jpeg/Makefile.in
Просмотреть файл

@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = imgEncoderJPEGModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

1
image/encoders/png/Makefile.in
Просмотреть файл

@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
MODULE_NAME = imgEncoderPNGModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

1
image/src/Makefile.in
Просмотреть файл

@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = imglib2_s
FORCE_STATIC_LIB = 1
MODULE_NAME = nsImageLib2Module
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
intl/build/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsI18nModule
LIBXUL_LIBRARY = 1
# see also intl/locale/src/Makefile.in

2
intl/chardet/src/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsChardetModule
LIBXUL_LIBRARY = 1

2
intl/uconv/src/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUConvModule
LIBXUL_LIBRARY = 1
LOCAL_INCLUDES = -I$(srcdir)/../util \

2
intl/uconv/util/Makefile.in
Просмотреть файл

@ -15,8 +15,6 @@ EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = nsUCUtil
CSRCS = \
ugen.c \
uscan.c \

3
js/ductwork/debugger/Makefile.in
Просмотреть файл

@ -10,11 +10,8 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = jsdebugger
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \

2
js/jsd/Makefile.in
Просмотреть файл

@ -14,10 +14,8 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = JavaScript_Debugger
EXPORT_LIBRARY = 1
# REQUIRES = java js

5
js/src/config/config.mk
Просмотреть файл

@ -239,9 +239,10 @@ _ENABLE_PIC=1
ifdef LIBXUL_LIBRARY
ifdef IS_COMPONENT
ifndef MODULE_NAME
$(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
ifneq ($(SHORT_LIBNAME),)

2
layout/build/Makefile.in
Просмотреть файл

@ -18,8 +18,6 @@ endif
LIBRARY_NAME = gklayout
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsLayoutModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
layout/tools/layout-debug/src/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsLayoutDebugModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
mobile/android/components/build/Makefile.in
Просмотреть файл

@ -9,10 +9,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = nsBrowserCompsModule
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
ifdef MOZ_ANDROID_HISTORY

2
modules/libjar/Makefile.in
Просмотреть файл

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = jar$(VERSION_NUMBER)
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsJarModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
modules/libjar/zipwriter/src/Makefile.in
Просмотреть файл

@ -10,9 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MSVC_ENABLE_PGO := 1
MODULE_NAME = ZipWriterModule
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
include $(topsrcdir)/config/rules.mk

2
modules/libpref/src/Makefile.in
Просмотреть файл

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = pref
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPrefModule
LIBXUL_LIBRARY = 1
DEFINES += -DOS_ARCH=$(OS_ARCH) \

2
netwerk/build/Makefile.in
Просмотреть файл

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = necko
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = necko
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1

2
parser/htmlparser/src/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsParserModule
LIBXUL_LIBRARY = 1

2
rdf/build/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsRDFModule
LIBXUL_LIBRARY = 1
# XXX Note dependencies on implementation headers for factory functions

2
security/manager/boot/src/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MSVC_ENABLE_PGO := 1
IS_COMPONENT = 1
MODULE_NAME = BOOT
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
security/manager/pki/src/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
MODULE_NAME = PKI
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
security/manager/ssl/src/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT = 1
MODULE_NAME = NSS
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
CSRCS += md4.c

2
services/crypto/component/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
FAIL_ON_WARNINGS := 1
EXPORT_LIBRARY := 1
IS_COMPONENT := 1
MODULE_NAME := nsServicesCryptoModule
LIBXUL_LIBRARY := 1
MOZILLA_INTERNAL_API := 1

2
startupcache/Makefile.in
Просмотреть файл

@ -10,9 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = StartupCacheModule
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
include $(topsrcdir)/config/rules.mk

2
storage/build/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = mozStorageModule
LIBXUL_LIBRARY = 1

1
storage/src/Makefile.in
Просмотреть файл

@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = mozStorageModule
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1

2
testing/gtest/Makefile.in
Просмотреть файл

@ -17,10 +17,8 @@ VPATH = \
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = gtest
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
LOCAL_INCLUDES += \
-I$(srcdir)/gtest \

2
toolkit/components/autocomplete/Makefile.in
Просмотреть файл

@ -9,8 +9,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = tkAutoCompleteModule
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

2
toolkit/components/build/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = toolkitcomps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsToolkitCompsModule
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/config.mk

2
toolkit/components/commandlines/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = CommandLineModule
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk

3
toolkit/components/ctypes/Makefile.in
Просмотреть файл

@ -9,11 +9,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = jsctypes
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
LOCAL_INCLUDES := \
-I$(topsrcdir)/js/xpconnect/loader \

2
toolkit/components/diskspacewatcher/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = diskspacewatcher
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = DiskSpaceWatcherModule
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk

2
toolkit/components/filepicker/Makefile.in
Просмотреть файл

@ -14,8 +14,6 @@ include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XUL
ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFileViewModule
LIBXUL_LIBRARY = 1
endif
endif

2
toolkit/components/mediasniffer/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mediasniffer
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsMediaSnifferModule
IS_COMPONENT = 1
include $(topsrcdir)/config/config.mk

3
toolkit/components/perf/Makefile.in
Просмотреть файл

@ -9,11 +9,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = jsperf
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
FAIL_ON_WARNINGS = 1
LOCAL_INCLUDES := \

2
toolkit/components/places/Makefile.in
Просмотреть файл

@ -14,8 +14,6 @@ LIBRARY_NAME = places
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsPlacesModule
IS_COMPONENT = 1
LOCAL_INCLUDES += -I$(srcdir)/../build

3
toolkit/components/reflect/Makefile.in
Просмотреть файл

@ -9,11 +9,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = jsreflect
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \

2
toolkit/components/remote/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = RemoteServiceModule
LIBXUL_LIBRARY = 1

2
toolkit/components/satchel/Makefile.in
Просмотреть файл

@ -9,8 +9,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = satchel
IS_COMPONENT = 1
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1

1
toolkit/components/statusfilter/Makefile.in
Просмотреть файл

@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = nsBrowserModule
include $(topsrcdir)/config/rules.mk

3
toolkit/components/telemetry/Makefile.in
Просмотреть файл

@ -12,11 +12,8 @@ include $(DEPTH)/config/autoconf.mk
USE_RCS_MK := 1
include $(topsrcdir)/config/makefiles/rcs.mk
MODULE_NAME = telemetry
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
FAIL_ON_WARNINGS = 1
LIBRARY_NAME = telemetry

3
toolkit/devtools/server/Makefile.in
Просмотреть файл

@ -9,11 +9,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = jsinspector
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \

2
toolkit/identity/Makefile.in
Просмотреть файл

@ -11,10 +11,8 @@ include $(DEPTH)/config/autoconf.mk
FAIL_ON_WARNINGS := 1
MODULE_NAME = identity
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk

74
toolkit/library/Makefile.in
Просмотреть файл

@ -58,7 +58,6 @@ endif
endif
SHARED_LIBRARY_LIBS += \
$(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
$(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
$(NULL)
@ -135,7 +134,7 @@ STATIC_LIBS += \
$(NULL)
# component libraries
COMPONENT_LIBS += \
STATIC_LIBS += \
necko \
uconv \
i18n \
@ -171,94 +170,94 @@ COMPONENT_LIBS += \
$(NULL)
ifdef BUILD_CTYPES
COMPONENT_LIBS += \
STATIC_LIBS += \
jsctypes \
$(NULL)
endif
COMPONENT_LIBS += \
STATIC_LIBS += \
jsperf \
gkplugin \
$(NULL)
ifdef MOZ_XUL
ifdef MOZ_ENABLE_GTK
COMPONENT_LIBS += \
STATIC_LIBS += \
unixproxy \
$(NULL)
endif
endif
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
COMPONENT_LIBS += \
STATIC_LIBS += \
osxproxy \
$(NULL)
endif
ifdef MOZ_XUL
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += \
STATIC_LIBS += \
unixproxy \
$(NULL)
endif
endif
ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
COMPONENT_LIBS += \
STATIC_LIBS += \
windowsproxy \
$(NULL)
endif
ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
COMPONENT_LIBS += \
STATIC_LIBS += \
androidproxy \
$(NULL)
endif
ifdef MOZ_JSDEBUGGER
DEFINES += -DMOZ_JSDEBUGGER
COMPONENT_LIBS += \
STATIC_LIBS += \
jsd \
$(NULL)
endif
ifdef MOZ_PREF_EXTENSIONS
DEFINES += -DMOZ_PREF_EXTENSIONS
COMPONENT_LIBS += \
STATIC_LIBS += \
autoconfig \
$(NULL)
endif
ifdef MOZ_AUTH_EXTENSION
COMPONENT_LIBS += auth
STATIC_LIBS += auth
DEFINES += -DMOZ_AUTH_EXTENSION
endif
ifdef MOZ_PERMISSIONS
COMPONENT_LIBS += cookie permissions
STATIC_LIBS += cookie permissions
DEFINES += -DMOZ_PERMISSIONS
endif
ifdef MOZ_UNIVERSALCHARDET
COMPONENT_LIBS += universalchardet
STATIC_LIBS += universalchardet
DEFINES += -DMOZ_UNIVERSALCHARDET
endif
ifeq (,$(filter android gonk qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
ifdef MOZ_XUL
COMPONENT_LIBS += fileview
STATIC_LIBS += fileview
DEFINES += -DMOZ_FILEVIEW
endif
endif
ifdef MOZ_PLACES
COMPONENT_LIBS += \
STATIC_LIBS += \
places \
$(NULL)
endif
ifdef MOZ_XUL
COMPONENT_LIBS += \
STATIC_LIBS += \
tkautocomplete \
satchel \
pippki \
@ -266,11 +265,11 @@ COMPONENT_LIBS += \
endif
ifdef MOZ_ENABLE_GTK3
COMPONENT_LIBS += widget_gtk3
STATIC_LIBS += widget_gtk3
endif
ifdef MOZ_ENABLE_GTK2
COMPONENT_LIBS += widget_gtk2
STATIC_LIBS += widget_gtk2
endif
ifdef MOZ_ENABLE_GTK2
@ -282,69 +281,68 @@ endif
# Platform-specific icon channel stuff - supported mostly-everywhere
ifneq (,$(filter windows os2 mac cocoa gtk2 gtk3 qt android,$(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DICON_DECODER
COMPONENT_LIBS += imgicon
STATIC_LIBS += imgicon
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
COMPONENT_LIBS += widget_android
STATIC_LIBS += skia_npapi
STATIC_LIBS += widget_android skia_npapi
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
COMPONENT_LIBS += widget_gonk
STATIC_LIBS += widget_gonk
endif
STATIC_LIBS += thebes gl ycbcr
ifdef MOZ_ENABLE_PROFILER_SPS
COMPONENT_LIBS += profiler
STATIC_LIBS += profiler
endif
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += widget_windows
STATIC_LIBS += widget_windows
ifdef MOZ_METRO
COMPONENT_LIBS += widget_winrt
STATIC_LIBS += widget_winrt
endif
endif
ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += wdgtos2
STATIC_LIBS += wdgtos2
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += widget_mac
STATIC_LIBS += widget_mac
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += widget_qt
STATIC_LIBS += widget_qt
endif
ifdef MOZ_ENABLE_XREMOTE
COMPONENT_LIBS += remoteservice
STATIC_LIBS += remoteservice
endif
ifdef MOZ_SPELLCHECK
DEFINES += -DMOZ_SPELLCHECK
COMPONENT_LIBS += spellchecker
STATIC_LIBS += spellchecker
endif
ifdef MOZ_ZIPWRITER
DEFINES += -DMOZ_ZIPWRITER
COMPONENT_LIBS += zipwriter
STATIC_LIBS += zipwriter
endif
COMPONENT_LIBS += services-crypto
STATIC_LIBS += services-crypto
ifdef MOZ_DEBUG
ifdef ENABLE_TESTS
COMPONENT_LIBS += gkdebug
STATIC_LIBS += gkdebug
endif
endif
ifdef MOZ_GIO_COMPONENT
DEFINES += -DMOZ_GIO_COMPONENT
COMPONENT_LIBS += nkgio
STATIC_LIBS += nkgio
endif
ifdef MOZ_APP_COMPONENT_LIBS
COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
STATIC_LIBS += $(MOZ_APP_COMPONENT_LIBS)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
@ -396,7 +394,7 @@ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
ifdef MOZ_WEBRTC
ifdef MOZ_PEERCONNECTION
COMPONENT_LIBS += peerconnection
STATIC_LIBS += peerconnection
endif
ifdef MOZ_WEBRTC_SIGNALING
EXTRA_DSO_LDOPTS += \
@ -716,7 +714,7 @@ endif
ifdef LINK_GTEST
COMPONENT_LIBS += \
STATIC_LIBS += \
gtest \
gfxtest \
$(NULL)

2
toolkit/system/androidproxy/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsAndroidProxyModule
LIBXUL_LIBRARY = 1

2
toolkit/system/osxproxy/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsOSXProxyModule
LIBXUL_LIBRARY = 1

2
toolkit/system/unixproxy/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUnixProxyModule
LIBXUL_LIBRARY = 1
ifdef MOZ_ENABLE_LIBPROXY

2
toolkit/system/windowsproxy/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWindowsProxyModule
LIBXUL_LIBRARY = 1

2
tools/profiler/Makefile.in
Просмотреть файл

@ -23,10 +23,8 @@ ifneq (,$(filter armeabi,$(ANDROID_CPU_ARCH)))
DEFINES += -DARCH_ARMV6
endif
MODULE_NAME = nsProfilerModule
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
ifndef _MSC_VER
FAIL_ON_WARNINGS = 1
endif # !_MSC_VER

1
view/src/Makefile.in
Просмотреть файл

@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
MSVC_ENABLE_PGO := 1
FORCE_STATIC_LIB = 1
MODULE_NAME = nsViewModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1

2
widget/android/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = widget_android
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetAndroidModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1

2
widget/cocoa/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetMacModule
LIBXUL_LIBRARY = 1

2
widget/gonk/Makefile.in
Просмотреть файл

@ -24,8 +24,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = widget_gonk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetGonkModule
LIBXUL_LIBRARY = 1
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

3
widget/gtk2/Makefile.in
Просмотреть файл

@ -11,15 +11,12 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_ENABLE_GTK2
MODULE_NAME = nsWidgetGtk2Module
LIBRARY_NAME = widget_gtk2
else
MODULE_NAME = nsWidgetGtk3Module
LIBRARY_NAME = widget_gtk3
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
LIBXUL_LIBRARY = 1
NATIVE_THEME_SUPPORT = 1

2
widget/os2/Makefile.in
Просмотреть файл

@ -11,9 +11,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
RESFILE = widget.res
MODULE_NAME = nsWidgetOS2Module
LIBXUL_LIBRARY = 1

2
widget/qt/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = widget_qt
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetQtModule
LIBXUL_LIBRARY = 1
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a

2
widget/windows/Makefile.in
Просмотреть файл

@ -13,9 +13,7 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = widget_windows
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
RESFILE = widget.res
MODULE_NAME = nsWidgetWinModule
LIBXUL_LIBRARY = 1
DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE

2
widget/windows/winrt/Makefile.in
Просмотреть файл

@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = widget_winrt
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = WidgetWinRTModule
LIBXUL_LIBRARY = 1
DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE

5
xpcom/glue/tests/gtest/Makefile.in
Просмотреть файл

@ -10,13 +10,10 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = xpcom_glue_gtest
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
LOCAL_INCLUDES = \
-I$(srcdir)/../.. \
LOCAL_INCLUDES = \ -I$(srcdir)/../.. \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
xpfe/appshell/src/Makefile.in
Просмотреть файл

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
IS_COMPONENT=1
MODULE_NAME = appshell
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

2
xpfe/components/autocomplete/src/Makefile.in
Просмотреть файл

@ -10,9 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = xpAutoComplete
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
include $(topsrcdir)/config/rules.mk

2
xpfe/components/build/Makefile.in
Просмотреть файл

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = appcomps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = application
LIBXUL_LIBRARY = 1

2
xpfe/components/windowds/Makefile.in
Просмотреть файл

@ -10,9 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE_NAME = nsWindowDataSourceModule
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
EXPORT_LIBRARY = 1