mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-23 02:47:07 +00:00
bug 886526 - remove IS_COMPONENT and MODULE_NAME makefile vars for things in libxul r=bsmedberg r=glandium
This commit is contained in:
parent
b1fe3da835
commit
e62a12b52f
@ -235,9 +235,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
|
||||
ifdef FORCE_STATIC_LIB
|
||||
$(error Makefile sets FORCE_STATIC_LIB which was already implied by LIBXUL_LIBRARY)
|
||||
|
@ -8,8 +8,6 @@ topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = docshell_provider
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
@ -9,9 +9,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = peerconnection
|
||||
|
||||
IS_COMPONENT = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
@ -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)
|
||||
|
@ -11,7 +11,6 @@ FAIL_ON_WARNINGS := 1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = javascript__protocol
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -11,7 +11,6 @@ FAIL_ON_WARNINGS = 1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = nsTextServicesModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -10,9 +10,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
IS_COMPONENT = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
MODULE_NAME = nsAuthModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -10,8 +10,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsPermissionsModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = autoconfig
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsAutoConfigModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -9,9 +9,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = mozSpellCheckerModule
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -14,9 +14,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
|
||||
|
||||
# Create a GTest library
|
||||
MODULE_NAME = gfxtest
|
||||
LIBXUL_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
|
@ -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
|
||||
|
||||
|
@ -10,7 +10,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = nsDecodersModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -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
|
||||
|
@ -9,7 +9,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = imgEncoderBMPModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -9,7 +9,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = imgEncoderICOModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -9,7 +9,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = imgEncoderJPEGModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -9,7 +9,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = imgEncoderPNGModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -11,7 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = imglib2_s
|
||||
MODULE_NAME = nsImageLib2Module
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -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
|
||||
|
@ -11,8 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsChardetModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -14,8 +14,6 @@ MSVC_ENABLE_PGO := 1
|
||||
EXPORT_LIBRARY = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
MODULE_NAME = nsUCUtil
|
||||
|
||||
CSRCS = \
|
||||
ugen.c \
|
||||
uscan.c \
|
||||
|
@ -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) \
|
||||
|
@ -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
|
||||
|
@ -235,9 +235,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
|
||||
ifdef FORCE_STATIC_LIB
|
||||
$(error Makefile sets FORCE_STATIC_LIB which was already implied by LIBXUL_LIBRARY)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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) \
|
||||
|
@ -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
|
||||
|
||||
|
@ -10,8 +10,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsParserModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -11,8 +11,6 @@ VPATH=@srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = mozStorageModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -10,7 +10,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = mozStorageModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
# Don't use the jemalloc allocator on Android, because we can't guarantee
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk
|
||||
LIBRARY_NAME = mediasniffer
|
||||
LIBXUL_LIBRARY = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
MODULE_NAME = nsMediaSnifferModule
|
||||
IS_COMPONENT = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -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 := \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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) \
|
||||
|
@ -11,8 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = RemoteServiceModule
|
||||
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
@ -9,8 +9,6 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = satchel
|
||||
IS_COMPONENT = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
|
@ -11,7 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBXUL_LIBRARY = 1
|
||||
MODULE_NAME = nsBrowserModule
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -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
|
||||
|
@ -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) \
|
||||
|
@ -11,9 +11,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
FAIL_ON_WARNINGS := 1
|
||||
|
||||
MODULE_NAME = identity
|
||||
LIBXUL_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -57,8 +57,11 @@ SHARED_LIBRARY_LIBS += $(DEPTH)/accessible/src/xul/$(LIB_PREFIX)accessibility_xu
|
||||
endif
|
||||
endif
|
||||
|
||||
# XXX bug 903227 COMPONENT_LIBS is useless since bug 886526, but removing it
|
||||
# reorders the static libraries which makes msvc use more memory to link
|
||||
# xul.dll.
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
$(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
|
||||
$(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
|
||||
$(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
|
||||
$(NULL)
|
||||
|
||||
|
@ -10,8 +10,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsAndroidProxyModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -10,8 +10,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsOSXProxyModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -10,8 +10,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsWindowsProxyModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -11,7 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MSVC_ENABLE_PGO := 1
|
||||
MODULE_NAME = nsViewModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
FAIL_ON_WARNINGS := 1
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -11,8 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsWidgetMacModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
FAIL_ON_WARNINGS = 1
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 += -DMOZ_UNICODE
|
||||
|
@ -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 += -DMOZ_UNICODE
|
||||
|
@ -10,13 +10,9 @@ 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)/../.. \
|
||||
$(NULL)
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../..
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = appcomps
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = application
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
|
@ -10,9 +10,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE_NAME = nsWindowDataSourceModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user