From ffe03809122d61ad5dc779b2c27c1c16ef569ac1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 19 Nov 2013 11:47:14 +0900 Subject: [PATCH] Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps --- accessible/src/atk/Makefile.in | 1 - accessible/src/atk/moz.build | 1 + accessible/src/base/moz.build | 2 + accessible/src/generic/moz.build | 2 + accessible/src/html/moz.build | 2 + accessible/src/mac/Makefile.in | 1 - accessible/src/mac/moz.build | 1 + accessible/src/other/Makefile.in | 1 - accessible/src/other/moz.build | 1 + accessible/src/windows/ia2/moz.build | 3 +- accessible/src/windows/msaa/moz.build | 3 +- accessible/src/windows/sdn/moz.build | 3 +- accessible/src/windows/uia/Makefile.in | 2 - accessible/src/windows/uia/moz.build | 1 + accessible/src/xpcom/moz.build | 2 + accessible/src/xul/moz.build | 2 + browser/components/about/moz.build | 2 + browser/components/build/Makefile.in | 11 - browser/components/dirprovider/moz.build | 2 + browser/components/feeds/src/moz.build | 2 + browser/components/migration/src/moz.build | 2 + browser/components/shell/src/moz.build | 2 + caps/src/moz.build | 2 + chrome/src/moz.build | 1 + configure.in | 32 -- content/base/src/moz.build | 1 + content/canvas/src/moz.build | 1 + content/events/src/moz.build | 1 + content/html/content/src/moz.build | 1 + content/html/document/src/moz.build | 2 + content/mathml/content/src/moz.build | 1 + content/media/apple/moz.build | 1 + content/media/directshow/moz.build | 1 + content/media/encoder/moz.build | 1 + content/media/gstreamer/moz.build | 1 + content/media/mediasource/moz.build | 1 + content/media/moz.build | 1 + content/media/ogg/moz.build | 1 + .../media/omx/mediaresourcemanager/moz.build | 2 + content/media/omx/moz.build | 1 + content/media/plugins/moz.build | 2 + content/media/raw/moz.build | 2 + content/media/wave/moz.build | 1 + content/media/webaudio/blink/moz.build | 1 + content/media/webaudio/moz.build | 1 + content/media/webm/moz.build | 1 + content/media/webrtc/moz.build | 1 + content/media/webspeech/recognition/moz.build | 2 + content/media/webspeech/synth/moz.build | 3 +- content/media/webspeech/synth/pico/moz.build | 2 +- content/media/wmf/moz.build | 1 + content/smil/moz.build | 2 + content/svg/content/src/moz.build | 1 + content/svg/document/src/moz.build | 2 + content/xbl/src/moz.build | 2 + content/xml/content/src/moz.build | 1 + content/xml/document/src/moz.build | 2 + content/xslt/src/base/moz.build | 2 + content/xslt/src/xml/moz.build | 2 + content/xslt/src/xpath/moz.build | 2 + content/xslt/src/xslt/moz.build | 2 + content/xul/content/src/moz.build | 2 + content/xul/document/src/moz.build | 2 + content/xul/templates/src/moz.build | 2 + docshell/base/moz.build | 1 + docshell/build/moz.build | 2 + docshell/shistory/src/moz.build | 2 + dom/activities/src/moz.build | 2 + dom/alarm/moz.build | 1 + dom/apps/src/moz.build | 2 + dom/audiochannel/moz.build | 3 +- dom/base/moz.build | 2 + dom/battery/moz.build | 1 + dom/bindings/moz.build | 4 +- dom/bluetooth/moz.build | 2 + dom/browser-element/moz.build | 2 + dom/camera/moz.build | 2 + dom/cellbroadcast/src/moz.build | 1 + dom/devicestorage/moz.build | 1 + dom/encoding/moz.build | 1 + dom/file/moz.build | 2 + dom/fmradio/ipc/moz.build | 2 + dom/fmradio/moz.build | 2 + dom/gamepad/moz.build | 1 + dom/icc/src/moz.build | 1 + dom/indexedDB/ipc/moz.build | 1 + dom/indexedDB/moz.build | 1 + dom/interfaces/devicestorage/moz.build | 1 - dom/ipc/moz.build | 3 +- dom/media/bridge/moz.build | 3 +- dom/media/moz.build | 2 + dom/mobilemessage/src/moz.build | 2 + dom/network/src/moz.build | 1 + dom/nfc/moz.build | 2 + dom/plugins/base/android/moz.build | 3 +- dom/plugins/base/moz.build | 3 +- dom/plugins/ipc/moz.build | 3 +- dom/power/moz.build | 1 + dom/promise/moz.build | 2 + dom/quota/moz.build | 1 + dom/src/events/moz.build | 2 + dom/src/geolocation/moz.build | 1 + dom/src/json/moz.build | 2 + dom/src/jsurl/moz.build | 2 + dom/src/notification/moz.build | 1 + dom/src/offline/moz.build | 2 + dom/src/storage/moz.build | 1 + dom/system/android/moz.build | 3 +- dom/system/gonk/moz.build | 1 + dom/system/mac/moz.build | 3 +- dom/system/moz.build | 3 +- dom/system/unix/moz.build | 3 +- dom/system/windows/moz.build | 3 +- dom/telephony/moz.build | 1 + dom/time/moz.build | 1 + dom/voicemail/moz.build | 2 + dom/wifi/moz.build | 3 +- dom/workers/moz.build | 2 + editor/composer/src/moz.build | 3 +- editor/libeditor/base/moz.build | 2 + editor/libeditor/html/moz.build | 2 + editor/libeditor/text/moz.build | 2 + editor/txmgr/src/moz.build | 3 +- editor/txtsvc/src/moz.build | 1 + embedding/browser/build/Makefile.in | 8 - embedding/browser/build/moz.build | 3 +- embedding/browser/webBrowser/moz.build | 1 + embedding/components/appstartup/src/moz.build | 1 + embedding/components/build/Makefile.in | 20 -- embedding/components/build/moz.build | 3 +- .../components/commandhandler/src/moz.build | 1 + embedding/components/find/src/moz.build | 1 + .../components/printingui/src/mac/Makefile.in | 6 - .../components/printingui/src/mac/moz.build | 1 + .../components/printingui/src/os2/Makefile.in | 6 - .../components/printingui/src/os2/moz.build | 1 + .../printingui/src/unixshared/Makefile.in | 6 - .../printingui/src/unixshared/moz.build | 1 + .../components/printingui/src/win/Makefile.in | 6 - .../components/printingui/src/win/moz.build | 1 + .../webbrowserpersist/src/moz.build | 1 + .../components/windowwatcher/src/moz.build | 1 + extensions/auth/moz.build | 3 +- extensions/cookie/moz.build | 3 +- extensions/gio/moz.build | 3 +- extensions/permissions/moz.build | 3 +- extensions/pref/autoconfig/src/moz.build | 3 +- extensions/spellcheck/hunspell/src/moz.build | 1 + extensions/spellcheck/src/Makefile.in | 2 - extensions/spellcheck/src/moz.build | 3 +- .../universalchardet/src/base/moz.build | 1 + .../universalchardet/src/xpcom/Makefile.in | 4 - .../universalchardet/src/xpcom/moz.build | 3 +- gfx/2d/moz.build | 3 +- gfx/angle/moz.build | 2 + gfx/cairo/cairo/src/moz.build | 1 + gfx/cairo/libpixman/src/moz.build | 1 + gfx/gl/moz.build | 3 +- gfx/graphite2/src/moz.build | 2 + gfx/harfbuzz/src/moz.build | 1 + gfx/ipc/moz.build | 3 +- gfx/layers/moz.build | 1 + gfx/ots/src/moz.build | 2 + gfx/qcms/moz.build | 1 + gfx/skia/moz.build | 3 +- gfx/src/moz.build | 3 +- gfx/thebes/Makefile.in | 5 - gfx/thebes/moz.build | 3 +- gfx/ycbcr/moz.build | 3 +- hal/moz.build | 3 +- image/build/Makefile.in | 9 - image/build/moz.build | 3 +- image/decoders/icon/Makefile.in | 2 - image/decoders/icon/android/moz.build | 1 + image/decoders/icon/gtk/moz.build | 1 + image/decoders/icon/mac/moz.build | 1 + image/decoders/icon/moz.build | 3 +- image/decoders/icon/os2/moz.build | 1 + image/decoders/icon/qt/moz.build | 1 + image/decoders/icon/win/moz.build | 1 + image/decoders/moz.build | 2 + image/encoders/bmp/moz.build | 2 + image/encoders/ico/moz.build | 2 + image/encoders/jpeg/moz.build | 1 + image/encoders/png/moz.build | 2 + image/src/moz.build | 1 + intl/build/Makefile.in | 20 -- intl/build/moz.build | 3 +- intl/chardet/src/moz.build | 3 +- intl/hyphenation/src/moz.build | 1 + intl/locale/src/mac/moz.build | 1 + intl/locale/src/moz.build | 1 + intl/locale/src/nsLocaleConstructors.h | 18 +- intl/locale/src/os2/moz.build | 3 +- intl/locale/src/unix/moz.build | 1 + intl/locale/src/windows/moz.build | 1 + intl/lwbrk/src/moz.build | 1 + intl/strres/src/moz.build | 1 + intl/uconv/src/moz.build | 3 +- intl/unicharutil/src/moz.build | 1 + intl/unicharutil/util/internal/moz.build | 2 + ipc/chromium/moz.build | 3 +- ipc/dbus/moz.build | 3 +- ipc/glue/moz.build | 3 +- ipc/ipdl/moz.build | 3 +- ipc/ipdl/test/cxx/moz.build | 3 +- ipc/keystore/Makefile.in | 6 - ipc/keystore/moz.build | 2 + ipc/netd/moz.build | 3 +- ipc/nfc/moz.build | 1 + ipc/ril/moz.build | 3 +- ipc/testshell/moz.build | 3 +- ipc/unixsocket/moz.build | 3 +- js/ductwork/debugger/moz.build | 3 +- js/ipc/moz.build | 3 +- js/jsd/moz.build | 3 +- js/xpconnect/loader/moz.build | 1 + js/xpconnect/src/Makefile.in | 5 - js/xpconnect/src/moz.build | 1 + js/xpconnect/wrappers/moz.build | 1 + layout/base/moz.build | 1 + layout/build/Makefile.in | 216 -------------- layout/build/moz.build | 8 +- layout/forms/moz.build | 1 + layout/generic/moz.build | 1 + layout/inspector/src/moz.build | 1 + layout/ipc/moz.build | 3 +- layout/mathml/moz.build | 1 + layout/media/Makefile.in | 98 ------- layout/media/webrtc/moz.build | 1 + layout/printing/moz.build | 1 + layout/style/moz.build | 1 + layout/svg/moz.build | 1 + layout/tables/moz.build | 1 + layout/tools/layout-debug/src/moz.build | 3 +- layout/xul/base/src/moz.build | 1 + layout/xul/grid/moz.build | 1 + layout/xul/tree/moz.build | 1 + media/kiss_fft/moz.build | 2 + media/libcubeb/src/moz.build | 2 + media/libjpeg/moz.build | 2 + media/libnestegg/src/moz.build | 2 + media/libogg/moz.build | 2 + media/libopus/moz.build | 2 + media/libpng/moz.build | 2 + media/libsoundtouch/src/moz.build | 2 + media/libspeex_resampler/src/moz.build | 2 + media/libtheora/lib/moz.build | 2 + media/libtremor/lib/moz.build | 2 + media/libvorbis/moz.build | 2 + media/libvpx/moz.build | 2 + media/mtransport/build/moz.build | 2 + memory/build/moz.build | 5 + mfbt/moz.build | 2 + mobile/android/components/build/moz.build | 3 +- mobile/android/confvars.sh | 1 - modules/libjar/moz.build | 3 +- modules/libjar/zipwriter/src/moz.build | 3 +- modules/libpref/src/moz.build | 3 +- mozglue/android/moz.build | 2 + mozglue/build/Makefile.in | 15 +- mozglue/linker/moz.build | 2 + netwerk/base/src/moz.build | 1 + netwerk/build/Makefile.in | 54 ---- netwerk/build/moz.build | 3 +- netwerk/cache/moz.build | 1 + netwerk/cache2/moz.build | 1 + netwerk/cookie/moz.build | 1 + netwerk/dns/moz.build | 1 + netwerk/ipc/moz.build | 3 +- netwerk/mime/moz.build | 1 + netwerk/protocol/about/moz.build | 1 + netwerk/protocol/app/moz.build | 1 + netwerk/protocol/data/moz.build | 1 + netwerk/protocol/device/moz.build | 1 + netwerk/protocol/file/moz.build | 1 + netwerk/protocol/ftp/moz.build | 1 + netwerk/protocol/http/moz.build | 1 + netwerk/protocol/res/moz.build | 1 + netwerk/protocol/rtsp/moz.build | 2 + netwerk/protocol/viewsource/moz.build | 1 + netwerk/protocol/websocket/moz.build | 1 + netwerk/protocol/wyciwyg/moz.build | 1 + netwerk/sctp/datachannel/moz.build | 1 + netwerk/sctp/src/moz.build | 1 + netwerk/socket/moz.build | 1 + netwerk/srtp/src/moz.build | 1 + netwerk/streamconv/converters/moz.build | 1 + netwerk/streamconv/src/moz.build | 1 + netwerk/system/android/moz.build | 1 + netwerk/system/mac/moz.build | 1 + netwerk/system/qt/moz.build | 1 + netwerk/system/win32/moz.build | 1 + netwerk/wifi/moz.build | 1 + other-licenses/android/moz.build | 2 + other-licenses/skia-npapi/moz.build | 3 +- other-licenses/snappy/moz.build | 3 +- parser/expat/lib/moz.build | 2 + parser/html/moz.build | 1 + parser/htmlparser/src/Makefile.in | 7 - parser/htmlparser/src/moz.build | 3 +- parser/xml/src/moz.build | 1 + rdf/base/src/moz.build | 1 + rdf/build/Makefile.in | 5 - rdf/build/moz.build | 3 +- rdf/datasource/src/moz.build | 1 + rdf/util/src/internal/moz.build | 2 + security/manager/boot/src/moz.build | 3 +- security/manager/pki/src/moz.build | 3 +- security/manager/ssl/src/moz.build | 3 +- security/sandbox/linux/moz.build | 3 +- services/crypto/component/moz.build | 3 +- startupcache/moz.build | 3 +- storage/build/Makefile.in | 4 - storage/build/moz.build | 3 +- storage/src/moz.build | 1 + toolkit/components/alerts/moz.build | 1 + toolkit/components/autocomplete/moz.build | 3 +- toolkit/components/build/Makefile.in | 22 -- toolkit/components/build/moz.build | 3 +- toolkit/components/commandlines/moz.build | 3 +- toolkit/components/ctypes/moz.build | 3 +- toolkit/components/diskspacewatcher/moz.build | 3 +- toolkit/components/downloads/moz.build | 1 + toolkit/components/feeds/moz.build | 1 + toolkit/components/filepicker/moz.build | 2 +- .../components/finalizationwitness/moz.build | 2 + toolkit/components/find/moz.build | 1 + toolkit/components/intl/moz.build | 1 + toolkit/components/jsdownloads/src/moz.build | 2 + toolkit/components/mediasniffer/moz.build | 3 +- toolkit/components/parentalcontrols/moz.build | 1 + toolkit/components/perf/moz.build | 3 +- toolkit/components/places/moz.build | 4 +- toolkit/components/protobuf/moz.build | 2 + toolkit/components/reflect/moz.build | 3 +- toolkit/components/remote/moz.build | 3 +- toolkit/components/satchel/moz.build | 3 +- toolkit/components/startup/moz.build | 1 + toolkit/components/statusfilter/moz.build | 1 + toolkit/components/telemetry/moz.build | 3 +- toolkit/components/typeaheadfind/moz.build | 1 + toolkit/components/url-classifier/moz.build | 2 + .../breakpad-windows-libxul/moz.build | 2 + .../breakpad-windows-standalone/moz.build | 2 + .../client/linux/crash_generation/moz.build | 2 + .../src/client/linux/handler/moz.build | 2 + .../client/linux/minidump_writer/moz.build | 2 + .../src/client/mac/crash_generation/moz.build | 2 + .../src/client/mac/handler/moz.build | 2 + .../google-breakpad/src/client/moz.build | 2 + .../src/client/solaris/handler/moz.build | 2 + .../src/common/linux/moz.build | 2 + .../google-breakpad/src/common/mac/moz.build | 2 + .../google-breakpad/src/common/moz.build | 2 + .../src/common/solaris/moz.build | 2 + .../google-breakpad/src/processor/moz.build | 2 + toolkit/crashreporter/injector/Makefile.in | 2 - toolkit/crashreporter/moz.build | 1 + toolkit/devtools/server/moz.build | 3 +- toolkit/identity/moz.build | 3 +- toolkit/library/Makefile.in | 273 +----------------- toolkit/mozapps/update/common/moz.build | 2 + toolkit/profile/moz.build | 2 + toolkit/system/androidproxy/moz.build | 3 +- toolkit/system/osxproxy/moz.build | 3 +- toolkit/system/unixproxy/moz.build | 3 +- toolkit/system/windowsproxy/moz.build | 3 +- toolkit/xre/Makefile.in | 70 ----- toolkit/xre/moz.build | 1 + tools/profiler/moz.build | 3 +- tools/trace-malloc/lib/moz.build | 3 +- uriloader/base/moz.build | 1 + uriloader/exthandler/moz.build | 1 + uriloader/prefetch/moz.build | 1 + view/src/moz.build | 1 + widget/android/Makefile.in | 2 - widget/android/moz.build | 3 +- widget/cocoa/Makefile.in | 2 - widget/cocoa/moz.build | 3 +- widget/gonk/Makefile.in | 2 - widget/gonk/moz.build | 3 +- widget/gonk/nativewindow/moz.build | 1 + widget/gtk/Makefile.in | 2 - widget/gtk/moz.build | 3 +- widget/gtkxtbin/moz.build | 3 +- widget/os2/Makefile.in | 3 - widget/os2/moz.build | 3 +- widget/qt/Makefile.in | 2 - widget/qt/faststartupqt/moz.build | 2 + widget/qt/moz.build | 3 +- widget/shared/moz.build | 1 + widget/shared/x11/moz.build | 1 + widget/windows/Makefile.in | 4 - widget/windows/moz.build | 3 +- widget/windows/winrt/moz.build | 3 +- widget/xpwidgets/Makefile.in | 5 - widget/xpwidgets/moz.build | 6 + widget/xremoteclient/moz.build | 2 + xpcom/base/moz.build | 1 + xpcom/build/Makefile.in | 20 -- xpcom/build/moz.build | 3 +- xpcom/components/moz.build | 1 + xpcom/ds/moz.build | 2 + xpcom/io/moz.build | 1 + xpcom/reflect/xptcall/src/md/os2/Makefile.in | 1 - xpcom/reflect/xptcall/src/md/os2/moz.build | 2 + xpcom/reflect/xptcall/src/md/unix/Makefile.in | 1 - xpcom/reflect/xptcall/src/md/unix/moz.build | 2 + .../reflect/xptcall/src/md/win32/Makefile.in | 1 - xpcom/reflect/xptcall/src/md/win32/moz.build | 2 + xpcom/reflect/xptcall/src/moz.build | 2 + xpcom/reflect/xptinfo/src/moz.build | 2 + xpcom/string/src/moz.build | 2 + xpcom/threads/moz.build | 2 + xpcom/typelib/xpt/src/moz.build | 1 + xpfe/appshell/src/moz.build | 3 +- xpfe/components/build/Makefile.in | 1 - xpfe/components/build/moz.build | 3 +- xpfe/components/directory/moz.build | 1 + xpfe/components/windowds/moz.build | 3 +- 421 files changed, 509 insertions(+), 1193 deletions(-) delete mode 100644 embedding/browser/build/Makefile.in delete mode 100644 embedding/components/build/Makefile.in delete mode 100644 embedding/components/printingui/src/mac/Makefile.in delete mode 100644 embedding/components/printingui/src/os2/Makefile.in delete mode 100644 embedding/components/printingui/src/unixshared/Makefile.in delete mode 100644 embedding/components/printingui/src/win/Makefile.in delete mode 100644 ipc/keystore/Makefile.in delete mode 100644 parser/htmlparser/src/Makefile.in diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in index 044404dfe0ffb..6f52656bfa01b 100644 --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -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/. -EXPORT_LIBRARY = .. include $(topsrcdir)/config/rules.mk ifdef MOZ_ENABLE_GTK diff --git a/accessible/src/atk/moz.build b/accessible/src/atk/moz.build index 9d0cf96e7ba1b..de850523ce465 100644 --- a/accessible/src/atk/moz.build +++ b/accessible/src/atk/moz.build @@ -46,3 +46,4 @@ LOCAL_INCLUDES += [ '/other-licenses/atk-1.0', ] +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build index 96a0e826c8856..8a4057becfb23 100644 --- a/accessible/src/base/moz.build +++ b/accessible/src/base/moz.build @@ -95,3 +95,5 @@ else: LOCAL_INCLUDES += [ '../other', ] + +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build index ad0233042d1da..60cacf8432db7 100644 --- a/accessible/src/generic/moz.build +++ b/accessible/src/generic/moz.build @@ -56,3 +56,5 @@ else: LOCAL_INCLUDES += [ '../other', ] + +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build index 22e296096e725..74f9d73e52396 100644 --- a/accessible/src/html/moz.build +++ b/accessible/src/html/moz.build @@ -47,3 +47,5 @@ else: LOCAL_INCLUDES += [ '../other', ] + +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in index f90485468414a..1f01ece1d8f81 100644 --- a/accessible/src/mac/Makefile.in +++ b/accessible/src/mac/Makefile.in @@ -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/. -EXPORT_LIBRARY = .. include $(topsrcdir)/config/rules.mk ifneq ($(A11Y_LOG),0) diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build index ac8ac82358d4a..214179b45dab6 100644 --- a/accessible/src/mac/moz.build +++ b/accessible/src/mac/moz.build @@ -43,3 +43,4 @@ LOCAL_INCLUDES += [ '/widget/xpwidgets', ] +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in index f90485468414a..1f01ece1d8f81 100644 --- a/accessible/src/other/Makefile.in +++ b/accessible/src/other/Makefile.in @@ -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/. -EXPORT_LIBRARY = .. include $(topsrcdir)/config/rules.mk ifneq ($(A11Y_LOG),0) diff --git a/accessible/src/other/moz.build b/accessible/src/other/moz.build index f8b6e15b260d8..b1fc971ee094f 100644 --- a/accessible/src/other/moz.build +++ b/accessible/src/other/moz.build @@ -27,3 +27,4 @@ LOCAL_INCLUDES += [ '../xul', ] +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build index 66fe701538500..15c64b9fb9eab 100644 --- a/accessible/src/windows/ia2/moz.build +++ b/accessible/src/windows/ia2/moz.build @@ -45,5 +45,4 @@ LOCAL_INCLUDES += [ LIBRARY_NAME = 'accessibility_toolkit_ia2_s' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build index 2d5365df53218..b01389f38ebd9 100644 --- a/accessible/src/windows/msaa/moz.build +++ b/accessible/src/windows/msaa/moz.build @@ -59,7 +59,6 @@ LOCAL_INCLUDES += [ LIBRARY_NAME = 'accessibility_toolkit_msaa_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build index 4d65d287dffd4..196f9b1129125 100644 --- a/accessible/src/windows/sdn/moz.build +++ b/accessible/src/windows/sdn/moz.build @@ -29,5 +29,4 @@ DEFINES['NOMINMAX'] = True LIBRARY_NAME = 'accessibility_toolkit_sdn_s' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index 393f68a9a0452..f45459f78b37f 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -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/. -EXPORT_LIBRARY = .. - # The midl generated code include Windows headers which defines min and max # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build index 5d15fb5614266..d2ae55431fd04 100644 --- a/accessible/src/windows/uia/moz.build +++ b/accessible/src/windows/uia/moz.build @@ -23,3 +23,4 @@ LOCAL_INCLUDES += [ LIBRARY_NAME = 'accessibility_toolkit_uia_s' +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build index b971ee74ded0d..75e2d600e973a 100644 --- a/accessible/src/xpcom/moz.build +++ b/accessible/src/xpcom/moz.build @@ -48,3 +48,5 @@ else: LOCAL_INCLUDES += [ '../other', ] + +FINAL_LIBRARY = 'xul' diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build index 90cfa22d9e82c..34d734aa364b7 100644 --- a/accessible/src/xul/moz.build +++ b/accessible/src/xul/moz.build @@ -52,3 +52,5 @@ else: LOCAL_INCLUDES += [ '../other', ] + +FINAL_LIBRARY = 'xul' diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build index 30a425a22e657..e1b4c3e6767ed 100644 --- a/browser/components/about/moz.build +++ b/browser/components/about/moz.build @@ -17,3 +17,5 @@ SOURCES += [ LIBRARY_NAME = 'browserabout_s' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index 4282704b36f18..e5aee12c1924f 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -21,16 +21,6 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,version) endif -SHARED_LIBRARY_LIBS = \ - ../feeds/src/$(LIB_PREFIX)browser_feeds_s.$(LIB_SUFFIX) \ - ../about/$(LIB_PREFIX)browserabout_s.$(LIB_SUFFIX) \ - ../dirprovider/$(LIB_PREFIX)browserdir_s.$(LIB_SUFFIX) \ - $(NULL) - -ifneq (,$(filter windows cocoa gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT))) -SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) -endif - EXTRA_DSO_LDOPTS += \ $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ $(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \ @@ -42,7 +32,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_JS_LIBS) endif LOCAL_INCLUDES += -I$(srcdir)/../migration/src -SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) # GTK2: Need to link with glib for GNOME shell service diff --git a/browser/components/dirprovider/moz.build b/browser/components/dirprovider/moz.build index c78e77689b17f..6675d632df5f3 100644 --- a/browser/components/dirprovider/moz.build +++ b/browser/components/dirprovider/moz.build @@ -21,3 +21,5 @@ XPCSHELL_TESTS_MANIFESTS += [ ] FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build index bdcea5af9c396..11636afdf3d3f 100644 --- a/browser/components/feeds/src/moz.build +++ b/browser/components/feeds/src/moz.build @@ -23,3 +23,5 @@ EXTRA_PP_COMPONENTS += [ LIBRARY_NAME = 'browser_feeds_s' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build index e8ecd4f5bbdbb..3705e268b7ee6 100644 --- a/browser/components/migration/src/moz.build +++ b/browser/components/migration/src/moz.build @@ -43,3 +43,5 @@ EXTRA_PP_JS_MODULES += [ ] FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'browsercomps' diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build index 46d508daf81cf..3b5e1b5a5832c 100644 --- a/browser/components/shell/src/moz.build +++ b/browser/components/shell/src/moz.build @@ -28,3 +28,5 @@ EXTRA_COMPONENTS += [ ] FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'browsercomps' diff --git a/caps/src/moz.build b/caps/src/moz.build index 24d22f73f477b..7824bd6d606c1 100644 --- a/caps/src/moz.build +++ b/caps/src/moz.build @@ -28,3 +28,5 @@ LOCAL_INCLUDES += [ '/dom/base', '/js/xpconnect/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/chrome/src/moz.build b/chrome/src/moz.build index e3336bbccdce7..94d9e0373ef9d 100644 --- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -25,3 +25,4 @@ LIBRARY_NAME = 'chrome_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xpcom_core' diff --git a/configure.in b/configure.in index 35dd35be2c9b3..fbf2b5e3f0f8e 100644 --- a/configure.in +++ b/configure.in @@ -6129,7 +6129,6 @@ if test -n "$MOZ_TREE_FREETYPE"; then CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include' FT2_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)' CAIRO_FT_OSLIBS='' - CAIRO_FT_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)' AC_DEFINE(HAVE_FT_BITMAP_SIZE_Y_PPEM) AC_DEFINE(HAVE_FT_GLYPHSLOT_EMBOLDEN) AC_DEFINE(HAVE_FT_LOAD_SFNT_TABLE) @@ -7954,7 +7953,6 @@ if test "$MOZ_TREE_CAIRO"; then MOZ_ENABLE_CAIRO_FT=1 CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include" CAIRO_FT_OSLIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg" - CAIRO_FT_LIBS="" ;; esac if test "$USE_FC_FREETYPE"; then @@ -7987,7 +7985,6 @@ if test "$MOZ_TREE_CAIRO"; then AC_SUBST(QT_SURFACE_FEATURE) AC_SUBST(TEE_SURFACE_FEATURE) - MOZ_CAIRO_LIBS='$(call EXPAND_LIBNAME_PATH,mozcairo,$(DEPTH)/gfx/cairo/cairo/src)'" $CAIRO_FT_LIBS" MOZ_CAIRO_OSLIBS='${CAIRO_FT_OSLIBS}' if test "$MOZ_X11"; then @@ -8014,36 +8011,10 @@ AC_SUBST(MOZ_CAIRO_LIBS) AC_SUBST(MOZ_CAIRO_OSLIBS) AC_SUBST(MOZ_TREE_PIXMAN) -dnl ======================================================== -dnl qcms -dnl ======================================================== - -QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' -AC_SUBST(QCMS_LIBS) - -dnl ======================================================== -dnl HarfBuzz -dnl ======================================================== -MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' -AC_SUBST(MOZ_HARFBUZZ_LIBS) - -dnl ======================================================== -dnl SIL Graphite -dnl ======================================================== -MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' -AC_SUBST(MOZ_GRAPHITE_LIBS) - -dnl ======================================================== -dnl OTS -dnl ======================================================== -MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)' -AC_SUBST(MOZ_OTS_LIBS) - dnl ======================================================== dnl Skia dnl ======================================================== if test "$MOZ_ENABLE_SKIA"; then - MOZ_SKIA_LIBS='$(DEPTH)/gfx/skia/$(LIB_PREFIX)skia.$(LIB_SUFFIX)' AC_DEFINE(MOZ_ENABLE_SKIA) AC_DEFINE(USE_SKIA) if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then @@ -8058,11 +8029,8 @@ if test "$MOZ_ENABLE_SKIA"; then AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) fi -else - MOZ_SKIA_LIBS= fi AC_SUBST(MOZ_ENABLE_SKIA) -AC_SUBST(MOZ_SKIA_LIBS) dnl ======================================================== dnl disable xul diff --git a/content/base/src/moz.build b/content/base/src/moz.build index 6d268b39c1835..140c9ca5f04b1 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -187,6 +187,7 @@ LIBRARY_NAME = 'gkconbase_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/caps/include', '/content/events/src', diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index f8f319393bcd3..fde665d7f43bd 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -91,6 +91,7 @@ LIBRARY_NAME = 'gkconcvs_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', diff --git a/content/events/src/moz.build b/content/events/src/moz.build index 88b1f75ce9187..08576ee5c57d0 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -77,6 +77,7 @@ LIBRARY_NAME = 'gkconevents_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index 4051f2f376089..5721cfd168d38 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -166,6 +166,7 @@ LIBRARY_NAME = 'gkconhtmlcon_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/canvas/src', diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build index 2e494a631d1e2..fd70c53f74e2b 100644 --- a/content/html/document/src/moz.build +++ b/content/html/document/src/moz.build @@ -42,3 +42,5 @@ LOCAL_INCLUDES += [ '/layout/style', '/xpcom/ds', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build index 1a67412c81d59..f17213a5e8147 100644 --- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -19,6 +19,7 @@ LIBRARY_NAME = 'gkcontentmathml_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', ] diff --git a/content/media/apple/moz.build b/content/media/apple/moz.build index eb376b1192c40..cdd85d5fc42d0 100644 --- a/content/media/apple/moz.build +++ b/content/media/apple/moz.build @@ -22,3 +22,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build index 9f89f01c5d037..b2b1aa15e817f 100644 --- a/content/media/directshow/moz.build +++ b/content/media/directshow/moz.build @@ -40,6 +40,7 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkcondirectshow_s' +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/media/webrtc/trunk/webrtc/modules/video_capture/windows', ] diff --git a/content/media/encoder/moz.build b/content/media/encoder/moz.build index fcd84cc8f4687..1167001acb7e9 100644 --- a/content/media/encoder/moz.build +++ b/content/media/encoder/moz.build @@ -29,3 +29,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build index 89f4ada0bde19..91382f6934e63 100644 --- a/content/media/gstreamer/moz.build +++ b/content/media/gstreamer/moz.build @@ -27,6 +27,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build index 064062f0cd647..87d50dc3eebf8 100644 --- a/content/media/mediasource/moz.build +++ b/content/media/mediasource/moz.build @@ -34,3 +34,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconmediasource_s' +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/moz.build b/content/media/moz.build index 72260c05bbf3f..dbd1c4a9ed96d 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -158,6 +158,7 @@ LIBRARY_NAME = 'gkconmedia_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/layout/generic', diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build index 89b8eba163865..14a5968974ab6 100644 --- a/content/media/ogg/moz.build +++ b/content/media/ogg/moz.build @@ -26,3 +26,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/omx/mediaresourcemanager/moz.build b/content/media/omx/mediaresourcemanager/moz.build index 492bf183996aa..b124d40607018 100644 --- a/content/media/omx/mediaresourcemanager/moz.build +++ b/content/media/omx/mediaresourcemanager/moz.build @@ -19,3 +19,5 @@ LIBRARY_NAME = 'mediaresourcemanager' include('/ipc/chromium/chromium-config.mozbuild') FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build index 906d517b6edf3..7f4d5a3fee6bd 100644 --- a/content/media/omx/moz.build +++ b/content/media/omx/moz.build @@ -34,6 +34,7 @@ LIBRARY_NAME = 'gkconomx_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', diff --git a/content/media/plugins/moz.build b/content/media/plugins/moz.build index 0d011442c2db1..68e8909f7a2c7 100644 --- a/content/media/plugins/moz.build +++ b/content/media/plugins/moz.build @@ -29,3 +29,5 @@ LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build index 042eb001c9afa..dce5480249602 100644 --- a/content/media/raw/moz.build +++ b/content/media/raw/moz.build @@ -27,3 +27,5 @@ LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build index 08bd443ffd1dd..0a9e0d57cf0e0 100644 --- a/content/media/wave/moz.build +++ b/content/media/wave/moz.build @@ -22,3 +22,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build index 5643e0a53c500..c556c5c317954 100644 --- a/content/media/webaudio/blink/moz.build +++ b/content/media/webaudio/blink/moz.build @@ -32,6 +32,7 @@ LIBRARY_NAME = 'gkconwebaudio_blink_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/media/webaudio', ] diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build index 7759c7cbcaeb8..a41c49bd90fa0 100644 --- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -92,3 +92,4 @@ LIBRARY_NAME = 'gkconwebaudio_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build index 2d3ae26c82b7c..f0ac8b2c04d24 100644 --- a/content/media/webm/moz.build +++ b/content/media/webm/moz.build @@ -23,3 +23,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build index 3ed05699627d1..82ac370c340ee 100644 --- a/content/media/webrtc/moz.build +++ b/content/media/webrtc/moz.build @@ -47,5 +47,6 @@ LIBRARY_NAME = 'gkconwebrtc_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' if CONFIG['OS_ARCH'] == 'WINNT': DEFINES['NOMINMAX'] = True diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build index 300d19396926c..3578aad7c895c 100644 --- a/content/media/webspeech/recognition/moz.build +++ b/content/media/webspeech/recognition/moz.build @@ -49,3 +49,5 @@ LOCAL_INCLUDES += [ ] include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build index 95cc7027a555d..602bab65ffa2f 100644 --- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -52,10 +52,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkconwebspeechsynth_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ 'ipc', ] diff --git a/content/media/webspeech/synth/pico/moz.build b/content/media/webspeech/synth/pico/moz.build index cda8faf7a9ae4..865af3c717d70 100644 --- a/content/media/webspeech/synth/pico/moz.build +++ b/content/media/webspeech/synth/pico/moz.build @@ -13,7 +13,7 @@ SOURCES += [ LIBRARY_NAME = 'synthpico' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build index 6ebada77b03dd..d48cf156a96db 100644 --- a/content/media/wmf/moz.build +++ b/content/media/wmf/moz.build @@ -28,3 +28,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/content/smil/moz.build b/content/smil/moz.build index fdc5b4360deab..3240e23c86637 100644 --- a/content/smil/moz.build +++ b/content/smil/moz.build @@ -72,3 +72,5 @@ LOCAL_INCLUDES += [ '../events/src', '/layout/style', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build index 88761a00a7b66..afc6ea7c288b1 100644 --- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -253,6 +253,7 @@ LIBRARY_NAME = 'gkcontentsvg_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/events/src', diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build index d56060feea812..08af7baa3d4ef 100644 --- a/content/svg/document/src/moz.build +++ b/content/svg/document/src/moz.build @@ -29,3 +29,5 @@ LOCAL_INCLUDES += [ '/layout/style', '/xpcom/ds', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build index 6a668899dc49e..891a772d027ae 100644 --- a/content/xbl/src/moz.build +++ b/content/xbl/src/moz.build @@ -55,3 +55,5 @@ LOCAL_INCLUDES += [ '/layout/style', '/xpcom/ds', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build index 3c6ec66b88762..adf5fb09226ef 100644 --- a/content/xml/content/src/moz.build +++ b/content/xml/content/src/moz.build @@ -28,6 +28,7 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', ] diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build index ffed89ac79010..81e864ab69bf4 100644 --- a/content/xml/document/src/moz.build +++ b/content/xml/document/src/moz.build @@ -35,3 +35,5 @@ LOCAL_INCLUDES += [ '/layout/style', '/xpcom/ds', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build index 82852a04d9e1c..33885c9496670 100644 --- a/content/xslt/src/base/moz.build +++ b/content/xslt/src/base/moz.build @@ -26,3 +26,5 @@ LOCAL_INCLUDES += [ '../xpath', '../xslt', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build index 7590dcd55f9a7..26a33b36bda73 100644 --- a/content/xslt/src/xml/moz.build +++ b/content/xslt/src/xml/moz.build @@ -23,3 +23,5 @@ LOCAL_INCLUDES += [ '../xslt', '/content/base/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build index 506c451a3b1b1..391fe788e6994 100644 --- a/content/xslt/src/xpath/moz.build +++ b/content/xslt/src/xpath/moz.build @@ -62,3 +62,5 @@ LOCAL_INCLUDES += [ '../xml', '../xslt', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build index 4c68e62c00483..fb7280ad1b6c6 100644 --- a/content/xslt/src/xslt/moz.build +++ b/content/xslt/src/xslt/moz.build @@ -59,3 +59,5 @@ LOCAL_INCLUDES += [ '../xpath', '/content/base/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build index 7453ae7971370..a4753051a8940 100644 --- a/content/xul/content/src/moz.build +++ b/content/xul/content/src/moz.build @@ -33,3 +33,5 @@ LOCAL_INCLUDES += [ '/layout/xul/base/src', '/xpcom/ds', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build index c6c6da59c803e..ca1765db892a4 100644 --- a/content/xul/document/src/moz.build +++ b/content/xul/document/src/moz.build @@ -41,3 +41,5 @@ LOCAL_INCLUDES += [ '/layout/xul/base/src', '/xpcom/ds', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/content/xul/templates/src/moz.build b/content/xul/templates/src/moz.build index 3871aa10afab5..315bdc5f3776f 100644 --- a/content/xul/templates/src/moz.build +++ b/content/xul/templates/src/moz.build @@ -47,3 +47,5 @@ LOCAL_INCLUDES += [ '/dom/base', '/layout/xul/tree/', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/docshell/base/moz.build b/docshell/base/moz.build index b5eaf8cf2ecbc..ab028cae79978 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -72,6 +72,7 @@ LIBRARY_NAME = 'basedocshell_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../shistory/src', '/content/base/src', diff --git a/docshell/build/moz.build b/docshell/build/moz.build index 25df965e68be8..bd8b89cf67816 100644 --- a/docshell/build/moz.build +++ b/docshell/build/moz.build @@ -28,3 +28,5 @@ LOCAL_INCLUDES += [ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": LOCAL_INCLUDES += ['/uriloader/exthandler/mac'] + +FINAL_LIBRARY = 'xul' diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build index 3078ce69a1e4a..34a3c6bea927e 100644 --- a/docshell/shistory/src/moz.build +++ b/docshell/shistory/src/moz.build @@ -28,3 +28,5 @@ MSVC_ENABLE_PGO = True LOCAL_INCLUDES += [ '/docshell/base', ] + +FINAL_LIBRARY = 'xul' diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build index 8f187f862521e..7e4b18b2e82be 100644 --- a/dom/activities/src/moz.build +++ b/dom/activities/src/moz.build @@ -37,3 +37,5 @@ LIBRARY_NAME = 'dom_activities_s' LOCAL_INCLUDES += [ '/dom/base', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build index d2689c93cba54..64b4625b31e4e 100644 --- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -41,3 +41,4 @@ LIBRARY_NAME = 'domalarm_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/dom/apps/src/moz.build b/dom/apps/src/moz.build index 10a57e4f1bd02..053d9200c91a2 100644 --- a/dom/apps/src/moz.build +++ b/dom/apps/src/moz.build @@ -44,6 +44,8 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_apps_s' +FINAL_LIBRARY = 'gklayout' + LOCAL_INCLUDES += [ '/js/xpconnect/wrappers', ] diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index fd5436766790b..b384e0ca111ef 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -33,7 +33,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domaudiochannel_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/dom/base/moz.build b/dom/base/moz.build index a15aed393db5d..adcbede953062 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -150,6 +150,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' + LOCAL_INCLUDES += [ '/js/xpconnect/src', '/js/xpconnect/wrappers', diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 4f753e72cb5c3..7ff83ceb255f5 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -23,6 +23,7 @@ LIBRARY_NAME = 'dom_battery_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/events/src', ] diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index f2058aa1f2b54..0c4ca56df0595 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -41,8 +41,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'dombindings_s' -EXPORT_LIBRARY = True - LOCAL_INCLUDES += [ '/content/base/src', '/content/canvas/src', @@ -82,3 +80,5 @@ if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']: LOCAL_INCLUDES += [ '/dom/system/gonk', ] + +FINAL_LIBRARY = 'xul' diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index b12ea8b30dd5c..df5300b4d8263 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -68,6 +68,8 @@ if CONFIG['MOZ_B2G_BT']: 'bluez/linux', ] + FINAL_LIBRARY = 'gklayout' + EXPORTS.mozilla.dom.bluetooth.ipc += [ 'ipc/BluetoothMessageUtils.h', ] diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build index 2a505d6d9a34b..5bed95a88dd1c 100644 --- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -41,6 +41,8 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' + LOCAL_INCLUDES += [ '/content/base/src', '/dom/', diff --git a/dom/camera/moz.build b/dom/camera/moz.build index 92e9383e8ed56..88b5a25bacf7a 100644 --- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -58,3 +58,5 @@ LOCAL_INCLUDES += [ ] include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/cellbroadcast/src/moz.build b/dom/cellbroadcast/src/moz.build index 6094911cc8475..2d486ec946f5e 100644 --- a/dom/cellbroadcast/src/moz.build +++ b/dom/cellbroadcast/src/moz.build @@ -20,3 +20,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'dom_cellbroadcast_s' +FINAL_LIBRARY = 'gklayout' diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build index 469ce86b81fdf..08809a3807e77 100644 --- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -38,6 +38,7 @@ LIBRARY_NAME = 'domdevicestorage_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/events/src', diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 5ef1a39ec2c3f..7e71db2e5d83a 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -28,6 +28,7 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domencoding_s' +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/intl/locale/src', ] diff --git a/dom/file/moz.build b/dom/file/moz.build index 286b2227e3080..ce58c23cba7cb 100644 --- a/dom/file/moz.build +++ b/dom/file/moz.build @@ -64,3 +64,5 @@ LIBRARY_NAME = 'domfile_s' LOCAL_INCLUDES += [ '../base', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/fmradio/ipc/moz.build b/dom/fmradio/ipc/moz.build index 4e65f73dfc745..b496ca537193c 100644 --- a/dom/fmradio/ipc/moz.build +++ b/dom/fmradio/ipc/moz.build @@ -29,6 +29,8 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' + LOCAL_INCLUDES += [ '/dom/fmradio', ] diff --git a/dom/fmradio/moz.build b/dom/fmradio/moz.build index 30d775feba057..3806d5414468a 100644 --- a/dom/fmradio/moz.build +++ b/dom/fmradio/moz.build @@ -26,6 +26,8 @@ if CONFIG['MOZ_B2G_FM']: LIBRARY_NAME = 'domfmradio_s' + FINAL_LIBRARY = 'gklayout' + IPDL_SOURCES += [ 'ipc/PFMRadio.ipdl', 'ipc/PFMRadioRequest.ipdl', diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index b29debcdde62b..3833025e13508 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -24,6 +24,7 @@ LIBRARY_NAME = 'domgamepad_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/dom/base', ] diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build index e25561516c15f..4bba88c062baa 100644 --- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -20,6 +20,7 @@ LIBRARY_NAME = 'dom_icc_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/events/src', ] diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build index 7c9c7f5370f02..7e413ff0230f0 100644 --- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -40,6 +40,7 @@ MOCHITEST_MANIFESTS += ['mochitest.ini'] include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/events/src', '/dom/indexedDB', diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index c049231b4a5ef..bbaf3f33b135d 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -70,6 +70,7 @@ LIBRARY_NAME = 'dom_indexeddb_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/caps/include', '/content/base/src', diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build index c7a4beb6319d8..ee23ee41d1659 100644 --- a/dom/interfaces/devicestorage/moz.build +++ b/dom/interfaces/devicestorage/moz.build @@ -16,4 +16,3 @@ MODULE = 'dom' LIBXUL_LIBRARY = True LIBRARY_NAME = 'domdevicestorage_s' - diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index 02a3b0db7538b..2c592b1b1e760 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -77,10 +77,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domipc_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../src/base', '../src/geolocation', diff --git a/dom/media/bridge/moz.build b/dom/media/bridge/moz.build index 4d20f69a82764..91dc07b22f1d6 100644 --- a/dom/media/bridge/moz.build +++ b/dom/media/bridge/moz.build @@ -29,5 +29,4 @@ LIBRARY_NAME = 'peerconnection' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/dom/media/moz.build b/dom/media/moz.build index 1d0b729c757bc..15f30a920a710 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -62,3 +62,5 @@ LOCAL_INCLUDES += [ ] include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index 4ed3448fb80ae..f08f32ff2e5ce 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -80,3 +80,5 @@ LOCAL_INCLUDES += [ ] include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build index 05124921eca57..ff5d3eed90813 100644 --- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -73,6 +73,7 @@ LIBRARY_NAME = 'dom_network_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/events/src', ] diff --git a/dom/nfc/moz.build b/dom/nfc/moz.build index 5bcf62fc28cdc..cc3625398abf0 100644 --- a/dom/nfc/moz.build +++ b/dom/nfc/moz.build @@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True LIBRARY_NAME = 'dom_nfc_s' LIBXUL_LIBRARY = True + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build index 02da8931a3e02..4cf484fc1e21d 100644 --- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -31,10 +31,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkpluginandroid_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/dom/plugins/base', '/dom/plugins/base/android/include', diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index af9c8d98ee8c6..4cce64cb5e2ce 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -101,8 +101,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkplugin' -EXPORT_LIBRARY = True - LOCAL_INCLUDES += [ '/content/base/src', '/dom/base', @@ -129,3 +127,4 @@ include('/ipc/chromium/chromium-config.mozbuild') DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True +FINAL_LIBRARY = 'xul' diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index cf34723b74ad6..8963e4334994a 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -118,10 +118,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domplugins_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../base', '/xpcom/base/', diff --git a/dom/power/moz.build b/dom/power/moz.build index aa670ba22415c..11cc0ea45a451 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -38,3 +38,4 @@ LIBRARY_NAME = 'dom_power_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/dom/promise/moz.build b/dom/promise/moz.build index 17b02e9a067ee..366a3e394df25 100644 --- a/dom/promise/moz.build +++ b/dom/promise/moz.build @@ -29,3 +29,5 @@ LOCAL_INCLUDES += [ '../base', '../workers', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/quota/moz.build b/dom/quota/moz.build index 4c26591c5716f..60e883ca1e703 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -50,6 +50,7 @@ LIBRARY_NAME = 'domquota_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/caps/include', ] diff --git a/dom/src/events/moz.build b/dom/src/events/moz.build index 7b336fd58c672..559c2073ed0c1 100644 --- a/dom/src/events/moz.build +++ b/dom/src/events/moz.build @@ -22,3 +22,5 @@ LOCAL_INCLUDES += [ "/content/base/src", "/dom/base", ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build index 6cd81071b9e02..8c9b7e44b9019 100644 --- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -24,6 +24,7 @@ LIBRARY_NAME = 'jsdomgeolocation_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/events/src', diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build index 5d25953346e21..86e32f8848682 100644 --- a/dom/src/json/moz.build +++ b/dom/src/json/moz.build @@ -25,3 +25,5 @@ LIBXUL_LIBRARY = True LOCAL_INCLUDES += [ '/content/base/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build index 233cdf08d452f..0bb44c6da2594 100644 --- a/dom/src/jsurl/moz.build +++ b/dom/src/jsurl/moz.build @@ -26,3 +26,5 @@ LOCAL_INCLUDES += [ "/dom/base", "/netwerk/base/src", ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build index 9d317c424a9e4..0dd7cf37c61f1 100644 --- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -33,6 +33,7 @@ LIBRARY_NAME = 'jsdomnotification_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/base/src', '/content/events/src', diff --git a/dom/src/offline/moz.build b/dom/src/offline/moz.build index dbceb382e0c02..fb0e91a77e522 100644 --- a/dom/src/offline/moz.build +++ b/dom/src/offline/moz.build @@ -24,3 +24,5 @@ LOCAL_INCLUDES += [ "/content/events/src", "/dom/base", ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index 8defeaa4fa152..e29212ea1699a 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -33,6 +33,7 @@ LIBRARY_NAME = 'jsdomstorage_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/events/src', '/dom/base', diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build index d41cc563e9fc2..95c9e071bb96b 100644 --- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -17,10 +17,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemandroid_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/content/events/src', '/dom/src/geolocation', diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index ee85f39047548..d4fc9d8d93417 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -129,3 +129,4 @@ LOCAL_INCLUDES += [ '/dom/wifi', ] +FINAL_LIBRARY = 'gklayout' diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build index d8b9b1e2cb9dd..45992bfe1128f 100644 --- a/dom/system/mac/moz.build +++ b/dom/system/mac/moz.build @@ -14,10 +14,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemmac_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' LOCAL_INCLUDES += [ '/dom/src/geolocation', ] diff --git a/dom/system/moz.build b/dom/system/moz.build index f992dda052255..67f0ea36ba02e 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -54,10 +54,9 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystem_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' # We fire the nsDOMDeviceAcceleration LOCAL_INCLUDES += [ '/content/events/src', diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build index 7f8e534a03920..f4d7752c4515a 100644 --- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -24,7 +24,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemunix_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/dom/system/windows/moz.build b/dom/system/windows/moz.build index 0636968763892..aa720c197fd70 100644 --- a/dom/system/windows/moz.build +++ b/dom/system/windows/moz.build @@ -21,5 +21,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domsystemwindows_s' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'gklayout' diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build index 8501230bfae12..7a3a7ccc033b2 100644 --- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -61,3 +61,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domtelephony_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/dom/time/moz.build b/dom/time/moz.build index 3e0a8af5b7733..6fd7e1b2f9360 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -34,3 +34,4 @@ LIBRARY_NAME = 'dom_time_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build index e7a0dfee1955f..bb304241d1c4c 100644 --- a/dom/voicemail/moz.build +++ b/dom/voicemail/moz.build @@ -31,3 +31,5 @@ LIBRARY_NAME = 'domvoicemail_s' LOCAL_INCLUDES += [ '../base', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build index d3e0dd3e6ec10..a2a7013209531 100644 --- a/dom/wifi/moz.build +++ b/dom/wifi/moz.build @@ -38,5 +38,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'domwifi_s' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/dom/workers/moz.build b/dom/workers/moz.build index b6dd8a4cd0e48..204e401e92215 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -65,3 +65,5 @@ LOCAL_INCLUDES += [ '/content/events/src', '/xpcom/build', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build index 4dd75d8caf3d6..0af1de6add72c 100644 --- a/editor/composer/src/moz.build +++ b/editor/composer/src/moz.build @@ -23,5 +23,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/editor/libeditor/base/moz.build b/editor/libeditor/base/moz.build index eef991303ea52..b8682e5bca3df 100644 --- a/editor/libeditor/base/moz.build +++ b/editor/libeditor/base/moz.build @@ -47,3 +47,5 @@ LOCAL_INCLUDES += [ '/extensions/spellcheck/src', '/layout/style', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build index 0c38dfd44e380..a494d79ec2040 100644 --- a/editor/libeditor/html/moz.build +++ b/editor/libeditor/html/moz.build @@ -44,3 +44,5 @@ LOCAL_INCLUDES += [ '/layout/tables', '/layout/xul/base/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build index c4431e88a8f8e..b244c51ed4074 100644 --- a/editor/libeditor/text/moz.build +++ b/editor/libeditor/text/moz.build @@ -28,3 +28,5 @@ LOCAL_INCLUDES += [ '/content/base/src', '/editor/txmgr/src', ] + +FINAL_LIBRARY = 'gklayout' diff --git a/editor/txmgr/src/moz.build b/editor/txmgr/src/moz.build index 07ab4bcda5ecc..73743873b08be 100644 --- a/editor/txmgr/src/moz.build +++ b/editor/txmgr/src/moz.build @@ -20,5 +20,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/editor/txtsvc/src/moz.build b/editor/txtsvc/src/moz.build index 2ff7258e951a1..30db33e7fc8ea 100644 --- a/editor/txtsvc/src/moz.build +++ b/editor/txtsvc/src/moz.build @@ -17,3 +17,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in deleted file mode 100644 index 5c78716095a8a..0000000000000 --- a/embedding/browser/build/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -SHARED_LIBRARY_LIBS= \ - ../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \ - $(NULL) diff --git a/embedding/browser/build/moz.build b/embedding/browser/build/moz.build index cb3a7312bae32..44d67d35306ce 100644 --- a/embedding/browser/build/moz.build +++ b/embedding/browser/build/moz.build @@ -16,8 +16,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../setup', '../webBrowser', diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build index eb80e047f2f0d..67a0cbd19ff86 100644 --- a/embedding/browser/webBrowser/moz.build +++ b/embedding/browser/webBrowser/moz.build @@ -52,6 +52,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'webbrwsr' LOCAL_INCLUDES += [ '../../../content/base/src', '../../../content/svg/content/src', diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build index 6d2de322e970e..74d1dcac6bdab 100644 --- a/embedding/components/appstartup/src/moz.build +++ b/embedding/components/appstartup/src/moz.build @@ -20,3 +20,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in deleted file mode 100644 index 51d9f3fb99553..0000000000000 --- a/embedding/components/build/Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -SHARED_LIBRARY_LIBS = \ - ../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \ - ../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \ - ../find/src/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \ - ../webbrowserpersist/src/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \ - ../commandhandler/src/$(LIB_PREFIX)commandhandler_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef MOZ_XUL -ifdef NS_PRINTING -SHARED_LIBRARY_LIBS += \ - ../printingui/src/$(LIB_PREFIX)printingui_s.$(LIB_SUFFIX) \ - $(NULL) -endif -endif - diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build index 5216945c3af3d..7a8e1b4be3a43 100644 --- a/embedding/components/build/moz.build +++ b/embedding/components/build/moz.build @@ -16,8 +16,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../appstartup/src', '../commandhandler/src', diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build index 3fa9e155384dd..448157e5ef342 100644 --- a/embedding/components/commandhandler/src/moz.build +++ b/embedding/components/commandhandler/src/moz.build @@ -20,3 +20,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build index 3362fafe4ddff..55b273f124134 100644 --- a/embedding/components/find/src/moz.build +++ b/embedding/components/find/src/moz.build @@ -17,3 +17,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in deleted file mode 100644 index 84be2a747fe51..0000000000000 --- a/embedding/components/printingui/src/mac/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -EXPORT_LIBRARY = .. diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build index fd77f8af13abd..ceb0a53996884 100644 --- a/embedding/components/printingui/src/mac/moz.build +++ b/embedding/components/printingui/src/mac/moz.build @@ -21,3 +21,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in deleted file mode 100644 index 84be2a747fe51..0000000000000 --- a/embedding/components/printingui/src/os2/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -EXPORT_LIBRARY = .. diff --git a/embedding/components/printingui/src/os2/moz.build b/embedding/components/printingui/src/os2/moz.build index 3298e4cc6123e..dd85287806d54 100644 --- a/embedding/components/printingui/src/os2/moz.build +++ b/embedding/components/printingui/src/os2/moz.build @@ -16,3 +16,4 @@ LIBRARY_NAME = 'printingui_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in deleted file mode 100644 index 84be2a747fe51..0000000000000 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -EXPORT_LIBRARY = .. diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build index 401aaa5bef182..f5a20554f4332 100644 --- a/embedding/components/printingui/src/unixshared/moz.build +++ b/embedding/components/printingui/src/unixshared/moz.build @@ -18,3 +18,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in deleted file mode 100644 index 84be2a747fe51..0000000000000 --- a/embedding/components/printingui/src/win/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -EXPORT_LIBRARY = .. diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build index 0c0f31ea18e0d..092e3fe3b277e 100644 --- a/embedding/components/printingui/src/win/moz.build +++ b/embedding/components/printingui/src/win/moz.build @@ -19,3 +19,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' diff --git a/embedding/components/webbrowserpersist/src/moz.build b/embedding/components/webbrowserpersist/src/moz.build index 5733ba157b463..3c346abe0b287 100644 --- a/embedding/components/webbrowserpersist/src/moz.build +++ b/embedding/components/webbrowserpersist/src/moz.build @@ -16,6 +16,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' LOCAL_INCLUDES += [ '/content/base/src', '/content/html/content/src', diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build index fb9a8a25c10d3..f683109c6b113 100644 --- a/embedding/components/windowwatcher/src/moz.build +++ b/embedding/components/windowwatcher/src/moz.build @@ -22,6 +22,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'embedcomponents' # For nsJSUtils LOCAL_INCLUDES += [ '/dom/base', diff --git a/extensions/auth/moz.build b/extensions/auth/moz.build index f8058d102d17f..7a8327a143bdf 100644 --- a/extensions/auth/moz.build +++ b/extensions/auth/moz.build @@ -27,5 +27,4 @@ LIBRARY_NAME = 'auth' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/extensions/cookie/moz.build b/extensions/cookie/moz.build index 45aaf81d442ac..5d5e68e827845 100644 --- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -28,7 +28,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'cookie' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/extensions/gio/moz.build b/extensions/gio/moz.build index 92bdc3c61c4cb..489dac5c0cad9 100644 --- a/extensions/gio/moz.build +++ b/extensions/gio/moz.build @@ -16,5 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/extensions/permissions/moz.build b/extensions/permissions/moz.build index ba658ecf208c8..8889b616a7554 100644 --- a/extensions/permissions/moz.build +++ b/extensions/permissions/moz.build @@ -15,5 +15,4 @@ LIBRARY_NAME = 'permissions' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/extensions/pref/autoconfig/src/moz.build b/extensions/pref/autoconfig/src/moz.build index d7aa6f71d8d19..8f6389247c2a2 100644 --- a/extensions/pref/autoconfig/src/moz.build +++ b/extensions/pref/autoconfig/src/moz.build @@ -17,5 +17,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'autoconfig' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build index db12b627eb54d..3ee85279f3774 100644 --- a/extensions/spellcheck/hunspell/src/moz.build +++ b/extensions/spellcheck/hunspell/src/moz.build @@ -30,3 +30,4 @@ LIBRARY_NAME = 'hunspell_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'spellchecker' diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in index 000a40844e70f..cbefcfba62479 100644 --- a/extensions/spellcheck/src/Makefile.in +++ b/extensions/spellcheck/src/Makefile.in @@ -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/. -SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build index 1482a37ed0e9d..3b0dc38a0beb5 100644 --- a/extensions/spellcheck/src/moz.build +++ b/extensions/spellcheck/src/moz.build @@ -21,5 +21,4 @@ LIBRARY_NAME = 'spellchecker' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/extensions/universalchardet/src/base/moz.build b/extensions/universalchardet/src/base/moz.build index 61fb815897e05..fbbf5df4305d2 100644 --- a/extensions/universalchardet/src/base/moz.build +++ b/extensions/universalchardet/src/base/moz.build @@ -38,3 +38,4 @@ LIBRARY_NAME = 'universalchardet_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'universalchardet' diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in index 6927cee7bc9bb..99c200c230b20 100644 --- a/extensions/universalchardet/src/xpcom/Makefile.in +++ b/extensions/universalchardet/src/xpcom/Makefile.in @@ -4,7 +4,3 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. LOCAL_INCLUDES = -I$(srcdir)/../base - -SHARED_LIBRARY_LIBS = \ - ../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \ - $(NULL) diff --git a/extensions/universalchardet/src/xpcom/moz.build b/extensions/universalchardet/src/xpcom/moz.build index 09f84fa2609af..5f855178bb031 100644 --- a/extensions/universalchardet/src/xpcom/moz.build +++ b/extensions/universalchardet/src/xpcom/moz.build @@ -15,5 +15,4 @@ LIBRARY_NAME = 'universalchardet' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index 48cab7ee4ec97..daa2441d52c0a 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -116,7 +116,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gfx2d' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build index c8e7305129bea..ade1731d8c161 100644 --- a/gfx/angle/moz.build +++ b/gfx/angle/moz.build @@ -126,3 +126,5 @@ MSVC_ENABLE_PGO = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index 6e055155fba15..03c295fdd8a6b 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -193,3 +193,4 @@ SOURCES += [ MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index f93f351f11131..a69836c515297 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -66,3 +66,4 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'mozlibpixman' +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index a1e600595b598..c399cf7301c9d 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -118,7 +118,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gl' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 674840034eaa9..89ef95e48a1aa 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -68,3 +68,5 @@ MSVC_ENABLE_PGO = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build index 2177c215e0b1f..a2cf6c0a3a85e 100644 --- a/gfx/harfbuzz/src/moz.build +++ b/gfx/harfbuzz/src/moz.build @@ -61,3 +61,4 @@ LIBRARY_NAME = 'mozharfbuzz' MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index 8031ba02001b0..16429abd99842 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -32,7 +32,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gfxipc_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 8542633f2542a..c4d6e6ada5157 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -305,3 +305,4 @@ LIBRARY_NAME = 'layers' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'thebes' diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index d155ef701e11d..a92820d410620 100644 --- a/gfx/ots/src/moz.build +++ b/gfx/ots/src/moz.build @@ -56,3 +56,5 @@ MSVC_ENABLE_PGO = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build index ecf0a4be45b4f..254a5254fa47f 100644 --- a/gfx/qcms/moz.build +++ b/gfx/qcms/moz.build @@ -25,3 +25,4 @@ SOURCES += [ MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index fe79e3881d02e..1c55e714050d2 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -591,5 +591,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'gkmedias' diff --git a/gfx/src/moz.build b/gfx/src/moz.build index 81ced0f33136f..5eb56706202f8 100644 --- a/gfx/src/moz.build +++ b/gfx/src/moz.build @@ -67,5 +67,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index c5058be30165f..4b246a7361e03 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -10,11 +10,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 DEFINES += -DMOZ_ENABLE_FREETYPE endif -SHARED_LIBRARY_LIBS += \ - ../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \ - $(NULL) - - ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef MOZ_ENABLE_D3D9_LAYER diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 76748e4f59e6f..9a85c5cad4fed 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -280,7 +280,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'thebes' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build index bf59a40a863bc..51e278a41117d 100644 --- a/gfx/ycbcr/moz.build +++ b/gfx/ycbcr/moz.build @@ -73,5 +73,4 @@ LIBRARY_NAME = 'ycbcr' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/hal/moz.build b/hal/moz.build index f72669012d773..b583d15794961 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -164,7 +164,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'hal_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/image/build/Makefile.in b/image/build/Makefile.in index ee094726b11e7..811cbf6e3d857 100644 --- a/image/build/Makefile.in +++ b/image/build/Makefile.in @@ -11,12 +11,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../encoders/jpeg \ -I$(srcdir)/../encoders/bmp \ $(NULL) - -SHARED_LIBRARY_LIBS = \ - ../src/$(LIB_PREFIX)imglib2_s.$(LIB_SUFFIX) \ - ../decoders/$(LIB_PREFIX)imgdecoders_s.$(LIB_SUFFIX) \ - ../encoders/ico/$(LIB_PREFIX)imgicoe_s.$(LIB_SUFFIX) \ - ../encoders/png/$(LIB_PREFIX)imgpnge_s.$(LIB_SUFFIX) \ - ../encoders/jpeg/$(LIB_PREFIX)imgjpege_s.$(LIB_SUFFIX) \ - ../encoders/bmp/$(LIB_PREFIX)imgbmpe_s.$(LIB_SUFFIX) \ - $(NULL) diff --git a/image/build/moz.build b/image/build/moz.build index f68bf4a28dbe7..810ab63579075 100644 --- a/image/build/moz.build +++ b/image/build/moz.build @@ -16,5 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in index 2a6e9a6d15d62..23221a71279d4 100644 --- a/image/decoders/icon/Makefile.in +++ b/image/decoders/icon/Makefile.in @@ -27,6 +27,4 @@ ifeq ($(OS_TARGET),Android) PLATFORM = android endif -SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX) - LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM) diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build index de3d8f45281e7..89ad41e57abae 100644 --- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -18,3 +18,4 @@ LIBRARY_NAME = 'imgiconandroid_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'imgicon' diff --git a/image/decoders/icon/gtk/moz.build b/image/decoders/icon/gtk/moz.build index 5bab1df78e545..4b06669cdbcce 100644 --- a/image/decoders/icon/gtk/moz.build +++ b/image/decoders/icon/gtk/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'imgicon' diff --git a/image/decoders/icon/mac/moz.build b/image/decoders/icon/mac/moz.build index 9cda477972adb..fffd52c40d753 100644 --- a/image/decoders/icon/mac/moz.build +++ b/image/decoders/icon/mac/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'imgicon' diff --git a/image/decoders/icon/moz.build b/image/decoders/icon/moz.build index c5ba7d6a12896..2d93231d91e00 100644 --- a/image/decoders/icon/moz.build +++ b/image/decoders/icon/moz.build @@ -22,5 +22,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/image/decoders/icon/os2/moz.build b/image/decoders/icon/os2/moz.build index 9803b84a0f0aa..95b76dd29b9ec 100644 --- a/image/decoders/icon/os2/moz.build +++ b/image/decoders/icon/os2/moz.build @@ -14,3 +14,4 @@ LIBRARY_NAME = 'imgiconos2_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'imgicon' diff --git a/image/decoders/icon/qt/moz.build b/image/decoders/icon/qt/moz.build index 96b58aa06beb6..19ff354dcde62 100644 --- a/image/decoders/icon/qt/moz.build +++ b/image/decoders/icon/qt/moz.build @@ -24,3 +24,4 @@ LIBRARY_NAME = 'imgiconqt_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'imgicon' diff --git a/image/decoders/icon/win/moz.build b/image/decoders/icon/win/moz.build index 410970d3a8d1e..6f79b5e4ee1bf 100644 --- a/image/decoders/icon/win/moz.build +++ b/image/decoders/icon/win/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'imgicon' diff --git a/image/decoders/moz.build b/image/decoders/moz.build index 002edcbd90850..444f5b8ee862c 100644 --- a/image/decoders/moz.build +++ b/image/decoders/moz.build @@ -49,3 +49,5 @@ SOURCES += [ LOCAL_INCLUDES += [ '/image/src', ] + +FINAL_LIBRARY = 'imglib2' diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build index fda76739c544f..1dc665b444430 100644 --- a/image/encoders/bmp/moz.build +++ b/image/encoders/bmp/moz.build @@ -19,3 +19,5 @@ LIBXUL_LIBRARY = True LOCAL_INCLUDES += [ '/image/src', ] + +FINAL_LIBRARY = 'imglib2' diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build index 36f38354cb3ed..91d8915ec17f6 100644 --- a/image/encoders/ico/moz.build +++ b/image/encoders/ico/moz.build @@ -22,3 +22,5 @@ LOCAL_INCLUDES += [ '../png', '/image/src', ] + +FINAL_LIBRARY = 'imglib2' diff --git a/image/encoders/jpeg/moz.build b/image/encoders/jpeg/moz.build index f6da602d6880d..30c721cde12e0 100644 --- a/image/encoders/jpeg/moz.build +++ b/image/encoders/jpeg/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'imglib2' diff --git a/image/encoders/png/moz.build b/image/encoders/png/moz.build index 046fb75128d79..5ae52979ff3d3 100644 --- a/image/encoders/png/moz.build +++ b/image/encoders/png/moz.build @@ -19,3 +19,5 @@ LIBXUL_LIBRARY = True LOCAL_INCLUDES += [ '/image/src', ] + +FINAL_LIBRARY = 'imglib2' diff --git a/image/src/moz.build b/image/src/moz.build index b702f8176eb7d..b66ed24524397 100644 --- a/image/src/moz.build +++ b/image/src/moz.build @@ -49,3 +49,4 @@ LIBRARY_NAME = 'imglib2_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'imglib2' diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index b50dbeeb867a7..104b6e7ce2405 100644 --- a/intl/build/Makefile.in +++ b/intl/build/Makefile.in @@ -2,17 +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/. -# see also intl/locale/src/Makefile.in -ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT))) -LOCALE_DIR = $(MOZ_WIDGET_TOOLKIT) -else -ifeq ($(OS_ARCH), Darwin) -LOCALE_DIR = mac -else -LOCALE_DIR = unix -endif -endif - LOCAL_INCLUDES = \ -I$(srcdir)/../lwbrk/src \ -I$(srcdir)/../unicharutil/src \ @@ -21,12 +10,3 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../locale/src/$(LOCALE_DIR) \ -I$(srcdir)/../uconv/src \ $(NULL) - -SHARED_LIBRARY_LIBS = \ - ../lwbrk/src/$(LIB_PREFIX)lwbrk_s.$(LIB_SUFFIX) \ - ../unicharutil/src/$(LIB_PREFIX)ucharucomp_s.$(LIB_SUFFIX) \ - ../strres/src/$(LIB_PREFIX)strres_s.$(LIB_SUFFIX) \ - ../locale/src/$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX) \ - ../locale/src/$(LOCALE_DIR)/$(LIB_PREFIX)platlocale_s.$(LIB_SUFFIX) \ - ../hyphenation/src/$(HYPHENATION_DIR)/$(LIB_PREFIX)hyphenation_s.$(LIB_SUFFIX) \ - $(NULL) diff --git a/intl/build/moz.build b/intl/build/moz.build index 269e855911663..5b83003ec1782 100644 --- a/intl/build/moz.build +++ b/intl/build/moz.build @@ -14,5 +14,4 @@ LIBRARY_NAME = 'i18n' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/intl/chardet/src/moz.build b/intl/chardet/src/moz.build index 573edab5a4c01..d16d0e1730487 100644 --- a/intl/chardet/src/moz.build +++ b/intl/chardet/src/moz.build @@ -15,5 +15,4 @@ LIBRARY_NAME = 'chardet' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/intl/hyphenation/src/moz.build b/intl/hyphenation/src/moz.build index f7ccf4b3174fc..3a1ff249c4224 100644 --- a/intl/hyphenation/src/moz.build +++ b/intl/hyphenation/src/moz.build @@ -22,3 +22,4 @@ SOURCES += [ MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/locale/src/mac/moz.build b/intl/locale/src/mac/moz.build index 32fe2b6a7f28a..6aa525ad74d02 100644 --- a/intl/locale/src/mac/moz.build +++ b/intl/locale/src/mac/moz.build @@ -16,3 +16,4 @@ LIBRARY_NAME = 'platlocale_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build index ed79b43e3f73d..1d472ca5a2749 100644 --- a/intl/locale/src/moz.build +++ b/intl/locale/src/moz.build @@ -39,3 +39,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/locale/src/nsLocaleConstructors.h b/intl/locale/src/nsLocaleConstructors.h index ba501f8c504fa..594c2202b3dfa 100644 --- a/intl/locale/src/nsLocaleConstructors.h +++ b/intl/locale/src/nsLocaleConstructors.h @@ -25,24 +25,24 @@ #endif #ifdef XP_WIN -#include "nsCollationWin.h" -#include "nsDateTimeFormatWin.h" +#include "windows/nsCollationWin.h" +#include "windows/nsDateTimeFormatWin.h" #endif #ifdef XP_OS2 -#include "nsOS2Locale.h" -#include "nsCollationOS2.h" -#include "nsDateTimeFormatOS2.h" +#include "os2/nsOS2Locale.h" +#include "os2/nsCollationOS2.h" +#include "os2/nsDateTimeFormatOS2.h" #endif #ifdef USE_MAC_LOCALE -#include "nsCollationMacUC.h" -#include "nsDateTimeFormatMac.h" +#include "mac/nsCollationMacUC.h" +#include "mac/nsDateTimeFormatMac.h" #endif #ifdef USE_UNIX_LOCALE -#include "nsCollationUnix.h" -#include "nsDateTimeFormatUnix.h" +#include "unix/nsCollationUnix.h" +#include "unix/nsDateTimeFormatUnix.h" #endif #define NSLOCALE_MAKE_CTOR(ctor_, iface_, func_) \ diff --git a/intl/locale/src/os2/moz.build b/intl/locale/src/os2/moz.build index e75cb74d19a8e..e3b4ff9a64659 100644 --- a/intl/locale/src/os2/moz.build +++ b/intl/locale/src/os2/moz.build @@ -17,5 +17,4 @@ LIBRARY_NAME = 'platlocale_s' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'i18n' diff --git a/intl/locale/src/unix/moz.build b/intl/locale/src/unix/moz.build index 068d05a0191af..7a7efbfe88e22 100644 --- a/intl/locale/src/unix/moz.build +++ b/intl/locale/src/unix/moz.build @@ -25,3 +25,4 @@ LIBRARY_NAME = 'platlocale_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/locale/src/windows/moz.build b/intl/locale/src/windows/moz.build index bae14169f26de..6e2b8340420af 100644 --- a/intl/locale/src/windows/moz.build +++ b/intl/locale/src/windows/moz.build @@ -17,3 +17,4 @@ LIBRARY_NAME = 'platlocale_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/lwbrk/src/moz.build b/intl/lwbrk/src/moz.build index 9bb4143c5631f..ecf934590c1f9 100644 --- a/intl/lwbrk/src/moz.build +++ b/intl/lwbrk/src/moz.build @@ -39,3 +39,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/strres/src/moz.build b/intl/strres/src/moz.build index 7940b55a9893f..1690738b840fd 100644 --- a/intl/strres/src/moz.build +++ b/intl/strres/src/moz.build @@ -17,3 +17,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/uconv/src/moz.build b/intl/uconv/src/moz.build index 23de0db794b07..d9f6629b30cb6 100644 --- a/intl/uconv/src/moz.build +++ b/intl/uconv/src/moz.build @@ -226,9 +226,8 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - LOCAL_INCLUDES += [ '../util', ] +FINAL_LIBRARY = 'xul' diff --git a/intl/unicharutil/src/moz.build b/intl/unicharutil/src/moz.build index f41b5e9dd991e..29773868d5a1b 100644 --- a/intl/unicharutil/src/moz.build +++ b/intl/unicharutil/src/moz.build @@ -18,3 +18,4 @@ LIBRARY_NAME = 'ucharucomp_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'i18n' diff --git a/intl/unicharutil/util/internal/moz.build b/intl/unicharutil/util/internal/moz.build index 02abc2b8e8c34..a7970c0de00d7 100644 --- a/intl/unicharutil/util/internal/moz.build +++ b/intl/unicharutil/util/internal/moz.build @@ -13,3 +13,5 @@ UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs LIBRARY_NAME = 'unicharutil_s' LIBXUL_LIBRARY = True + +FINAL_LIBRARY = 'xul' diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index a8c131ee85c67..aa1e8b0a25196 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -281,7 +281,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'chromium_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build index 77fa3596bb8ff..4ca4fc3e75b9a 100644 --- a/ipc/dbus/moz.build +++ b/ipc/dbus/moz.build @@ -22,7 +22,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozdbus_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index 09ab522d61d06..13f21bc52307d 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -104,7 +104,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozipc_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index af21a372cce69..187bb8c2a1386 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -15,7 +15,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozipdlgen_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build index 7e351b54788b7..58ff557c7dfa1 100644 --- a/ipc/ipdl/test/cxx/moz.build +++ b/ipc/ipdl/test/cxx/moz.build @@ -125,7 +125,6 @@ IPDL_SOURCES += [ LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/keystore/Makefile.in b/ipc/keystore/Makefile.in deleted file mode 100644 index 181c541d36e36..0000000000000 --- a/ipc/keystore/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -EXPORT_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk diff --git a/ipc/keystore/moz.build b/ipc/keystore/moz.build index bdaba87d00ed1..3381b853456ed 100644 --- a/ipc/keystore/moz.build +++ b/ipc/keystore/moz.build @@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozkeystore_s' include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'xul' diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build index cef3ae56f469a..caf5093a98cca 100644 --- a/ipc/netd/moz.build +++ b/ipc/netd/moz.build @@ -18,7 +18,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'moznetd_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/nfc/moz.build b/ipc/nfc/moz.build index 0cae9d7e4bd76..c567085fd8fd0 100644 --- a/ipc/nfc/moz.build +++ b/ipc/nfc/moz.build @@ -20,3 +20,4 @@ EXPORT_LIBRARY = True include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build index 49475235db4f7..c23f43fc6486d 100644 --- a/ipc/ril/moz.build +++ b/ipc/ril/moz.build @@ -18,7 +18,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozril_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build index 7a3f010021c44..d8d716b1d1e68 100644 --- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -33,7 +33,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'ipcshell_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build index 2f79c06ff6de2..c4b581f6a6945 100644 --- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -20,7 +20,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mozipcunixsocket_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/js/ductwork/debugger/moz.build b/js/ductwork/debugger/moz.build index 71c91f2bbab29..95bae02587cdf 100644 --- a/js/ductwork/debugger/moz.build +++ b/js/ductwork/debugger/moz.build @@ -24,5 +24,4 @@ EXTRA_JS_MODULES += [ LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/js/ipc/moz.build b/js/ipc/moz.build index 7463c2ba3b75d..741a828ed3155 100644 --- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -23,7 +23,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'jsipc_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/js/jsd/moz.build b/js/jsd/moz.build index db9d7548125db..6e2daba225ba0 100644 --- a/js/jsd/moz.build +++ b/js/jsd/moz.build @@ -40,5 +40,4 @@ LIBRARY_NAME = 'jsd' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build index d639035a6800e..da6f122464b06 100644 --- a/js/xpconnect/loader/moz.build +++ b/js/xpconnect/loader/moz.build @@ -25,3 +25,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'xpconnect_s' diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 13fdb28363832..25e4574421419 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -26,11 +26,6 @@ LOCAL_INCLUDES += \ $(NULL) endif -SHARED_LIBRARY_LIBS = \ - ../loader/$(LIB_PREFIX)jsloader_s.$(LIB_SUFFIX) \ - ../wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \ - $(NULL) - EXTRA_MDDEPEND_FILES = dom_qsgen.pp dictionary_helper_gen.pp event_impl_gen.pp INSTALL_TARGETS += extra_export_files diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index 2cc3cb725f7a2..143d64f2b8b2a 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -66,3 +66,4 @@ LIBRARY_NAME = 'xpconnect_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build index b0f3bf55c711a..70792f19d1083 100644 --- a/js/xpconnect/wrappers/moz.build +++ b/js/xpconnect/wrappers/moz.build @@ -32,3 +32,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'xpconnect_s' diff --git a/layout/base/moz.build b/layout/base/moz.build index 6c1526c30c44f..87409618ddd1f 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -117,3 +117,4 @@ LIBRARY_NAME = 'gkbase_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 95dc5c2c59ae6..9703d546e1f01 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -8,210 +8,25 @@ ifeq ($(OS_ARCH),SunOS) SHELL := ksh endif -SHARED_LIBRARY_LIBS = \ - ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ - ../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \ - ../generic/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \ - ../ipc/$(LIB_PREFIX)gkipc_s.$(LIB_SUFFIX) \ - ../style/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \ - ../tables/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \ - ../xul/base/src/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \ - ../mathml/$(LIB_PREFIX)gkmathml_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/base/src/$(LIB_PREFIX)gkconbase_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/canvas/src/$(LIB_PREFIX)gkconcvs_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/events/src/$(LIB_PREFIX)gkconevents_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/html/content/src/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/html/document/src/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/$(LIB_PREFIX)gkconmedia_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/encoder/$(LIB_PREFIX)gkconencoder_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/webaudio/$(LIB_PREFIX)gkconwebaudio_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/webaudio/blink/$(LIB_PREFIX)gkconwebaudio_blink_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/webrtc/$(LIB_PREFIX)gkconwebrtc_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xml/content/src/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xml/document/src/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xslt/src/base/$(LIB_PREFIX)txbase_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xslt/src/xml/$(LIB_PREFIX)txxml_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xslt/src/xpath/$(LIB_PREFIX)txxpath_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xslt/src/xslt/$(LIB_PREFIX)txxslt_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xbl/src/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xul/document/src/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \ - $(DEPTH)/view/src/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/activities/src/$(LIB_PREFIX)dom_activities_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/apps/src/$(LIB_PREFIX)dom_apps_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/base/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/battery/$(LIB_PREFIX)dom_battery_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/alarm/$(LIB_PREFIX)domalarm_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/devicestorage/$(LIB_PREFIX)domdevicestorage_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/encoding/$(LIB_PREFIX)domencoding_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/file/$(LIB_PREFIX)domfile_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/power/$(LIB_PREFIX)dom_power_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/quota/$(LIB_PREFIX)domquota_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/network/src/$(LIB_PREFIX)dom_network_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/media/$(LIB_PREFIX)dom_media_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/mobilemessage/src/$(LIB_PREFIX)dom_mobilemessage_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/events/$(LIB_PREFIX)jsdomevents_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/json/$(LIB_PREFIX)json_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/jsurl/$(LIB_PREFIX)jsurl_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/storage/$(LIB_PREFIX)jsdomstorage_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/offline/$(LIB_PREFIX)jsdomoffline_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/geolocation/$(LIB_PREFIX)jsdomgeolocation_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/audiochannel/$(LIB_PREFIX)domaudiochannel_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/promise/$(LIB_PREFIX)dompromise_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/src/notification/$(LIB_PREFIX)jsdomnotification_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/system/$(LIB_PREFIX)domsystem_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/telephony/$(LIB_PREFIX)domtelephony_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/workers/$(LIB_PREFIX)domworkers_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/indexedDB/$(LIB_PREFIX)dom_indexeddb_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/indexedDB/ipc/$(LIB_PREFIX)dom_indexeddb_ipc_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/browser-element/$(LIB_PREFIX)dom_browserelement_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/time/$(LIB_PREFIX)dom_time_s.$(LIB_SUFFIX) \ - $(DEPTH)/editor/libeditor/text/$(LIB_PREFIX)texteditor_s.$(LIB_SUFFIX) \ - $(DEPTH)/editor/libeditor/base/$(LIB_PREFIX)editorbase_s.$(LIB_SUFFIX) \ - $(DEPTH)/parser/html/$(LIB_PREFIX)html5p_s.$(LIB_SUFFIX) \ - $(DEPTH)/caps/src/$(LIB_PREFIX)caps_s.$(LIB_SUFFIX) \ - $(DEPTH)/editor/libeditor/html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX) \ - $(DEPTH)/editor/txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/mathml/content/src/$(LIB_PREFIX)gkcontentmathml_s.$(LIB_SUFFIX) \ - $(NULL) - ifneq (,$(filter qt gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT))) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/system/unix/$(LIB_PREFIX)domsystemunix_s.$(LIB_SUFFIX) \ - $(NULL) LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/system/unix \ $(NULL) else ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/system/windows/$(LIB_PREFIX)domsystemwindows_s.$(LIB_SUFFIX) \ - $(NULL) LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/system/windows \ $(NULL) else ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/system/mac/$(LIB_PREFIX)domsystemmac_s.$(LIB_SUFFIX) \ - $(NULL) LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/system/mac \ $(NULL) else ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT))) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/system/android/$(LIB_PREFIX)domsystemandroid_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/plugins/base/android/$(LIB_PREFIX)gkpluginandroid_s.$(LIB_SUFFIX) \ - $(NULL) LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/system/android \ -I$(topsrcdir)/dom/system \ $(NULL) endif -ifdef MOZ_OMX_DECODER #{ -# include OMX decoder -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/omx/$(LIB_PREFIX)gkconomx_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/omx/mediaresourcemanager/$(LIB_PREFIX)mediaresourcemanager.$(LIB_SUFFIX) \ - $(NULL) -endif #} - -ifdef MOZ_B2G_FM #{ -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/fmradio/$(LIB_PREFIX)domfmradio_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/fmradio/ipc/$(LIB_PREFIX)domfmradio_s.$(LIB_SUFFIX) \ - $(NULL) -endif #} - -ifdef MOZ_B2G_BT #{ -SHARED_LIBRARY_LIBS += $(DEPTH)/dom/bluetooth/$(LIB_PREFIX)dombluetooth_s.$(LIB_SUFFIX) -endif #} - -SHARED_LIBRARY_LIBS += $(DEPTH)/dom/camera/$(LIB_PREFIX)domcamera_s.$(LIB_SUFFIX) - -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/system/gonk/$(LIB_PREFIX)domsystemgonk_s.$(LIB_SUFFIX) \ - $(NULL) -endif #} - -ifdef MOZ_B2G_RIL #{ -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/icc/src/$(LIB_PREFIX)dom_icc_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/cellbroadcast/src/$(LIB_PREFIX)dom_cellbroadcast_s.$(LIB_SUFFIX) \ - $(DEPTH)/dom/voicemail/$(LIB_PREFIX)domvoicemail_s.$(LIB_SUFFIX) \ - $(NULL) -endif #} - -ifdef MOZ_OGG -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_RAW -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/raw/$(LIB_PREFIX)gkconraw_s.$(LIB_SUFFIX)\ - $(NULL) -endif - -ifdef MOZ_WEBM -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/webm/$(LIB_PREFIX)gkconwebm_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_WMF -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/wmf/$(LIB_PREFIX)gkconwmf_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_DIRECTSHOW -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/directshow/$(LIB_PREFIX)gkcondirectshow_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_APPLEMEDIA -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/apple/$(LIB_PREFIX)gkconapplemedia_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_WAVE -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/wave/$(LIB_PREFIX)gkconwave_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_GSTREAMER -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/gstreamer/$(LIB_PREFIX)gkcongstreamer_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_MEDIA_PLUGINS -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/plugins/$(LIB_PREFIX)gkconmediaplugins_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/mediasource/$(LIB_PREFIX)gkconmediasource_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef MOZ_WEBSPEECH -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/webspeech/recognition/$(LIB_PREFIX)gkconwebspeechrecognition_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/media/webspeech/synth/$(LIB_PREFIX)gkconwebspeechsynth_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_SYNTH_PICO -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/content/media/webspeech/synth/pico/$(LIB_PREFIX)synthpico.$(LIB_SUFFIX) \ - $(NULL) -endif - ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) INCLUDES += \ -I$(srcdir)/../../base/src \ @@ -231,35 +46,9 @@ EXTRA_DSO_LDOPTS += \ $(NULL) endif -ifdef NS_PRINTING -SHARED_LIBRARY_LIBS += \ - ../printing/$(LIB_PREFIX)gkprinting_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_XUL -SHARED_LIBRARY_LIBS += \ - ../xul/tree/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \ - ../xul/grid/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xul/content/src/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/xul/templates/src/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \ - $(NULL) -endif - LOCAL_INCLUDES += \ -I$(srcdir)/../inspector/src \ $(NULL) -SHARED_LIBRARY_LIBS += ../inspector/src/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX) - -SHARED_LIBRARY_LIBS += \ - ../svg/$(LIB_PREFIX)gksvgbase_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/svg/document/src/$(LIB_PREFIX)gkconsvgdoc_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/svg/content/src/$(LIB_PREFIX)gkcontentsvg_s.$(LIB_SUFFIX) \ - $(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \ - $(NULL) - -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/js/xpconnect/src/$(LIB_PREFIX)xpconnect_s.$(LIB_SUFFIX) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifdef MOZ_GSTREAMER @@ -267,11 +56,6 @@ EXTRA_DSO_LDOPTS += $(GSTREAMER_LIBS) endif endif -ifdef MOZ_GAMEPAD -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/dom/gamepad/$(LIB_PREFIX)domgamepad_s.$(LIB_SUFFIX) -endif - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../base \ diff --git a/layout/build/moz.build b/layout/build/moz.build index a2331201b5833..20b136f6e527b 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -18,11 +18,6 @@ UNIFIED_SOURCES += [ 'nsLayoutStatics.cpp', ] -if CONFIG['MOZ_NFC']: - SHARED_LIBRARY_LIBS += [ - '%s/dom/nfc/%sdom_nfc_s.%s' % (TOPOBJDIR, CONFIG['LIB_PREFIX'], CONFIG['LIB_SUFFIX']) - ] - if CONFIG['MOZ_NFC']: LOCAL_INCLUDES += [ '/dom/nfc' @@ -36,7 +31,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gklayout' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/layout/forms/moz.build b/layout/forms/moz.build index aaa99832674ed..50160837dab9e 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -45,3 +45,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gklayout' diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 2f72842e15cb2..e15b43156a94a 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -111,3 +111,4 @@ LIBRARY_NAME = 'gkgeneric_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build index e44ffd95162e3..8ed343c0d9a03 100644 --- a/layout/inspector/src/moz.build +++ b/layout/inspector/src/moz.build @@ -33,3 +33,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index 059a109fa5b16..750ca9921825c 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -27,7 +27,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkipc_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index 37baa22e86d29..e3b95a92dcac0 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -37,3 +37,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gkmathml_s' +FINAL_LIBRARY = 'gklayout' diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in index 18e41fbe45b5d..f3b966f72546c 100644 --- a/layout/media/Makefile.in +++ b/layout/media/Makefile.in @@ -8,104 +8,6 @@ ifeq (WINNT,$(OS_TARGET)) FORCE_SHARED_LIB = 1 endif -SHARED_LIBRARY_LIBS = \ - $(MOZ_OTS_LIBS) \ - $(QCMS_LIBS) \ - $(MOZ_GRAPHITE_LIBS) \ - $(MOZ_HARFBUZZ_LIBS) \ - $(NULL) - -ifdef MOZ_TREE_CAIRO -SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS) -endif - -ifdef MOZ_TREE_PIXMAN -SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS) -endif - -ifdef MOZ_VORBIS -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libvorbis/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \ - $(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_TREMOR -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \ - $(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_OGG -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_OPUS -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libopus/$(LIB_PREFIX)opus.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_WEBM -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libnestegg/src/$(LIB_PREFIX)nestegg.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_VP8 -ifndef MOZ_NATIVE_LIBVPX -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libvpx/$(LIB_PREFIX)vpx.$(LIB_SUFFIX) \ - $(NULL) -endif -endif - -ifdef MOZ_SPEEX_RESAMPLER -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libspeex_resampler/src/$(LIB_PREFIX)speex_resampler.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_SOUNDTOUCH -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libsoundtouch/src/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_CUBEB -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libcubeb/src/$(LIB_PREFIX)cubeb.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifndef MOZ_NATIVE_PNG -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libpng/$(LIB_PREFIX)mozpng.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifndef MOZ_NATIVE_JPEG -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libjpeg/$(LIB_PREFIX)mozjpeg.$(LIB_SUFFIX) \ - $(NULL) -endif - -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/gfx/angle/$(LIB_PREFIX)angle.$(LIB_SUFFIX) \ - $(DEPTH)/parser/expat/lib/$(LIB_PREFIX)mozexpat_s.$(LIB_SUFFIX) \ - $(NULL) - -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/gfx/2d/$(LIB_PREFIX)gfx2d.$(LIB_SUFFIX) \ - $(NULL) - -ifdef MOZ_ENABLE_SKIA -SHARED_LIBRARY_LIBS += $(MOZ_SKIA_LIBS) -endif - ifeq (WINNT,$(OS_TARGET)) EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS) OS_LIBS += $(call EXPAND_LIBNAME,usp10 ole32) diff --git a/layout/media/webrtc/moz.build b/layout/media/webrtc/moz.build index d573ab5a9af49..8a0701f6382c6 100644 --- a/layout/media/webrtc/moz.build +++ b/layout/media/webrtc/moz.build @@ -5,3 +5,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. LIBRARY_NAME = 'webrtc' +FINAL_LIBRARY = 'xul' diff --git a/layout/printing/moz.build b/layout/printing/moz.build index a0828dbdc90cb..7441eafbcf311 100644 --- a/layout/printing/moz.build +++ b/layout/printing/moz.build @@ -28,3 +28,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/layout/style/moz.build b/layout/style/moz.build index 7cab57c3df54c..a32ca1d8e31d0 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -137,3 +137,4 @@ LIBRARY_NAME = 'gkstyle_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'gklayout' diff --git a/layout/svg/moz.build b/layout/svg/moz.build index 18f7edd539fde..8e3b9651a6990 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -54,3 +54,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'gksvgbase_s' +FINAL_LIBRARY = 'gklayout' diff --git a/layout/tables/moz.build b/layout/tables/moz.build index d62169a1c46eb..1786946669702 100644 --- a/layout/tables/moz.build +++ b/layout/tables/moz.build @@ -35,3 +35,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gklayout' diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build index 08066db541e45..482fbebbfe379 100644 --- a/layout/tools/layout-debug/src/moz.build +++ b/layout/tools/layout-debug/src/moz.build @@ -28,5 +28,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index 60f0670feec85..6e03fcce0e584 100644 --- a/layout/xul/base/src/moz.build +++ b/layout/xul/base/src/moz.build @@ -62,3 +62,4 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'gkxulbase_s' +FINAL_LIBRARY = 'gklayout' diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build index 6dd1d4cbe7dbc..8837dfcbde4fa 100644 --- a/layout/xul/grid/moz.build +++ b/layout/xul/grid/moz.build @@ -36,3 +36,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build index b08c2491bb8fd..1788f21178591 100644 --- a/layout/xul/tree/moz.build +++ b/layout/xul/tree/moz.build @@ -39,3 +39,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'gklayout' diff --git a/media/kiss_fft/moz.build b/media/kiss_fft/moz.build index 054188acc404a..22c12d92e7745 100644 --- a/media/kiss_fft/moz.build +++ b/media/kiss_fft/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'kiss_fft' if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'xul' diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 0d5c6f3777cf5..05c848f7218e8 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -55,3 +55,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build index 4b21bacfb5526..d63d14a8de65a 100644 --- a/media/libjpeg/moz.build +++ b/media/libjpeg/moz.build @@ -155,3 +155,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build index b2c343ac6bf1c..ee9e08ac4a108 100644 --- a/media/libnestegg/src/moz.build +++ b/media/libnestegg/src/moz.build @@ -19,3 +19,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libogg/moz.build b/media/libogg/moz.build index 279ff455d73be..0a88ae6f1c0b2 100644 --- a/media/libogg/moz.build +++ b/media/libogg/moz.build @@ -25,3 +25,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libopus/moz.build b/media/libopus/moz.build index cf3b3bcac23fd..064011fce06ad 100644 --- a/media/libopus/moz.build +++ b/media/libopus/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'opus' MSVC_ENABLE_PGO = True FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libpng/moz.build b/media/libpng/moz.build index 3c43576186276..b30d942e22353 100644 --- a/media/libpng/moz.build +++ b/media/libpng/moz.build @@ -53,3 +53,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build index e49f409916712..7dd4a86a016c4 100644 --- a/media/libsoundtouch/src/moz.build +++ b/media/libsoundtouch/src/moz.build @@ -37,3 +37,5 @@ LIBRARY_NAME = 'soundtouch' MSVC_ENABLE_PGO = True NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build index 85bd17f7cdd43..7b13b646fa83d 100644 --- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -25,3 +25,5 @@ SOURCES += [ MSVC_ENABLE_PGO = True FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build index fab59768749b0..5bca5d6227fd2 100644 --- a/media/libtheora/lib/moz.build +++ b/media/libtheora/lib/moz.build @@ -65,3 +65,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build index f3a1860477a22..0f71552ae29df 100644 --- a/media/libtremor/lib/moz.build +++ b/media/libtremor/lib/moz.build @@ -24,3 +24,5 @@ SOURCES += [ ] FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libvorbis/moz.build b/media/libvorbis/moz.build index 1336366eef83a..3f6f1c2c92d58 100644 --- a/media/libvorbis/moz.build +++ b/media/libvorbis/moz.build @@ -51,3 +51,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index d73fd12f755f4..74eca772100dd 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -98,3 +98,5 @@ FORCE_STATIC_LIB = True if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build index 346495fb917ef..12291f06414fd 100644 --- a/media/mtransport/build/moz.build +++ b/media/mtransport/build/moz.build @@ -76,3 +76,5 @@ elif CONFIG['OS_TARGET'] == 'WINNT': if CONFIG['OS_TARGET'] == 'WINNT': NO_VISIBILITY_FLAGS = True + +FINAL_LIBRARY = 'xul' diff --git a/memory/build/moz.build b/memory/build/moz.build index 54ddbbf3f5586..6956c278afdb5 100644 --- a/memory/build/moz.build +++ b/memory/build/moz.build @@ -34,3 +34,8 @@ if CONFIG['MOZ_REPLACE_MALLOC']: LIBRARY_NAME = 'memory' FORCE_STATIC_LIB = True + +# Keep jemalloc separated when mozglue is statically linked +if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or + CONFIG['MOZ_NATIVE_JEMALLOC']): + FINAL_LIBRARY = 'mozglue' diff --git a/mfbt/moz.build b/mfbt/moz.build index fe832a6db4045..7c6380fd8ee53 100644 --- a/mfbt/moz.build +++ b/mfbt/moz.build @@ -14,3 +14,5 @@ FORCE_STATIC_LIB = True mfbt_root = '.' include('common.mozbuild') + +FINAL_LIBRARY = 'mozglue' diff --git a/mobile/android/components/build/moz.build b/mobile/android/components/build/moz.build index 905ddd8fb83ea..3f13f525f09f6 100644 --- a/mobile/android/components/build/moz.build +++ b/mobile/android/components/build/moz.build @@ -32,5 +32,4 @@ LIBRARY_NAME = 'browsercomps' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index ee3eb5841ffaf..4f79a4a03ed2f 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -36,7 +36,6 @@ MOZ_ANDROID_HISTORY=1 MOZ_DISABLE_EXPORT_JS=1 # Needed for building our components as part of libxul -MOZ_APP_COMPONENT_LIBS="browsercomps" MOZ_APP_COMPONENT_INCLUDE=nsBrowserComponents.h # use custom widget for html:select diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index dc131bc97c61d..5def95b87cba8 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -41,7 +41,6 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/modules/libjar/zipwriter/src/moz.build b/modules/libjar/zipwriter/src/moz.build index a827c4b740a60..6b883beb6f88c 100644 --- a/modules/libjar/zipwriter/src/moz.build +++ b/modules/libjar/zipwriter/src/moz.build @@ -21,5 +21,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index 3f52586194e93..18fb66b0c5a6e 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -20,7 +20,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'pref' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/mozglue/android/moz.build b/mozglue/android/moz.build index e01110b375a54..b96e2b90c1cfb 100644 --- a/mozglue/android/moz.build +++ b/mozglue/android/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'android' FAIL_ON_WARNINGS = True FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'mozglue' diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in index 22546d545fe9c..1b4eb1139c524 100644 --- a/mozglue/build/Makefile.in +++ b/mozglue/build/Makefile.in @@ -11,10 +11,7 @@ ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) FORCE_SHARED_LIB = 1 endif -# Keep jemalloc separated when mozglue is statically linked -ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) -SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) -else +ifneq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) SDK_LIBRARY = $(IMPORT_LIBRARY) @@ -81,30 +78,20 @@ EXTRA_DSO_LDOPTS += -Wl,-weak_library,$(DEPTH)/memory/replace/dummy/$(DLL_PREFIX endif endif -ifeq (Android,$(OS_TARGET)) -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android) -endif - ifeq (android, $(MOZ_WIDGET_TOOLKIT)) # Add Android specific code EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS) -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,../android) # To properly wrap jemalloc's pthread_atfork call. EXTRA_DSO_LDOPTS += -Wl,--wrap=pthread_atfork endif ifdef MOZ_LINKER -# Add custom dynamic linker -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker) - ifeq (arm, $(TARGET_CPU)) EXTRA_DSO_LDOPTS += -Wl,-version-script,$(srcdir)/arm-eabi-filter endif endif -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) - ifeq (Android, $(OS_TARGET)) WRAP_LDFLAGS := $(filter -Wl%,$(WRAP_LDFLAGS)) endif diff --git a/mozglue/linker/moz.build b/mozglue/linker/moz.build index f9e0813632237..d10f6e5615dad 100644 --- a/mozglue/linker/moz.build +++ b/mozglue/linker/moz.build @@ -24,3 +24,5 @@ HOST_SOURCES += [ HOST_PROGRAM = 'szip' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'mozglue' diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index c5e6457d18744..7777b17234182 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -116,6 +116,7 @@ LIBRARY_NAME = 'neckobase_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' LOCAL_INCLUDES += [ '/dom/base', ] diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 03b786157c662..785f433fcc271 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -3,54 +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/. -SHARED_LIBRARY_LIBS = \ - ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ - ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \ - ../socket/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \ - ../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \ - ../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \ - ../mime/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \ - ../cache/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \ - ../cache2/$(LIB_PREFIX)nkcache2_s.$(LIB_SUFFIX) \ - ../protocol/about/$(LIB_PREFIX)nkabout_s.$(LIB_SUFFIX) \ - $(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \ - ../protocol/$(d)/$(LIB_PREFIX)nk$(d)_s.$(LIB_SUFFIX)) \ - ../ipc/$(LIB_PREFIX)neckoipc_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef MOZ_SRTP -SHARED_LIBRARY_LIBS += \ - ../srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_SCTP -SHARED_LIBRARY_LIBS += \ - ../sctp/src/$(LIB_PREFIX)nksctp_s.$(LIB_SUFFIX) \ - ../sctp/datachannel/$(LIB_PREFIX)nkdatachan_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifeq ($(OS_ARCH),WINNT) - SHARED_LIBRARY_LIBS += \ - ../system/win32/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX) -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - SHARED_LIBRARY_LIBS += \ - ../system/mac/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX) -endif - -ifdef MOZ_ENABLE_QTNETWORK - SHARED_LIBRARY_LIBS += \ - ../system/qt/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX) -endif - -ifeq (android,$(MOZ_WIDGET_TOOLKIT)) - SHARED_LIBRARY_LIBS += \ - ../system/android/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX) -endif - LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ -I$(srcdir)/../dns \ @@ -83,16 +35,10 @@ ifeq (android,$(MOZ_WIDGET_TOOLKIT)) endif ifdef NECKO_COOKIES -SHARED_LIBRARY_LIBS += \ - ../cookie/$(LIB_PREFIX)neckocookie_s.$(LIB_SUFFIX) \ - $(NULL) LOCAL_INCLUDES += -I$(srcdir)/../cookie endif ifdef NECKO_WIFI -SHARED_LIBRARY_LIBS += \ - ../wifi/$(LIB_PREFIX)neckowifi_s.$(LIB_SUFFIX) \ - $(NULL) LOCAL_INCLUDES += -I$(srcdir)/../wifi endif diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index aabbdbfba1751..e7f1fd288f4e9 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -22,7 +22,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'necko' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index 83285e082978c..500a336b74211 100644 --- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -50,3 +50,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build index 94de369cb67b1..cf569c191968e 100644 --- a/netwerk/cache2/moz.build +++ b/netwerk/cache2/moz.build @@ -53,3 +53,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index 295804ba7a303..6c174eb366431 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -50,3 +50,4 @@ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index d92995ed0ab6b..f6fa496b28743 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -43,3 +43,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index 79517f8a56d3a..998a8de2b725c 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -44,7 +44,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'neckoipc_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build index 59fad7500ff1b..634aaddbf7f23 100644 --- a/netwerk/mime/moz.build +++ b/netwerk/mime/moz.build @@ -28,3 +28,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 5ddc66003f369..94f23517f2403 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -32,3 +32,4 @@ LIBRARY_NAME = 'nkabout_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/app/moz.build b/netwerk/protocol/app/moz.build index a8b30935c9260..7396beb273b60 100644 --- a/netwerk/protocol/app/moz.build +++ b/netwerk/protocol/app/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index 2b8933256c7e5..b7b3597c30867 100644 --- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -17,3 +17,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index 3480ccc53feeb..32fbf186c398b 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -28,3 +28,4 @@ LIBRARY_NAME = 'nkdevice_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index 179e7866d7f3c..4bd2c3eef419a 100644 --- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -26,3 +26,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index 69896082d769a..20c4cebbad7e3 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -44,3 +44,4 @@ LIBRARY_NAME = 'nkftp_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index e5e12b407d0f6..6ee029c17e521 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -103,3 +103,4 @@ LIBRARY_NAME = 'nkhttp_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 20fe7794e0513..7bcf04ce20111 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -26,3 +26,4 @@ LIBRARY_NAME = 'nkres_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/rtsp/moz.build b/netwerk/protocol/rtsp/moz.build index ff0c9b13589fe..b1d5718302b6d 100644 --- a/netwerk/protocol/rtsp/moz.build +++ b/netwerk/protocol/rtsp/moz.build @@ -49,3 +49,5 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'nkrtsp_s' include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index 34066a301c88a..baa60eeb4a5f5 100644 --- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -23,3 +23,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index adaa4251d110e..f2732f3ce944d 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -41,3 +41,4 @@ LIBRARY_NAME = 'nkwebsocket_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index 4dd55c8332811..932175b311e95 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -37,3 +37,4 @@ LIBRARY_NAME = 'nkwyciwyg_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index f7510240b2f2b..5bbf1d6c0d609 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -26,3 +26,4 @@ LIBRARY_NAME = 'nkdatachan_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build index c43b49a1f1b74..28c3b691a7ed4 100644 --- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -51,3 +51,4 @@ LIBRARY_NAME = 'nksctp_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index 5a5fd24719eea..e8d2749912ded 100644 --- a/netwerk/socket/moz.build +++ b/netwerk/socket/moz.build @@ -29,3 +29,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build index 44257beb3dc2a..e38340d55509e 100644 --- a/netwerk/srtp/src/moz.build +++ b/netwerk/srtp/src/moz.build @@ -41,3 +41,4 @@ LIBRARY_NAME = 'nksrtp_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'necko' diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index bd59ef66406f8..8074dac221020 100644 --- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -36,3 +36,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build index ca5672189d3a2..c24238200f84a 100644 --- a/netwerk/streamconv/src/moz.build +++ b/netwerk/streamconv/src/moz.build @@ -18,3 +18,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/system/android/moz.build b/netwerk/system/android/moz.build index 1cb7269b472c3..ac17d38c1e6b7 100644 --- a/netwerk/system/android/moz.build +++ b/netwerk/system/android/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/system/mac/moz.build b/netwerk/system/mac/moz.build index 2dc61a0896b8a..4a8b45fcf5f4f 100644 --- a/netwerk/system/mac/moz.build +++ b/netwerk/system/mac/moz.build @@ -16,3 +16,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/system/qt/moz.build b/netwerk/system/qt/moz.build index 57fea4f14ba97..8d97a99141f9c 100644 --- a/netwerk/system/qt/moz.build +++ b/netwerk/system/qt/moz.build @@ -21,3 +21,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/system/win32/moz.build b/netwerk/system/win32/moz.build index 6c9edc708a283..10f5233eab964 100644 --- a/netwerk/system/win32/moz.build +++ b/netwerk/system/win32/moz.build @@ -17,3 +17,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index d22e2309e317e..6fc635e268479 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -56,3 +56,4 @@ LIBRARY_NAME = 'neckowifi_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'necko' diff --git a/other-licenses/android/moz.build b/other-licenses/android/moz.build index a4daf01d99444..c062ff8f57c88 100644 --- a/other-licenses/android/moz.build +++ b/other-licenses/android/moz.build @@ -28,3 +28,5 @@ SOURCES += [ ] FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'mozglue' diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build index 3241f7a0e8924..e09d863d3923c 100644 --- a/other-licenses/skia-npapi/moz.build +++ b/other-licenses/skia-npapi/moz.build @@ -22,5 +22,4 @@ LIBRARY_NAME = 'skia_npapi' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/other-licenses/snappy/moz.build b/other-licenses/snappy/moz.build index 075c41022244e..127c525eaf747 100644 --- a/other-licenses/snappy/moz.build +++ b/other-licenses/snappy/moz.build @@ -21,5 +21,4 @@ LIBRARY_NAME = 'snappy_s' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build index aa0bc36dcc1a3..fd25980d1c660 100644 --- a/parser/expat/lib/moz.build +++ b/parser/expat/lib/moz.build @@ -23,3 +23,5 @@ MSVC_ENABLE_PGO = True # We want only the static lib, not the shared lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'gkmedias' diff --git a/parser/html/moz.build b/parser/html/moz.build index c903a68a5c37c..a9f316ceec708 100644 --- a/parser/html/moz.build +++ b/parser/html/moz.build @@ -89,3 +89,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gklayout' diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in deleted file mode 100644 index faa0b04119277..0000000000000 --- a/parser/htmlparser/src/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -SHARED_LIBRARY_LIBS = \ - $(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \ - $(NULL) diff --git a/parser/htmlparser/src/moz.build b/parser/htmlparser/src/moz.build index 0c4186c00f3fc..e076c4c6a5c0a 100644 --- a/parser/htmlparser/src/moz.build +++ b/parser/htmlparser/src/moz.build @@ -28,5 +28,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/parser/xml/src/moz.build b/parser/xml/src/moz.build index 35eb0b4d4444e..70e75838996d6 100644 --- a/parser/xml/src/moz.build +++ b/parser/xml/src/moz.build @@ -24,3 +24,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'htmlpars' diff --git a/rdf/base/src/moz.build b/rdf/base/src/moz.build index 6060813a00028..873861141c0e7 100644 --- a/rdf/base/src/moz.build +++ b/rdf/base/src/moz.build @@ -27,3 +27,4 @@ LIBRARY_NAME = 'rdfbase_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'rdf' diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 904971df01ab7..507ea2ebbfa0f 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -3,11 +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/. -SHARED_LIBRARY_LIBS = \ - ../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \ - ../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \ - $(NULL) - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/rdf/build/moz.build b/rdf/build/moz.build index 56d55422c4aa0..4ffce459f8983 100644 --- a/rdf/build/moz.build +++ b/rdf/build/moz.build @@ -18,5 +18,4 @@ LIBRARY_NAME = 'rdf' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build index 4c3a359d5e192..6a0ca5a3237b9 100644 --- a/rdf/datasource/src/moz.build +++ b/rdf/datasource/src/moz.build @@ -15,3 +15,4 @@ LIBRARY_NAME = 'rdfdatasource_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'rdf' diff --git a/rdf/util/src/internal/moz.build b/rdf/util/src/internal/moz.build index 6eeac02da1e7f..eeef9561544a3 100644 --- a/rdf/util/src/internal/moz.build +++ b/rdf/util/src/internal/moz.build @@ -13,3 +13,5 @@ SOURCES += rdf_util_src_cppsrcs LIBRARY_NAME = 'rdfutil_s' LIBXUL_LIBRARY = True + +FINAL_LIBRARY = 'xul' diff --git a/security/manager/boot/src/moz.build b/security/manager/boot/src/moz.build index 608e246a9be79..a824bc2cbdc1e 100644 --- a/security/manager/boot/src/moz.build +++ b/security/manager/boot/src/moz.build @@ -23,5 +23,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/security/manager/pki/src/moz.build b/security/manager/pki/src/moz.build index 109c801f57b1b..b683fa13674b6 100644 --- a/security/manager/pki/src/moz.build +++ b/security/manager/pki/src/moz.build @@ -21,5 +21,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build index 33bad66656262..d2c282e052df4 100644 --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -91,5 +91,4 @@ SOURCES += [ LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build index 6a117a291204b..b0df03246f8c7 100644 --- a/security/sandbox/linux/moz.build +++ b/security/sandbox/linux/moz.build @@ -20,7 +20,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'sandbox_s' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/services/crypto/component/moz.build b/services/crypto/component/moz.build index 76d6bb57ed4a9..faba2a208694d 100644 --- a/services/crypto/component/moz.build +++ b/services/crypto/component/moz.build @@ -24,5 +24,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/startupcache/moz.build b/startupcache/moz.build index 12ab26b29b60f..f8151578d4a06 100644 --- a/startupcache/moz.build +++ b/startupcache/moz.build @@ -28,5 +28,4 @@ LIBRARY_NAME = 'startupcache' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in index 895ae10234b39..e5b41f349626c 100644 --- a/storage/build/Makefile.in +++ b/storage/build/Makefile.in @@ -6,7 +6,3 @@ LOCAL_INCLUDES = \ $(SQLITE_CFLAGS) \ -I$(srcdir)/../src - -SHARED_LIBRARY_LIBS = \ - ../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \ - $(NULL) diff --git a/storage/build/moz.build b/storage/build/moz.build index 896612b8447cb..efaf73ae7c384 100644 --- a/storage/build/moz.build +++ b/storage/build/moz.build @@ -18,5 +18,4 @@ LIBRARY_NAME = 'storagecomps' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/storage/src/moz.build b/storage/src/moz.build index b80d7663615d9..efe10f60ad540 100644 --- a/storage/src/moz.build +++ b/storage/src/moz.build @@ -45,3 +45,4 @@ LIBRARY_NAME = 'storage_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'storagecomps' diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build index ed785fbd77ce7..cb3cbcec4dfc5 100644 --- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -23,3 +23,4 @@ LIBRARY_NAME = 'alerts_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build index 3167d076a38c5..8322d39a21160 100644 --- a/toolkit/components/autocomplete/moz.build +++ b/toolkit/components/autocomplete/moz.build @@ -28,5 +28,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index 8b5b776bc5041..5739ba9bb6651 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -18,32 +18,10 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../xre \ $(NULL) -SHARED_LIBRARY_LIBS = \ - ../alerts/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \ - ../find/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \ - ../typeaheadfind/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \ - ../startup/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ - ../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \ - ../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \ - ../jsdownloads/src/$(LIB_PREFIX)jsdownloads_s.$(LIB_SUFFIX) \ - ../protobuf/$(LIB_PREFIX)protobuf_s.$(LIB_SUFFIX) \ - ../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \ - ../finalizationwitness/$(LIB_PREFIX)finalizationwitness_s.$(LIB_SUFFIX) \ - $(NULL) - ifndef MOZ_DISABLE_PARENTAL_CONTROLS ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -SHARED_LIBRARY_LIBS += ../parentalcontrols/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX) LOCAL_INCLUDES += \ -I$(srcdir)/../parentalcontrols \ $(NULL) endif endif - -ifdef MOZ_URL_CLASSIFIER -SHARED_LIBRARY_LIBS += ../url-classifier/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX) -endif - -ifdef MOZ_FEEDS -SHARED_LIBRARY_LIBS += ../feeds/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX) -endif diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build index 3f0b34fbeedc2..65bb998bc8b50 100644 --- a/toolkit/components/build/moz.build +++ b/toolkit/components/build/moz.build @@ -18,5 +18,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'toolkitcomps' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build index 02f53560fadfb..b1cab58f4a73b 100644 --- a/toolkit/components/commandlines/moz.build +++ b/toolkit/components/commandlines/moz.build @@ -25,5 +25,4 @@ LIBRARY_NAME = 'commandlines' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build index dced8e53ddf16..3f6a33fe0dca8 100644 --- a/toolkit/components/ctypes/moz.build +++ b/toolkit/components/ctypes/moz.build @@ -24,5 +24,4 @@ EXTRA_JS_MODULES += [ LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/diskspacewatcher/moz.build b/toolkit/components/diskspacewatcher/moz.build index 79f512a0b2da7..d093efdaaac9c 100644 --- a/toolkit/components/diskspacewatcher/moz.build +++ b/toolkit/components/diskspacewatcher/moz.build @@ -23,7 +23,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'diskspacewatcher' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 0da3ac7cc044f..4487af8ed22c2 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -46,3 +46,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'download_s' +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/feeds/moz.build b/toolkit/components/feeds/moz.build index da58c4e5c8e99..0794c27aea717 100644 --- a/toolkit/components/feeds/moz.build +++ b/toolkit/components/feeds/moz.build @@ -30,3 +30,4 @@ LIBRARY_NAME = 'feed_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build index 5b9d086b1f477..3fc412c4612be 100644 --- a/toolkit/components/filepicker/moz.build +++ b/toolkit/components/filepicker/moz.build @@ -7,7 +7,6 @@ if CONFIG['MOZ_XUL'] and \ CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'): LIBXUL_LIBRARY = True - EXPORT_LIBRARY = True MODULE = 'filepicker' LIBRARY_NAME = 'fileview' XPIDL_SOURCES += [ @@ -25,3 +24,4 @@ if CONFIG['MOZ_XUL'] and \ DIRS += [ 'test', ] + FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/finalizationwitness/moz.build b/toolkit/components/finalizationwitness/moz.build index 92568cfad0c56..a14006b1bb252 100644 --- a/toolkit/components/finalizationwitness/moz.build +++ b/toolkit/components/finalizationwitness/moz.build @@ -26,3 +26,5 @@ LOCAL_INCLUDES += [ LIBRARY_NAME = 'finalizationwitness_s' LIBXUL_LIBRARY = True + +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/find/moz.build b/toolkit/components/find/moz.build index 6e19e7c8c0670..872acb44fec07 100644 --- a/toolkit/components/find/moz.build +++ b/toolkit/components/find/moz.build @@ -18,3 +18,4 @@ LIBRARY_NAME = 'mozfind_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/intl/moz.build b/toolkit/components/intl/moz.build index e9a9eef2fe97e..c085c03beea7f 100644 --- a/toolkit/components/intl/moz.build +++ b/toolkit/components/intl/moz.build @@ -14,3 +14,4 @@ LIBRARY_NAME = 'intl_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/jsdownloads/src/moz.build b/toolkit/components/jsdownloads/src/moz.build index 0951e13e6dbf3..9964b0bc97677 100644 --- a/toolkit/components/jsdownloads/src/moz.build +++ b/toolkit/components/jsdownloads/src/moz.build @@ -31,3 +31,5 @@ EXTRA_PP_JS_MODULES += [ 'DownloadIntegration.jsm', 'DownloadUIHelper.jsm', ] + +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build index 5e98ad6fc7cf3..13ee3ac183302 100644 --- a/toolkit/components/mediasniffer/moz.build +++ b/toolkit/components/mediasniffer/moz.build @@ -25,5 +25,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'mediasniffer' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/parentalcontrols/moz.build b/toolkit/components/parentalcontrols/moz.build index 56eb6a0cb70a4..27a13d3c10e58 100644 --- a/toolkit/components/parentalcontrols/moz.build +++ b/toolkit/components/parentalcontrols/moz.build @@ -16,3 +16,4 @@ if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS'] and CONFIG['OS_ARCH'] == 'WINNT': SOURCES += [ 'nsParentalControlsServiceWin.cpp', ] + FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build index 75c441e0b25b7..b836eac9cbd14 100644 --- a/toolkit/components/perf/moz.build +++ b/toolkit/components/perf/moz.build @@ -20,5 +20,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index e4030bd2fd5da..a3b60326af647 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -15,7 +15,6 @@ MODULE = 'places' if CONFIG['MOZ_PLACES']: LIBXUL_LIBRARY = True - EXPORT_LIBRARY = True MSVC_ENABLE_PGO = True LIBRARY_NAME = 'places' @@ -89,5 +88,6 @@ if CONFIG['MOZ_PLACES']: 'nsPlacesAutoComplete.js', 'nsPlacesAutoComplete.manifest', ] -include('/ipc/chromium/chromium-config.mozbuild') + FINAL_LIBRARY = 'xul' +include('/ipc/chromium/chromium-config.mozbuild') diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build index a456b2c61d7f7..37de36c7c0de1 100644 --- a/toolkit/components/protobuf/moz.build +++ b/toolkit/components/protobuf/moz.build @@ -48,3 +48,5 @@ SOURCES += [ LIBRARY_NAME = 'protobuf_s' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/reflect/moz.build b/toolkit/components/reflect/moz.build index 5713a23fe6b26..8684f9580b6b9 100644 --- a/toolkit/components/reflect/moz.build +++ b/toolkit/components/reflect/moz.build @@ -18,5 +18,4 @@ EXTRA_JS_MODULES += [ LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build index e27f3fc98a959..7cebfa9a07992 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -29,5 +29,4 @@ LIBRARY_NAME = 'remoteservice' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build index 47dc1b88dafcd..985db546551a6 100644 --- a/toolkit/components/satchel/moz.build +++ b/toolkit/components/satchel/moz.build @@ -46,5 +46,4 @@ EXTRA_PP_JS_MODULES += [ LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index 3b01b6adbd140..ebc68fd79dc2b 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -42,3 +42,4 @@ LIBRARY_NAME = 'appstartup_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/statusfilter/moz.build b/toolkit/components/statusfilter/moz.build index 3a2a52ae5c0c6..71b4ecc362531 100644 --- a/toolkit/components/statusfilter/moz.build +++ b/toolkit/components/statusfilter/moz.build @@ -14,3 +14,4 @@ LIBRARY_NAME = 'mozbrwsr_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index bd67d1b1b1384..68c1b0ce8dc1f 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -44,7 +44,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'telemetry' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/typeaheadfind/moz.build b/toolkit/components/typeaheadfind/moz.build index 8966faf06ac8a..8c3a6cbd186c2 100644 --- a/toolkit/components/typeaheadfind/moz.build +++ b/toolkit/components/typeaheadfind/moz.build @@ -18,3 +18,4 @@ LIBRARY_NAME = 'fastfind_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build index 8b20f2b396662..1c8e534d7d37c 100644 --- a/toolkit/components/url-classifier/moz.build +++ b/toolkit/components/url-classifier/moz.build @@ -59,3 +59,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True + +FINAL_LIBRARY = 'toolkitcomps' diff --git a/toolkit/crashreporter/breakpad-windows-libxul/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/moz.build index 1039e1aadb031..49e7f0f6b8a16 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build +++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build @@ -11,3 +11,5 @@ SOURCES += [ LIBRARY_NAME = 'google_breakpad_libxul_s' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/breakpad-windows-standalone/moz.build b/toolkit/crashreporter/breakpad-windows-standalone/moz.build index c6c131dad299f..5ed82bca5faeb 100644 --- a/toolkit/crashreporter/breakpad-windows-standalone/moz.build +++ b/toolkit/crashreporter/breakpad-windows-standalone/moz.build @@ -7,3 +7,5 @@ LIBRARY_NAME = 'google_breakpad_standalone_s' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'breakpadinjector' diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build index b36d323009ef8..a27946f7d7069 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'crash_generation_s' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build index 7c2f6ba66ce9f..b182d24e40bb3 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build @@ -18,3 +18,5 @@ XPI_NAME = 'crashreporter' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build index c09c0532ffe18..f4851b25efa3b 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build @@ -18,3 +18,5 @@ XPI_NAME = 'crashreporter' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build index 6c5eb8e606804..785eabc24b997 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build @@ -17,3 +17,5 @@ XPI_NAME = 'crashreporter' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build index 1eed3607a4876..ea3e4d42b6220 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build @@ -19,3 +19,5 @@ XPI_NAME = 'crashreporter' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/moz.build b/toolkit/crashreporter/google-breakpad/src/client/moz.build index f6288dfb2648b..d1769087d50a6 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/moz.build @@ -16,3 +16,5 @@ XPI_NAME = 'crashreporter' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build index b237905a148e4..4ef5d2fe422ba 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build @@ -18,3 +18,5 @@ XPI_NAME = 'crashreporter' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build index 03b5b59c6a0b1..c953eeba3f2d6 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build @@ -36,3 +36,5 @@ LIBRARY_NAME = 'breakpad_linux_common_s' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build index 3b61faac5d06b..b5b6139790897 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build @@ -36,3 +36,5 @@ LIBRARY_NAME = 'breakpad_mac_common_s' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build index bc7af3dffca7a..006550f09502d 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -86,3 +86,5 @@ MSVC_ENABLE_PGO = True # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build index 583375cc58bb8..e11342b629a89 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build @@ -26,3 +26,5 @@ HOST_SOURCES += [ # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/google-breakpad/src/processor/moz.build b/toolkit/crashreporter/google-breakpad/src/processor/moz.build index 1d65cb27d2442..30a62bd6dc157 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build @@ -27,3 +27,5 @@ LIBRARY_NAME = 'breakpad_sps_common_s' # need static lib FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in index 4297f4e8d56b9..0dca2779d04b0 100644 --- a/toolkit/crashreporter/injector/Makefile.in +++ b/toolkit/crashreporter/injector/Makefile.in @@ -7,8 +7,6 @@ USE_STATIC_LIBS = 1 STL_FLAGS = MOZ_GLUE_LDFLAGS = -SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX) - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index 8b20c405532f6..ba4734dd0cb56 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -86,3 +86,4 @@ LIBRARY_NAME = 'exception_handler_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/devtools/server/moz.build b/toolkit/devtools/server/moz.build index 5d32c12394198..d987ac7b8b358 100644 --- a/toolkit/devtools/server/moz.build +++ b/toolkit/devtools/server/moz.build @@ -20,5 +20,4 @@ LIBRARY_NAME = 'jsinspector' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/identity/moz.build b/toolkit/identity/moz.build index 77beab6b8046b..c2babe64bd4b9 100644 --- a/toolkit/identity/moz.build +++ b/toolkit/identity/moz.build @@ -36,5 +36,4 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index e0d85a6e4482a..9ad110bc7f4fc 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -17,39 +17,6 @@ endif VPATH += $(topsrcdir)/build/ -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/intl/unicharutil/util/internal/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) \ - $(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \ - $(DEPTH)/media/kiss_fft/$(LIB_PREFIX)kiss_fft.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef ACCESSIBILITY -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/accessible/src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ - $(DEPTH)/accessible/src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \ - $(DEPTH)/accessible/src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ - $(DEPTH)/accessible/src/xpcom/$(LIB_PREFIX)accessibility_xpcom_s.$(LIB_SUFFIX) \ - $(NULL) - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/accessible/src/windows/msaa/$(LIB_PREFIX)accessibility_toolkit_msaa_s.$(LIB_SUFFIX) \ - $(DEPTH)/accessible/src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX) \ - $(DEPTH)/accessible/src/windows/sdn/$(LIB_PREFIX)accessibility_toolkit_sdn_s.$(LIB_SUFFIX) \ - $(DEPTH)/accessible/src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX) \ - $(NULL) -else -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/accessible/src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_XUL -SHARED_LIBRARY_LIBS += $(DEPTH)/accessible/src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) -endif -endif - ifdef MOZ_CONTENT_SANDBOX ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += -I$(srcdir)/../sandboxbroker @@ -57,12 +24,10 @@ ifeq ($(OS_ARCH),WINNT) 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. +# COMPONENT_LIBS is mosly useless since bug 935881, but is kept for +# MOZ_APP_COMPONENT_LIBS, used by comm-central, and gtest linking. SHARED_LIBRARY_LIBS += \ $(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \ - $(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \ $(NULL) ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) @@ -81,55 +46,16 @@ LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base endif # dependent libraries -STATIC_LIBS += \ - jsipc_s \ - domipc_s \ - domplugins_s \ - mozipc_s \ - mozipdlgen_s \ - ipcshell_s \ - gfxipc_s \ - hal_s \ - dombindings_s \ - $(NULL) - -ifdef MOZ_CONTENT_SANDBOX #{ -ifeq ($(OS_ARCH),Linux) -STATIC_LIBS += sandbox_s -endif -endif #} - -ifdef MOZ_B2G_RIL #{ -STATIC_LIBS += mozril_s -endif #} - ifdef MOZ_B2G_BT_BLUEZ #{ -STATIC_LIBS += mozdbus_s ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) OS_LIBS += -ldbus endif endif #} -ifneq ($(strip $(MOZ_B2G_RIL)$(MOZ_B2G_BT)$(filter gonk,$(MOZ_WIDGET_TOOLKIT))),) #{ -STATIC_LIBS += mozipcunixsocket_s -endif #} - -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -STATIC_LIBS += moznetd_s mozkeystore_s -endif - ifdef MOZ_B2G_CAMERA #{ OS_LIBS += -lstagefright -lstagefright_omx endif #} -ifdef MOZ_NFC #{ -STATIC_LIBS += moznfc_s -endif #} - -ifdef MOZ_IPDL_TESTS -STATIC_LIBS += ipdlunittest_s -endif - ifeq (Linux,$(OS_ARCH)) ifneq (Android,$(OS_TARGET)) OS_LIBS += -lrt @@ -143,233 +69,48 @@ EXTRA_DEPS += symverscript endif endif -STATIC_LIBS += \ - xpcom_core \ - chromium_s \ - snappy_s \ - $(NULL) - # component libraries -COMPONENT_LIBS += \ - necko \ - uconv \ - i18n \ - chardet \ - jar \ - startupcache \ - pref \ - htmlpars \ - identity \ - imglib2 \ - mediasniffer \ - gkgfx \ - gklayout \ - embedcomponents \ - webbrwsr \ - nsappshell \ - txmgr \ - commandlines \ - toolkitcomps \ - pipboot \ - pipnss \ - appcomps \ - jsreflect \ - composer \ - telemetry \ - jsinspector \ - jsdebugger \ - storagecomps \ - rdf \ - windowds \ - diskspacewatcher \ - $(NULL) - -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/docshell/base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \ - $(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \ - $(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \ - $(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \ - $(DEPTH)/docshell/shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \ - $(DEPTH)/docshell/build/$(LIB_PREFIX)docshell.$(LIB_SUFFIX) \ - $(NULL) - -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -COMPONENT_LIBS += \ - domwifi_s \ - $(NULL) -endif - -ifdef BUILD_CTYPES -COMPONENT_LIBS += \ - jsctypes \ - $(NULL) -endif - -COMPONENT_LIBS += \ - jsperf \ - gkplugin \ - $(NULL) - -ifdef MOZ_XUL -ifdef MOZ_ENABLE_GTK -COMPONENT_LIBS += \ - unixproxy \ - $(NULL) -endif -endif - -ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) -COMPONENT_LIBS += \ - osxproxy \ - $(NULL) -endif - -ifdef MOZ_XUL -ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) -COMPONENT_LIBS += \ - unixproxy \ - $(NULL) -endif -endif - -ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) -COMPONENT_LIBS += \ - windowsproxy \ - $(NULL) -endif - -ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT))) -COMPONENT_LIBS += \ - androidproxy \ - $(NULL) -endif - ifdef MOZ_JSDEBUGGER DEFINES += -DMOZ_JSDEBUGGER -COMPONENT_LIBS += \ - jsd \ - $(NULL) endif ifdef MOZ_PREF_EXTENSIONS DEFINES += -DMOZ_PREF_EXTENSIONS -COMPONENT_LIBS += \ - autoconfig \ - $(NULL) endif ifdef MOZ_AUTH_EXTENSION -COMPONENT_LIBS += auth DEFINES += -DMOZ_AUTH_EXTENSION endif ifdef MOZ_PERMISSIONS -COMPONENT_LIBS += cookie permissions DEFINES += -DMOZ_PERMISSIONS endif ifdef MOZ_UNIVERSALCHARDET -COMPONENT_LIBS += universalchardet DEFINES += -DMOZ_UNIVERSALCHARDET endif ifeq (,$(filter android gonk qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT))) ifdef MOZ_XUL -COMPONENT_LIBS += fileview DEFINES += -DMOZ_FILEVIEW endif endif -ifdef MOZ_PLACES -COMPONENT_LIBS += \ - places \ - $(NULL) -endif - -ifdef MOZ_XUL -COMPONENT_LIBS += \ - tkautocomplete \ - satchel \ - pippki \ - $(NULL) -endif - -ifdef MOZ_ENABLE_GTK3 -COMPONENT_LIBS += widget_gtk3 -endif - -ifdef MOZ_ENABLE_GTK2 -COMPONENT_LIBS += widget_gtk2 -endif - -ifdef MOZ_ENABLE_GTK2 -ifdef MOZ_X11 -STATIC_LIBS += gtkxtbin -endif -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 -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),android) -COMPONENT_LIBS += widget_android -STATIC_LIBS += skia_npapi -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) -COMPONENT_LIBS += widget_gonk -endif - -STATIC_LIBS += thebes gl ycbcr - -ifdef MOZ_ENABLE_PROFILER_SPS -COMPONENT_LIBS += profiler -endif - -ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) -COMPONENT_LIBS += widget_windows -ifdef MOZ_METRO -COMPONENT_LIBS += widget_winrt -endif -endif -ifeq (os2,$(MOZ_WIDGET_TOOLKIT)) -COMPONENT_LIBS += wdgtos2 -endif -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -COMPONENT_LIBS += widget_mac -endif -ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) -COMPONENT_LIBS += widget_qt -endif - -ifdef MOZ_ENABLE_XREMOTE -COMPONENT_LIBS += remoteservice endif ifdef MOZ_SPELLCHECK DEFINES += -DMOZ_SPELLCHECK -COMPONENT_LIBS += spellchecker endif ifdef MOZ_ZIPWRITER DEFINES += -DMOZ_ZIPWRITER -COMPONENT_LIBS += zipwriter -endif - -COMPONENT_LIBS += services-crypto - -ifdef MOZ_DEBUG -ifdef ENABLE_TESTS -COMPONENT_LIBS += gkdebug -endif endif ifdef MOZ_GIO_COMPONENT DEFINES += -DMOZ_GIO_COMPONENT -COMPONENT_LIBS += nkgio endif ifdef MOZ_APP_COMPONENT_LIBS @@ -424,19 +165,13 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) ifdef MOZ_WEBRTC -ifdef MOZ_PEERCONNECTION -COMPONENT_LIBS += peerconnection -endif ifdef MOZ_WEBRTC_SIGNALING SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/mtransport/build/$(LIB_PREFIX)mtransport.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signaling/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signaling/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ $(NULL) endif -SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,webrtc,$(DEPTH)/layout/media/webrtc) - ifeq (WINNT,$(OS_TARGET)) EXTRA_DSO_LDOPTS += \ -LIBPATH:"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)" \ @@ -476,7 +211,6 @@ OS_LIBS += \ -lstagefright_omx \ -lbinder \ -lgui \ - $(DEPTH)/widget/gonk/nativewindow/$(LIB_PREFIX)nativewindow.$(LIB_SUFFIX) \ $(NULL) endif @@ -532,14 +266,11 @@ endif ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) EXTRA_DSO_LDOPTS += $(FT2_LIBS) $(MOZ_PANGO_LIBS) -EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/../widget/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX) endif ifdef MOZ_TREE_FREETYPE -ifndef MOZ_TREE_CAIRO EXTRA_DSO_LDOPTS += $(FT2_LIBS) endif -endif ifdef MOZ_ENABLE_STARTUP_NOTIFICATION EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS) diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index 8fe2cec10f02e..ddbc250cff852 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -27,3 +27,5 @@ LIBXUL_LIBRARY = True srcdir = '.' include('sources.mozbuild') + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build index 3f575df2a48da..464cda74ff626 100644 --- a/toolkit/profile/moz.build +++ b/toolkit/profile/moz.build @@ -30,3 +30,5 @@ LOCAL_INCLUDES += [ '../xre', '/profile/dirserviceprovider/src', ] + +FINAL_LIBRARY = 'xulapp_s' diff --git a/toolkit/system/androidproxy/moz.build b/toolkit/system/androidproxy/moz.build index f8816ca5c80a1..55f93d70ca7aa 100644 --- a/toolkit/system/androidproxy/moz.build +++ b/toolkit/system/androidproxy/moz.build @@ -14,5 +14,4 @@ LIBRARY_NAME = 'androidproxy' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/system/osxproxy/moz.build b/toolkit/system/osxproxy/moz.build index 21359590cdd77..2c169c777f0c9 100644 --- a/toolkit/system/osxproxy/moz.build +++ b/toolkit/system/osxproxy/moz.build @@ -14,5 +14,4 @@ LIBRARY_NAME = 'osxproxy' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/system/unixproxy/moz.build b/toolkit/system/unixproxy/moz.build index 3d01ec21f0e24..47206e80ee25c 100644 --- a/toolkit/system/unixproxy/moz.build +++ b/toolkit/system/unixproxy/moz.build @@ -19,5 +19,4 @@ LIBRARY_NAME = 'unixproxy' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/system/windowsproxy/moz.build b/toolkit/system/windowsproxy/moz.build index 014014635ab27..95d623b6fc690 100644 --- a/toolkit/system/windowsproxy/moz.build +++ b/toolkit/system/windowsproxy/moz.build @@ -14,5 +14,4 @@ LIBRARY_NAME = 'windowsproxy' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index b53a148b4658d..aaf486435942f 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -33,80 +33,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android) DEFINES += -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"' endif -SHARED_LIBRARY_LIBS += \ - ../profile/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef MOZ_UPDATER -ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -SHARED_LIBRARY_LIBS += \ - ../mozapps/update/common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \ - $(NULL) -endif -endif - ifdef MOZ_ENABLE_XREMOTE -SHARED_LIBRARY_LIBS += $(DEPTH)/widget/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX) LOCAL_INCLUDES += -I$(topsrcdir)/widget/xremoteclient endif -ifneq (,$(MOZ_CRASHREPORTER)$(MOZ_ENABLE_PROFILER_SPS)) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ - $(NULL) - -ifeq ($(OS_ARCH),Darwin) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) - $(NULL) -endif -ifeq ($(OS_ARCH),Linux) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \ - $(NULL) -endif -endif - -ifdef MOZ_ENABLE_PROFILER_SPS -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/processor/$(LIB_PREFIX)breakpad_sps_common_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifdef MOZ_CRASHREPORTER -SHARED_LIBRARY_LIBS += $(DEPTH)/toolkit/crashreporter/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) -ifeq ($(OS_ARCH),WINNT) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX) -endif - -ifeq ($(OS_ARCH),Darwin) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifeq ($(OS_ARCH),Linux) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/$(LIB_PREFIX)minidump_writer_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \ - $(NULL) -endif - -ifeq ($(OS_ARCH),SunOS) -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \ - $(NULL) -endif -endif - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index 880b38cbd3da5..9d9c295eb0de5 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -103,3 +103,4 @@ LIBRARY_NAME = 'xulapp_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index a155e672a456d..05280460f4916 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -8,7 +8,6 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']: FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] LIBXUL_LIBRARY = True - EXPORT_LIBRARY = True MODULE = 'profiler' LIBRARY_NAME = 'profiler' @@ -85,6 +84,8 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']: if CONFIG['ANDROID_CPU_ARCH'] == 'armeabi': DEFINES['ARCH_ARMV6'] = True + FINAL_LIBRARY = 'xul' + EXPORTS += [ 'GeckoProfiler.h', ] diff --git a/tools/trace-malloc/lib/moz.build b/tools/trace-malloc/lib/moz.build index c365c9d99e4d8..9c36b2daaf353 100644 --- a/tools/trace-malloc/lib/moz.build +++ b/tools/trace-malloc/lib/moz.build @@ -28,5 +28,4 @@ LIBRARY_NAME = 'tracemalloc' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xpcom_core' diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build index b6632708fc374..6c761fc61992c 100644 --- a/uriloader/base/moz.build +++ b/uriloader/base/moz.build @@ -36,3 +36,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'xul' diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index bc75100eb7a3a..e9207d54fa24e 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -136,3 +136,4 @@ LIBRARY_NAME = 'exthandler_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build index 682858f589b86..ebac711b447e3 100644 --- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -41,3 +41,4 @@ LIBRARY_NAME = 'prefetch_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/view/src/moz.build b/view/src/moz.build index e9b4a0d3648b9..6a08f6c78473c 100644 --- a/view/src/moz.build +++ b/view/src/moz.build @@ -19,3 +19,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'gklayout' diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index e85d74f8e6b0e..987f27e06e8ad 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -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/. -SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a - include $(topsrcdir)/config/rules.mk #DEFINES += -DDEBUG_WIDGETS diff --git a/widget/android/moz.build b/widget/android/moz.build index 0e1344dc9fae1..b526fcaec8360 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -47,7 +47,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_android' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in index 861ea021fb9da..b2047c6a2625c 100644 --- a/widget/cocoa/Makefile.in +++ b/widget/cocoa/Makefile.in @@ -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/. -SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a - include $(topsrcdir)/config/rules.mk NIB_FILES = \ diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build index 0fdf33bb79f52..70bd5f2a1b7a7 100644 --- a/widget/cocoa/moz.build +++ b/widget/cocoa/moz.build @@ -69,5 +69,4 @@ if CONFIG['TARGET_CPU'] == 'x86_64': 'ComplexTextInputPanel.mm', ] -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index a71cf32f2652f..e2479ef0dc9b9 100644 --- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -17,8 +17,6 @@ VPATH = \ $(srcdir)/libui \ $(NULL) -SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a - include $(topsrcdir)/config/rules.mk DEFINES += -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index f310da3cff3e9..ff937630be190 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -63,7 +63,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_gonk' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build index 447b8211532c2..c6d154a7c7182 100644 --- a/widget/gonk/nativewindow/moz.build +++ b/widget/gonk/nativewindow/moz.build @@ -56,3 +56,4 @@ LIBRARY_NAME = 'nativewindow' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in index d40520ac13c19..ea4f0e408e1f0 100644 --- a/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in @@ -7,8 +7,6 @@ NATIVE_THEME_SUPPORT = 1 # build our subdirs, too -SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a - ifdef NATIVE_THEME_SUPPORT DEFINES += -DNATIVE_THEME_SUPPORT endif diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build index f478d6ab0dbca..ecbe718dec6a0 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -81,7 +81,6 @@ else: 'gtk3drawing.c', ] -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build index 89d77e529ed08..81d163269c178 100644 --- a/widget/gtkxtbin/moz.build +++ b/widget/gtkxtbin/moz.build @@ -19,5 +19,4 @@ if CONFIG['MOZ_ENABLE_GTK2']: 'gtk2xtbin.c', ] -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in index d991f1517967a..21e42a878e5cc 100644 --- a/widget/os2/Makefile.in +++ b/widget/os2/Makefile.in @@ -4,9 +4,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. RESFILE = widget.res -SHARED_LIBRARY_LIBS = \ - ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ - $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/widget/os2/moz.build b/widget/os2/moz.build index a8dd9329ba9cf..c81173b7001d8 100644 --- a/widget/os2/moz.build +++ b/widget/os2/moz.build @@ -31,5 +31,4 @@ LIBRARY_NAME = 'wdgtos2' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index 55903affea6ba..ecb957c337e43 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -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/. -SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \ diff --git a/widget/qt/faststartupqt/moz.build b/widget/qt/faststartupqt/moz.build index 96338c801de30..6debcff681369 100644 --- a/widget/qt/faststartupqt/moz.build +++ b/widget/qt/faststartupqt/moz.build @@ -24,3 +24,5 @@ SOURCES += [ LIBRARY_NAME = 'faststartupqt' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xul' diff --git a/widget/qt/moz.build b/widget/qt/moz.build index 128e4362e7946..97e41369ae3c9 100644 --- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -62,7 +62,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_qt' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/shared/moz.build b/widget/shared/moz.build index 782bcf80d2293..6bad8e0adca69 100644 --- a/widget/shared/moz.build +++ b/widget/shared/moz.build @@ -21,3 +21,4 @@ LIBRARY_NAME = 'widget_shared' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xpwidgets_s' diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build index 029026fbd3e3a..15d11850d0160 100644 --- a/widget/shared/x11/moz.build +++ b/widget/shared/x11/moz.build @@ -14,3 +14,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_shared_x11' +FINAL_LIBRARY = 'xpwidgets_s' diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 73eb8052c9f8d..13c889b984f24 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -14,10 +14,6 @@ ifdef MOZ_ENABLE_D3D10_LAYER DEFINES += -DMOZ_ENABLE_D3D10_LAYER endif -SHARED_LIBRARY_LIBS = \ - ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ - $(NULL) - LOCAL_INCLUDES = \ -I. \ -I$(srcdir)/../xpwidgets \ diff --git a/widget/windows/moz.build b/widget/windows/moz.build index 930fae08357fe..1b7fc8b12ced3 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -89,7 +89,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'widget_windows' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build index 10b2b9a2351a8..26877e83ee229 100644 --- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -31,7 +31,6 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'widget_winrt' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index 7b85aee8d4a00..1fc151267535f 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -3,11 +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/. -SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX) -ifdef MOZ_X11 -SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX) -endif - ifdef MOZ_ENABLE_D3D10_LAYER DEFINES += -DMOZ_ENABLE_D3D10_LAYER endif diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build index 0d776f3e2b62a..3ddcaeb60f6db 100644 --- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -73,3 +73,9 @@ LIBRARY_NAME = 'xpwidgets_s' include('/ipc/chromium/chromium-config.mozbuild') +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + FINAL_LIBRARY = 'widget_mac' +elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gonk', 'android', 'qt', 'gtk2', 'gtk3'): + FINAL_LIBRARY = 'widget_%s' % CONFIG['MOZ_WIDGET_TOOLKIT'] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': + FINAL_LIBRARY = 'wdgtos2' diff --git a/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build index 119fc0c420315..c16d42d4ad286 100644 --- a/widget/xremoteclient/moz.build +++ b/widget/xremoteclient/moz.build @@ -11,3 +11,5 @@ PROGRAM = 'mozilla-xremote-client' LIBRARY_NAME = 'xremote_client_s' FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xulapp_s' diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 55fd7a0032b1d..e2407985882a7 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -135,3 +135,4 @@ LIBRARY_NAME = 'xpcombase_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index f2b995dea8154..c1ec63f65d73a 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -7,26 +7,6 @@ MOZILLA_INTERNAL_API = 1 -SHARED_LIBRARY_LIBS = \ - $(DEPTH)/chrome/src/$(LIB_PREFIX)chrome_s.$(LIB_SUFFIX) \ - ../ds/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \ - ../io/$(LIB_PREFIX)xpcomio_s.$(LIB_SUFFIX) \ - ../components/$(LIB_PREFIX)xpcomcomponents_s.$(LIB_SUFFIX) \ - ../threads/$(LIB_PREFIX)xpcomthreads_s.$(LIB_SUFFIX) \ - ../base/$(LIB_PREFIX)xpcombase_s.$(LIB_SUFFIX) \ - ../reflect/xptcall/src/$(LIB_PREFIX)xptcall.$(LIB_SUFFIX) \ - ../reflect/xptcall/src/$(LIB_PREFIX)xptcmd.$(LIB_SUFFIX) \ - ../reflect/xptinfo/src/$(LIB_PREFIX)xptinfo.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \ - ../string/src/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \ - $(NULL) - -ifdef NS_TRACE_MALLOC -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/tools/trace-malloc/lib/$(LIB_PREFIX)tracemalloc.$(LIB_SUFFIX) \ - $(NULL) -endif - LOCAL_INCLUDES = \ -I$(srcdir) \ -I.. \ diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index 28a2c5894d25d..783e10bf9e93d 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -65,7 +65,6 @@ MSVC_ENABLE_PGO = True LIBRARY_NAME = 'xpcom_core' -EXPORT_LIBRARY = True - include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xul' diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index 15a5c93a17668..69d9f42be5fbe 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -41,3 +41,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build index 4613ad85942bd..4dbf2f1dcd888 100644 --- a/xpcom/ds/moz.build +++ b/xpcom/ds/moz.build @@ -122,3 +122,5 @@ MSVC_ENABLE_PGO = True LOCAL_INCLUDES += [ '../io', ] + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index 8e85498dfe34a..2bc0e447fce62 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -130,3 +130,4 @@ LIBRARY_NAME = 'xpcomio_s' include('/ipc/chromium/chromium-config.mozbuild') +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in index e608ac6028e42..7b11f8d4ef181 100644 --- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in @@ -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/. -EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES = \ diff --git a/xpcom/reflect/xptcall/src/md/os2/moz.build b/xpcom/reflect/xptcall/src/md/os2/moz.build index 01ec28cc83c46..bcb5cee53bed4 100644 --- a/xpcom/reflect/xptcall/src/md/os2/moz.build +++ b/xpcom/reflect/xptcall/src/md/os2/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'xptcmd' # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 05453ff5adb11..35619db23d79c 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -5,7 +5,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1 -EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 # diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build index 5a67e6ac1afc5..4e9a245860b1a 100644 --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -326,3 +326,5 @@ LIBRARY_NAME = 'xptcmd' # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index 6e9494193bd34..53d124b16235f 100644 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -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/. -EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src diff --git a/xpcom/reflect/xptcall/src/md/win32/moz.build b/xpcom/reflect/xptcall/src/md/win32/moz.build index f739d9296c335..53728623b7cb5 100644 --- a/xpcom/reflect/xptcall/src/md/win32/moz.build +++ b/xpcom/reflect/xptcall/src/md/win32/moz.build @@ -40,3 +40,5 @@ LIBRARY_NAME = 'xptcmd' # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptcall/src/moz.build b/xpcom/reflect/xptcall/src/moz.build index 95f81a437ee3b..0faf91bb44c99 100644 --- a/xpcom/reflect/xptcall/src/moz.build +++ b/xpcom/reflect/xptcall/src/moz.build @@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True LOCAL_INCLUDES += [ '/xpcom/reflect/xptinfo/src', ] + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/reflect/xptinfo/src/moz.build b/xpcom/reflect/xptinfo/src/moz.build index bcf8f9a43ec37..90232552d15bd 100644 --- a/xpcom/reflect/xptinfo/src/moz.build +++ b/xpcom/reflect/xptinfo/src/moz.build @@ -23,3 +23,5 @@ LIBXUL_LIBRARY = True LOCAL_INCLUDES += [ '/xpcom/ds', ] + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/string/src/moz.build b/xpcom/string/src/moz.build index 2fa77f925ae8b..417bc98367248 100644 --- a/xpcom/string/src/moz.build +++ b/xpcom/string/src/moz.build @@ -36,3 +36,5 @@ MSVC_ENABLE_PGO = True # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = True + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build index 10c5758cd8a35..1aef99e1df99e 100644 --- a/xpcom/threads/moz.build +++ b/xpcom/threads/moz.build @@ -58,3 +58,5 @@ MSVC_ENABLE_PGO = True LOCAL_INCLUDES += [ '../build', ] + +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpcom/typelib/xpt/src/moz.build b/xpcom/typelib/xpt/src/moz.build index 6a72d5c985a2f..76b047fed318f 100644 --- a/xpcom/typelib/xpt/src/moz.build +++ b/xpcom/typelib/xpt/src/moz.build @@ -16,3 +16,4 @@ SOURCES += [ LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'xpcom_core' diff --git a/xpfe/appshell/src/moz.build b/xpfe/appshell/src/moz.build index 0b882dcbddfcc..ea8459abda4d5 100644 --- a/xpfe/appshell/src/moz.build +++ b/xpfe/appshell/src/moz.build @@ -29,5 +29,4 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index 103538da4c3b7..9cc702de21b75 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -3,5 +3,4 @@ # 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/. -SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) LOCAL_INCLUDES += -I$(srcdir)/../directory diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build index a901221954758..4caf0255a9c6e 100644 --- a/xpfe/components/build/moz.build +++ b/xpfe/components/build/moz.build @@ -14,5 +14,4 @@ LIBXUL_LIBRARY = True LIBRARY_NAME = 'appcomps' -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul' diff --git a/xpfe/components/directory/moz.build b/xpfe/components/directory/moz.build index a17781409c3e3..b1c02f405964d 100644 --- a/xpfe/components/directory/moz.build +++ b/xpfe/components/directory/moz.build @@ -20,3 +20,4 @@ LIBRARY_NAME = 'directory_s' LIBXUL_LIBRARY = True +FINAL_LIBRARY = 'appcomps' diff --git a/xpfe/components/windowds/moz.build b/xpfe/components/windowds/moz.build index 485487e1ee62f..fea18376a701a 100644 --- a/xpfe/components/windowds/moz.build +++ b/xpfe/components/windowds/moz.build @@ -20,5 +20,4 @@ LIBRARY_NAME = 'windowds' LIBXUL_LIBRARY = True -EXPORT_LIBRARY = True - +FINAL_LIBRARY = 'xul'