Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
backout bug 886526 because it probably made us use a lot more memory …
Browse files Browse the repository at this point in the history 
…to link on windows
  • Loading branch information
Trevor Saunders committed Jul 29, 2013
1 parent ad48fbd commit 53c9386
Show file tree
Hide file tree
Showing 87 changed files with 208 additions and 43 deletions.
5 changes: 2 additions & 3 deletions config/config.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,9 @@ _ENABLE_PIC=1

ifdef LIBXUL_LIBRARY
ifdef IS_COMPONENT
$(error IS_COMPONENT is set, but is not compatible with LIBXUL_LIBRARY)
ifndef MODULE_NAME
$(error Component makefile does not specify MODULE_NAME.)
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)
Expand Down
2 changes: 2 additions & 0 deletions docshell/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

IS_COMPONENT = 1
MODULE_NAME = docshell_provider

include $(DEPTH)/config/autoconf.mk

Expand Down
2 changes: 2 additions & 0 deletions dom/media/bridge/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = peerconnection

IS_COMPONENT = 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

Expand Down
2 changes: 2 additions & 0 deletions dom/plugins/base/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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)
Expand Down
1 change: 1 addition & 0 deletions dom/src/jsurl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ FAIL_ON_WARNINGS := 1

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = javascript__protocol
LIBXUL_LIBRARY = 1

LOCAL_INCLUDES += \
Expand Down
2 changes: 2 additions & 0 deletions editor/composer/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsComposerModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions editor/txmgr/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ FAIL_ON_WARNINGS = 1
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTransactionManagerModule
LIBXUL_LIBRARY = 1


Expand Down
1 change: 1 addition & 0 deletions editor/txtsvc/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ FAIL_ON_WARNINGS = 1

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = nsTextServicesModule
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions embedding/browser/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ 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
Expand Down
2 changes: 2 additions & 0 deletions embedding/components/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = embedcomponents
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions extensions/auth/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

IS_COMPONENT = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsAuthModule
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions extensions/cookie/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = cookie
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsCookieModule
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions extensions/gio/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

IS_COMPONENT = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsGIOModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions extensions/permissions/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPermissionsModule
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions extensions/pref/autoconfig/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = autoconfig
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsAutoConfigModule
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions extensions/spellcheck/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = mozSpellCheckerModule
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions extensions/universalchardet/src/xpcom/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUniversalCharDetModule
LIBXUL_LIBRARY = 1

LOCAL_INCLUDES = -I$(srcdir)/../base
Expand Down
2 changes: 2 additions & 0 deletions gfx/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ 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
Expand Down
2 changes: 2 additions & 0 deletions gfx/tests/gtest/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ 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 = \
Expand Down
2 changes: 2 additions & 0 deletions image/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsImageLib2Module
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
1 change: 1 addition & 0 deletions image/decoders/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = nsDecodersModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions image/decoders/icon/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

IS_COMPONENT = 1
MODULE_NAME = nsIconDecoderModule
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS = 1
Expand Down
1 change: 1 addition & 0 deletions image/encoders/bmp/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = imgEncoderBMPModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
1 change: 1 addition & 0 deletions image/encoders/ico/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = imgEncoderICOModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
1 change: 1 addition & 0 deletions image/encoders/jpeg/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = imgEncoderJPEGModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
1 change: 1 addition & 0 deletions image/encoders/png/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = imgEncoderPNGModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
1 change: 1 addition & 0 deletions image/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = imglib2_s
MODULE_NAME = nsImageLib2Module
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions intl/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ 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
Expand Down
2 changes: 2 additions & 0 deletions intl/chardet/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsChardetModule
LIBXUL_LIBRARY = 1


Expand Down
2 changes: 2 additions & 0 deletions intl/uconv/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ 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 \
Expand Down
2 changes: 2 additions & 0 deletions intl/uconv/util/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

MODULE_NAME = nsUCUtil

CSRCS = \
ugen.c \
uscan.c \
Expand Down
3 changes: 3 additions & 0 deletions js/ductwork/debugger/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ 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) \
Expand Down
2 changes: 2 additions & 0 deletions js/jsd/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ relativesrcdir = @relativesrcdir@

include $(DEPTH)/config/autoconf.mk

IS_COMPONENT = 1
LIBXUL_LIBRARY = 1

MODULE_NAME = JavaScript_Debugger
EXPORT_LIBRARY = 1

# REQUIRES = java js
Expand Down
5 changes: 2 additions & 3 deletions js/src/config/config.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,9 @@ _ENABLE_PIC=1

ifdef LIBXUL_LIBRARY
ifdef IS_COMPONENT
$(error IS_COMPONENT is set, but is not compatible with LIBXUL_LIBRARY)
ifndef MODULE_NAME
$(error Component makefile does not specify MODULE_NAME.)
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)
Expand Down
2 changes: 2 additions & 0 deletions layout/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ endif
LIBRARY_NAME = gklayout
MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsLayoutModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions layout/tools/layout-debug/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsLayoutDebugModule
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1

Expand Down
2 changes: 2 additions & 0 deletions mobile/android/components/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

MODULE_NAME = nsBrowserCompsModule
LIBXUL_LIBRARY = 1

IS_COMPONENT = 1
EXPORT_LIBRARY = 1

ifdef MOZ_ANDROID_HISTORY
Expand Down
2 changes: 2 additions & 0 deletions modules/libjar/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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

Expand Down
2 changes: 2 additions & 0 deletions modules/libjar/zipwriter/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ 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 changes: 2 additions & 0 deletions modules/libpref/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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) \
Expand Down
2 changes: 2 additions & 0 deletions netwerk/build/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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

Expand Down
2 changes: 2 additions & 0 deletions parser/htmlparser/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsParserModule
LIBXUL_LIBRARY = 1


Expand Down
Loading

0 comments on commit 53c9386

Please sign in to comment.