From e2a8be8006b2a25113fe16b8bd554e0319d741e0 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Thu, 11 Jul 2013 11:06:34 -0400 Subject: [PATCH] bug 887483 - remove a bunch of useless assignments to FORCE_STATIC_LIB implied by LIBXUL_LIBRARY=1 r=mshal --- accessible/src/atk/Makefile.in | 3 --- accessible/src/base/Makefile.in | 3 --- accessible/src/generic/Makefile.in | 3 --- accessible/src/html/Makefile.in | 3 --- accessible/src/mac/Makefile.in | 3 --- accessible/src/other/Makefile.in | 3 --- accessible/src/windows/ia2/Makefile.in | 3 --- accessible/src/windows/msaa/Makefile.in | 3 --- accessible/src/windows/sdn/Makefile.in | 3 --- accessible/src/windows/uia/Makefile.in | 3 --- accessible/src/xpcom/Makefile.in | 3 --- accessible/src/xul/Makefile.in | 3 --- caps/src/Makefile.in | 1 - chrome/src/Makefile.in | 1 - content/base/src/Makefile.in | 4 ---- content/canvas/src/Makefile.in | 3 --- content/events/src/Makefile.in | 3 --- content/html/content/src/Makefile.in | 3 --- content/html/document/src/Makefile.in | 3 --- content/mathml/content/src/Makefile.in | 4 ---- content/media/Makefile.in | 2 -- content/media/dash/Makefile.in | 2 -- content/media/encoder/Makefile.in | 2 -- content/media/gstreamer/Makefile.in | 2 -- content/media/ogg/Makefile.in | 2 -- content/media/omx/Makefile.in | 2 -- content/media/plugins/Makefile.in | 2 -- content/media/raw/Makefile.in | 2 -- content/media/wave/Makefile.in | 2 -- content/media/webaudio/Makefile.in | 2 -- content/media/webaudio/blink/Makefile.in | 2 -- content/media/webm/Makefile.in | 2 -- content/media/webrtc/Makefile.in | 2 -- content/media/webspeech/recognition/Makefile.in | 2 -- content/media/webspeech/synth/Makefile.in | 2 -- content/media/wmf/Makefile.in | 2 -- content/smil/Makefile.in | 3 --- content/svg/content/src/Makefile.in | 3 --- content/svg/document/src/Makefile.in | 3 --- content/xbl/src/Makefile.in | 3 --- content/xml/content/src/Makefile.in | 3 --- content/xml/document/src/Makefile.in | 3 --- content/xslt/src/base/Makefile.in | 4 ---- content/xslt/src/xml/Makefile.in | 4 ---- content/xslt/src/xpath/Makefile.in | 4 ---- content/xslt/src/xslt/Makefile.in | 4 ---- content/xul/content/src/Makefile.in | 4 ---- content/xul/document/src/Makefile.in | 4 ---- content/xul/templates/src/Makefile.in | 3 --- docshell/base/Makefile.in | 4 ---- docshell/shistory/src/Makefile.in | 1 - dom/activities/src/Makefile.in | 1 - dom/alarm/Makefile.in | 1 - dom/audiochannel/Makefile.in | 1 - dom/base/Makefile.in | 1 - dom/battery/Makefile.in | 1 - dom/bindings/Makefile.in | 1 - dom/bindings/test/Makefile.in | 1 - dom/bluetooth/Makefile.in | 1 - dom/browser-element/Makefile.in | 1 - dom/camera/Makefile.in | 1 - dom/cellbroadcast/src/Makefile.in | 1 - dom/devicestorage/Makefile.in | 1 - dom/encoding/Makefile.in | 1 - dom/file/Makefile.in | 1 - dom/fm/Makefile.in | 1 - dom/icc/src/Makefile.in | 1 - dom/indexedDB/Makefile.in | 1 - dom/indexedDB/ipc/Makefile.in | 1 - dom/interfaces/devicestorage/Makefile.in | 1 - dom/ipc/Makefile.in | 1 - dom/media/Makefile.in | 1 - dom/mobilemessage/src/Makefile.in | 1 - dom/network/src/Makefile.in | 1 - dom/plugins/base/android/Makefile.in | 1 - dom/plugins/ipc/Makefile.in | 1 - dom/power/Makefile.in | 1 - dom/promise/Makefile.in | 1 - dom/quota/Makefile.in | 1 - dom/src/events/Makefile.in | 3 --- dom/src/geolocation/Makefile.in | 2 -- dom/src/json/Makefile.in | 3 --- dom/src/jsurl/Makefile.in | 1 - dom/src/notification/Makefile.in | 2 -- dom/src/offline/Makefile.in | 3 --- dom/src/storage/Makefile.in | 3 --- dom/system/Makefile.in | 1 - dom/system/android/Makefile.in | 1 - dom/system/gonk/Makefile.in | 1 - dom/system/unix/Makefile.in | 1 - dom/system/windows/Makefile.in | 1 - dom/telephony/Makefile.in | 1 - dom/time/Makefile.in | 1 - dom/voicemail/Makefile.in | 1 - dom/wifi/Makefile.in | 1 - dom/workers/Makefile.in | 1 - editor/libeditor/base/Makefile.in | 3 --- editor/libeditor/html/Makefile.in | 3 --- editor/libeditor/text/Makefile.in | 3 --- editor/txtsvc/src/Makefile.in | 1 - embedding/browser/webBrowser/Makefile.in | 4 ---- embedding/components/appstartup/src/Makefile.in | 4 ---- embedding/components/commandhandler/src/Makefile.in | 4 ---- embedding/components/find/src/Makefile.in | 4 ---- embedding/components/printingui/src/mac/Makefile.in | 4 ---- embedding/components/printingui/src/os2/Makefile.in | 4 ---- embedding/components/printingui/src/unixshared/Makefile.in | 4 ---- embedding/components/printingui/src/win/Makefile.in | 4 ---- embedding/components/webbrowserpersist/src/Makefile.in | 4 ---- embedding/components/windowwatcher/src/Makefile.in | 4 ---- extensions/spellcheck/hunspell/src/Makefile.in | 1 - extensions/universalchardet/src/base/Makefile.in | 1 - gfx/cairo/cairo/src/Makefile.in | 2 -- gfx/cairo/libpixman/src/Makefile.in | 2 -- gfx/graphite2/src/Makefile.in | 2 +- gfx/harfbuzz/src/Makefile.in | 3 ++- gfx/ipc/Makefile.in | 1 - gfx/layers/Makefile.in | 1 - gfx/ots/src/Makefile.in | 2 +- gfx/qcms/Makefile.in | 2 -- hal/Makefile.in | 1 - image/decoders/Makefile.in | 1 - image/decoders/icon/android/Makefile.in | 3 --- image/decoders/icon/gtk/Makefile.in | 3 --- image/decoders/icon/mac/Makefile.in | 3 --- image/decoders/icon/os2/Makefile.in | 3 --- image/decoders/icon/qt/Makefile.in | 3 --- image/decoders/icon/win/Makefile.in | 3 --- image/encoders/bmp/Makefile.in | 1 - image/encoders/ico/Makefile.in | 1 - image/encoders/jpeg/Makefile.in | 1 - image/encoders/png/Makefile.in | 1 - image/src/Makefile.in | 1 - intl/locale/src/Makefile.in | 2 -- intl/locale/src/mac/Makefile.in | 1 - intl/locale/src/os2/Makefile.in | 1 - intl/locale/src/unix/Makefile.in | 1 - intl/locale/src/windows/Makefile.in | 1 - intl/lwbrk/src/Makefile.in | 1 - intl/strres/src/Makefile.in | 1 - intl/uconv/ucvcn/Makefile.in | 1 - intl/uconv/ucvibm/Makefile.in | 1 - intl/uconv/ucvja/Makefile.in | 1 - intl/uconv/ucvko/Makefile.in | 1 - intl/uconv/ucvlatin/Makefile.in | 1 - intl/uconv/ucvtw/Makefile.in | 1 - intl/uconv/ucvtw2/Makefile.in | 1 - intl/uconv/util/Makefile.in | 1 - intl/unicharutil/src/Makefile.in | 1 - ipc/chromium/Makefile.in | 1 - ipc/dbus/Makefile.in | 1 - ipc/glue/Makefile.in | 1 - ipc/ipdl/Makefile.in | 1 - ipc/ipdl/test/cxx/Makefile.in | 1 - ipc/netd/Makefile.in | 1 - ipc/nfc/Makefile.in | 1 - ipc/ril/Makefile.in | 1 - ipc/testshell/Makefile.in | 1 - ipc/unixsocket/Makefile.in | 1 - js/ipc/Makefile.in | 1 - js/xpconnect/loader/Makefile.in | 1 - js/xpconnect/src/Makefile.in | 1 - js/xpconnect/wrappers/Makefile.in | 1 - layout/base/Makefile.in | 2 -- layout/forms/Makefile.in | 3 --- layout/generic/Makefile.in | 2 -- layout/inspector/src/Makefile.in | 2 -- layout/ipc/Makefile.in | 1 - layout/mathml/Makefile.in | 4 ---- layout/printing/Makefile.in | 2 -- layout/style/Makefile.in | 2 -- layout/svg/Makefile.in | 3 --- layout/tables/Makefile.in | 3 --- layout/xul/base/src/Makefile.in | 3 --- layout/xul/grid/Makefile.in | 3 --- layout/xul/tree/Makefile.in | 3 --- netwerk/base/src/Makefile.in | 4 ---- netwerk/cache/Makefile.in | 2 -- netwerk/cookie/Makefile.in | 1 - netwerk/dash/mpd/Makefile.in | 1 - netwerk/dns/Makefile.in | 4 ---- netwerk/ipc/Makefile.in | 1 - netwerk/mime/Makefile.in | 1 - netwerk/protocol/about/Makefile.in | 2 -- netwerk/protocol/data/Makefile.in | 2 -- netwerk/protocol/device/Makefile.in | 1 - netwerk/protocol/file/Makefile.in | 2 -- netwerk/protocol/ftp/Makefile.in | 2 -- netwerk/protocol/http/Makefile.in | 1 - netwerk/protocol/res/Makefile.in | 2 -- netwerk/protocol/viewsource/Makefile.in | 2 -- netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/wyciwyg/Makefile.in | 1 - netwerk/sctp/datachannel/Makefile.in | 1 - netwerk/sctp/src/Makefile.in | 1 - netwerk/socket/Makefile.in | 1 - netwerk/srtp/src/Makefile.in | 1 - netwerk/streamconv/converters/Makefile.in | 4 ---- netwerk/streamconv/src/Makefile.in | 4 ---- netwerk/system/android/Makefile.in | 2 -- netwerk/system/mac/Makefile.in | 3 --- netwerk/system/maemo/Makefile.in | 2 -- netwerk/system/qt/Makefile.in | 2 -- netwerk/system/win32/Makefile.in | 2 -- netwerk/wifi/Makefile.in | 2 -- other-licenses/snappy/Makefile.in | 1 - parser/html/Makefile.in | 2 -- parser/xml/src/Makefile.in | 3 --- rdf/base/src/Makefile.in | 3 --- rdf/datasource/src/Makefile.in | 3 --- storage/src/Makefile.in | 1 - toolkit/components/alerts/Makefile.in | 1 - toolkit/components/downloads/Makefile.in | 1 - toolkit/components/feeds/Makefile.in | 1 - toolkit/components/find/Makefile.in | 1 - toolkit/components/intl/Makefile.in | 1 - toolkit/components/osfile/Makefile.in | 1 - toolkit/components/parentalcontrols/Makefile.in | 1 - toolkit/components/startup/Makefile.in | 1 - toolkit/components/statusfilter/Makefile.in | 1 - toolkit/components/typeaheadfind/Makefile.in | 1 - toolkit/components/url-classifier/Makefile.in | 1 - toolkit/identity/Makefile.in | 1 - toolkit/mozapps/update/common/Makefile.in | 1 - toolkit/profile/Makefile.in | 1 - toolkit/xre/Makefile.in | 2 -- tools/trace-malloc/lib/Makefile.in | 2 -- uriloader/base/Makefile.in | 3 --- uriloader/exthandler/Makefile.in | 2 -- uriloader/prefetch/Makefile.in | 3 --- view/src/Makefile.in | 1 - widget/shared/Makefile.in | 3 --- widget/shared/x11/Makefile.in | 3 --- widget/windows/Makefile.in | 2 -- widget/xpwidgets/Makefile.in | 3 --- xpcom/base/Makefile.in | 3 --- xpcom/components/Makefile.in | 3 --- xpcom/ds/Makefile.in | 3 --- xpcom/io/Makefile.in | 3 --- xpcom/threads/Makefile.in | 3 --- xpfe/components/directory/Makefile.in | 4 ---- 241 files changed, 4 insertions(+), 472 deletions(-) diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in index 7255859e668c..70be75d8af48 100644 --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -# we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk ifdef MOZ_ENABLE_GTK diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in index 9fb53fca53f1..67191a4b573d 100644 --- a/accessible/src/base/Makefile.in +++ b/accessible/src/base/Makefile.in @@ -11,9 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in index b2b938ed7058..68825db73f75 100644 --- a/accessible/src/generic/Makefile.in +++ b/accessible/src/generic/Makefile.in @@ -11,9 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in index 55b0f157172e..c73ec9317cf1 100644 --- a/accessible/src/html/Makefile.in +++ b/accessible/src/html/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in index 3f5cfc1e8d6f..90a6b6ae2d5c 100644 --- a/accessible/src/mac/Makefile.in +++ b/accessible/src/mac/Makefile.in @@ -13,9 +13,6 @@ EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in index ae3671607f36..1c65f82a96a6 100644 --- a/accessible/src/other/Makefile.in +++ b/accessible/src/other/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in index 3672bbb1f984..68a7528c813a 100644 --- a/accessible/src/windows/ia2/Makefile.in +++ b/accessible/src/windows/ia2/Makefile.in @@ -17,9 +17,6 @@ LIBXUL_LIBRARY = 1 # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in index 092deff85ed4..374684e665a3 100644 --- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -13,9 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_msaa_s EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in index b61c86a86d17..e29ceb897647 100644 --- a/accessible/src/windows/sdn/Makefile.in +++ b/accessible/src/windows/sdn/Makefile.in @@ -16,9 +16,6 @@ LIBXUL_LIBRARY = 1 # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index 86f84a2a62dd..9422f8cb6a65 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -16,9 +16,6 @@ LIBXUL_LIBRARY = 1 # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in index 31d2b799a445..e048bb5a46cc 100644 --- a/accessible/src/xpcom/Makefile.in +++ b/accessible/src/xpcom/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - EXTRA_MDDEPEND_FILES = xpcAccEvents.pp include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in index 8b134912ee08..c2dd89d8ffbf 100644 --- a/accessible/src/xul/Makefile.in +++ b/accessible/src/xul/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index 96a12d49fc43..b5804cf4278e 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 2f8a78c0811f..5ab2203e1a9b 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = chrome_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index e91a27665878..81d519ff4632 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -22,10 +22,6 @@ endif GQI_SRCS = contentbase.gqi -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - EXTRA_COMPONENTS = \ contentSecurityPolicy.manifest \ contentAreaDropListener.js \ diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index 02222034b320..33dd5329f425 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -21,9 +21,6 @@ LOCAL_INCLUDES += \ $(NULL) endif -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 4e075bdb99e9..02d732e8a473 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -15,9 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 91d7f9439889..2e22d6f51dd8 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -15,9 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index cec6a751a268..0c0768dee666 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -14,9 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index ae9b5f5e31c0..4af2e3e4b809 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -17,10 +17,6 @@ FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -# we don't want the shared lib, but we want to force the creation of a static -# lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 07b81d4fabd8..25f47121d516 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -14,8 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in index a62647dde079..40bccbe10b2e 100644 --- a/content/media/dash/Makefile.in +++ b/content/media/dash/Makefile.in @@ -17,8 +17,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY := 1 -FORCE_STATIC_LIB := 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES := \ diff --git a/content/media/encoder/Makefile.in b/content/media/encoder/Makefile.in index 698bdde67813..c4e33711a8ee 100644 --- a/content/media/encoder/Makefile.in +++ b/content/media/encoder/Makefile.in @@ -13,6 +13,4 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in index db8f4ca30e5e..86cc606de10d 100644 --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk CFLAGS += $(GSTREAMER_CFLAGS) diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in index 8f3e75fb1fdf..86df1d7589af 100644 --- a/content/media/ogg/Makefile.in +++ b/content/media/ogg/Makefile.in @@ -13,6 +13,4 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in index 9717543d3445..791e89f17f63 100644 --- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconomx_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in index 67c77c2988b9..105ec7f29a5d 100644 --- a/content/media/plugins/Makefile.in +++ b/content/media/plugins/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in index 8a2b174074f2..57d9b3875560 100644 --- a/content/media/raw/Makefile.in +++ b/content/media/raw/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in index f2270281fb40..519c470e12b0 100644 --- a/content/media/wave/Makefile.in +++ b/content/media/wave/Makefile.in @@ -13,6 +13,4 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in index bf4acb3bb77f..dca187ece60f 100644 --- a/content/media/webaudio/Makefile.in +++ b/content/media/webaudio/Makefile.in @@ -13,7 +13,5 @@ LIBRARY_NAME := gkconwebaudio_s LIBXUL_LIBRARY := 1 FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in index 29d314bc71c3..2cf75e7cd960 100644 --- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME := gkconwebaudio_blink_s LIBXUL_LIBRARY := 1 -FORCE_STATIC_LIB := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in index a6b2b587f650..22d53ba6ae04 100644 --- a/content/media/webm/Makefile.in +++ b/content/media/webm/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in index b12f5b2f66ad..726ff7c703e0 100644 --- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -16,8 +16,6 @@ ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in index a8e30c4d09ec..629b545cb1cd 100644 --- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -19,8 +19,6 @@ LIBXUL_LIBRARY := 1 LOCAL_INCLUDES += $(VPATH:%=-I%) -FORCE_STATIC_LIB := 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index 7e1d90922f5b..0bea909175ca 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -22,8 +22,6 @@ LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += $(VPATH:%=-I%) -FORCE_STATIC_LIB := 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in index 7a65e06946c4..8f6dd8fb8579 100644 --- a/content/media/wmf/Makefile.in +++ b/content/media/wmf/Makefile.in @@ -16,6 +16,4 @@ ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index 62777db54aef..bc14142671b1 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -16,9 +16,6 @@ FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - INCLUDES += \ -I$(srcdir)/../base/src \ -I$(srcdir)/../../layout/style \ diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index 4a9d8ca64144..1512bdd64445 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -17,9 +17,6 @@ FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in index e6e3af8a80fd..3394da3e5a8c 100644 --- a/content/svg/document/src/Makefile.in +++ b/content/svg/document/src/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 590e8a05537a..a636edfd6101 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -17,9 +17,6 @@ FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index 3d666d408e22..644faeb48096 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -14,9 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index e3df3b4b4eac..b3bbdd2bc085 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -14,9 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index 4dd5624f7cb5..70ca9d5dd330 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index c47593c7b6ed..590169fc38c2 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index 5bce765a2d38..9c3cd97af495 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index 531a1fc8a01e..1f2221c8ed4e 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -17,10 +17,6 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - EXTRA_COMPONENTS = \ txEXSLTRegExFunctions.js \ txEXSLTRegExFunctions.manifest \ diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index de815cef87e2..d2ddab7f9f9f 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -16,10 +16,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 endif -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index 761994957d0e..227abf5788e1 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index 0aa700892816..6cd559f6200e 100644 --- a/content/xul/templates/src/Makefile.in +++ b/content/xul/templates/src/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index a957271c20bb..62897d9c94ea 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -19,10 +19,6 @@ ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index 2d2064519019..7fecb85a394d 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index 01407683640b..c648cc0abdd8 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_activities_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index 021ab1f1cf01..8f11898d37b1 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domalarm_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in index 6c0f3452d23a..b60fbd5e9af9 100644 --- a/dom/audiochannel/Makefile.in +++ b/dom/audiochannel/Makefile.in @@ -21,7 +21,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domaudiochannel_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 45b010324d00..398cc8671eb6 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdombase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index b93ed50009c9..5eb26d85fc4e 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_battery_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index f4a52313866f..1edd2a5d7548 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ LIBRARY_NAME = dombindings_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in index 2aacb59de809..1578f70ed8d0 100644 --- a/dom/bindings/test/Makefile.in +++ b/dom/bindings/test/Makefile.in @@ -10,7 +10,6 @@ relativesrcdir = @relativesrcdir@ LIBRARY_NAME = dombindings_test_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 # Do NOT export this library. We don't actually want our test code # being added to libxul or anything. diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index 3d9645d44bb2..dd16996fea6d 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -27,7 +27,6 @@ ifneq (,$(MOZ_B2G_BT)) LIBRARY_NAME = dombluetooth_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) VPATH += \ diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index 3c60ddfd8499..de8b43ae10cb 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_browserelement_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index b48832cc5359..85644a299838 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domcamera_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in index e63dece92a67..658a2a1fef5a 100644 --- a/dom/cellbroadcast/src/Makefile.in +++ b/dom/cellbroadcast/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_cellbroadcast_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index 8b9d6d345fd7..d2f76809a309 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domdevicestorage_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index b9c542d8618d..8d624d68d205 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domencoding_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/locale/src \ diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in index e67d175fa93b..2e7f112a29b7 100644 --- a/dom/file/Makefile.in +++ b/dom/file/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domfile_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/fm/Makefile.in b/dom/fm/Makefile.in index c7f1c00b84e0..99fe83fbcd01 100644 --- a/dom/fm/Makefile.in +++ b/dom/fm/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domfm_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index a2fed74976c6..c271e775a7bd 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_icc_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index 9f2bec084581..53958a42363b 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_indexeddb_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 LOCAL_INCLUDES = \ diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index 1560cdf0cc0e..bbc9f6a9df84 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_indexeddb_ipc_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/indexedDB \ diff --git a/dom/interfaces/devicestorage/Makefile.in b/dom/interfaces/devicestorage/Makefile.in index 250734e239fe..94cd8d2b636b 100644 --- a/dom/interfaces/devicestorage/Makefile.in +++ b/dom/interfaces/devicestorage/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domdevicestorage_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index ebc1d64c1fd4..2159ed493af8 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domipc_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index 85a83b494a08..143d11475185 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_media_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 7c9797b42c78..58f42e3c27da 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -23,7 +23,6 @@ endif LIBRARY_NAME = dom_mobilemessage_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index 64041d247bda..cce9ca571d22 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_network_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index 5643eaeaa951..456d71721802 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkpluginandroid_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index 5b35713eb772..c65f020c9655 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -13,7 +13,6 @@ FAIL_ON_WARNINGS := 1 LIBRARY_NAME = domplugins_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 ifeq (WINNT,$(OS_ARCH)) diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index 749052f3351f..d498ba459e51 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_power_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in index d0753717ae57..fdab90659e19 100644 --- a/dom/promise/Makefile.in +++ b/dom/promise/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dompromise_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/config/config.mk diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index c1cdd8796374..1f0a98bf2c7a 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domquota_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 38501ec0499f..fd9745eac083 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -14,9 +14,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/dom/base diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index d0589025f9c3..a16f71d8b205 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomgeolocation_s LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 LOCAL_INCLUDES = \ diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index cd89640da659..c5ff6f9c1e31 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 - -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../base \ -I$(topsrcdir)/content/events/src diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index 3ea28df02680..28770ed69b38 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -11,7 +11,6 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index 505d4d86e653..1c509fda82e4 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomnotification_s LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 LOCAL_INCLUDES = \ diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index e411bf2f9189..a527d6a374d9 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index ea29f30e8f7a..fc7b514e4a67 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -15,9 +15,6 @@ LIBRARY_NAME = jsdomstorage_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index 00ecde4333dd..adf9beeea120 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -47,7 +47,6 @@ include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index eb9bd9fbb594..7cbf2188bea9 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -13,7 +13,6 @@ LIBRARY_NAME = domsystemandroid_s # we don't want the shared lib, but we want to force the creation of a static lib. LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index 2e10af42b83b..ffa78c0c7988 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -23,7 +23,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemgonk_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index 0ecbfcc0dd9d..c5e1630df7eb 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -13,7 +13,6 @@ LIBRARY_NAME = domsystemunix_s # we don't want the shared lib, but we want to force the creation of a static lib. LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index 40eeb21781aa..ed022043c095 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -13,7 +13,6 @@ LIBRARY_NAME = domsystemwindows_s # we don't want the shared lib, but we want to force the creation of a static lib. LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index c5f133971537..7b47c9360ae2 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domtelephony_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 07cf3a2e21c6..413b83546337 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_time_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in index dbd90461c926..5da1f55de226 100644 --- a/dom/voicemail/Makefile.in +++ b/dom/voicemail/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domvoicemail_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/wifi/Makefile.in b/dom/wifi/Makefile.in index d0d91c2674da..3f1c2dd4fa43 100644 --- a/dom/wifi/Makefile.in +++ b/dom/wifi/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domwifi_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index abc98f3ab9ac..9e901ac69a99 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 LOCAL_INCLUDES = \ diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 78ce8166bb43..743a9d36e431 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -17,9 +17,6 @@ FAIL_ON_WARNINGS = 1 # Internal header files, needed by other editor sublibs: INTERNAL_HDR_DIR = ../internal -# don't want the shared lib; force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index 396629d73ab2..563663147be3 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -22,9 +22,6 @@ endif DEFINES += -D_IMPL_NS_LAYOUT -# don't want the shared lib; force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/editor/libeditor/base \ diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index 4842b6803d38..abf29f57fbc2 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# don't want the shared lib; force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in index c8c22a1bb008..58dd5e52834c 100644 --- a/editor/txtsvc/src/Makefile.in +++ b/editor/txtsvc/src/Makefile.in @@ -11,7 +11,6 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index 1c03b264badb..c102390464be 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -19,8 +19,4 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../../content/svg/content/src \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in index 97b298bfadc4..a688d9264c3a 100644 --- a/embedding/components/appstartup/src/Makefile.in +++ b/embedding/components/appstartup/src/Makefile.in @@ -13,9 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/commandhandler/src/Makefile.in b/embedding/components/commandhandler/src/Makefile.in index 97b298bfadc4..a688d9264c3a 100644 --- a/embedding/components/commandhandler/src/Makefile.in +++ b/embedding/components/commandhandler/src/Makefile.in @@ -13,9 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in index 97b298bfadc4..a688d9264c3a 100644 --- a/embedding/components/find/src/Makefile.in +++ b/embedding/components/find/src/Makefile.in @@ -13,9 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index f040df871eec..d28673d00abe 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -19,9 +19,5 @@ FAIL_ON_WARNINGS = 1 LOCAL_INCLUDES = \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in index e710e153df6a..d04671e0e073 100644 --- a/embedding/components/printingui/src/os2/Makefile.in +++ b/embedding/components/printingui/src/os2/Makefile.in @@ -13,9 +13,5 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in index f698cb578170..766378c7d0ab 100644 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ b/embedding/components/printingui/src/unixshared/Makefile.in @@ -14,9 +14,5 @@ EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in index f698cb578170..766378c7d0ab 100644 --- a/embedding/components/printingui/src/win/Makefile.in +++ b/embedding/components/printingui/src/win/Makefile.in @@ -14,9 +14,5 @@ EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in index 97b298bfadc4..a688d9264c3a 100644 --- a/embedding/components/webbrowserpersist/src/Makefile.in +++ b/embedding/components/webbrowserpersist/src/Makefile.in @@ -13,9 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index 26be09244f4d..34e87f5c6e03 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/embedding/components/windowwatcher/src/Makefile.in @@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - # For nsJSUtils LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in index ddaddede2934..12625a2edb70 100644 --- a/extensions/spellcheck/hunspell/src/Makefile.in +++ b/extensions/spellcheck/hunspell/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/extensions/universalchardet/src/base/Makefile.in b/extensions/universalchardet/src/base/Makefile.in index 9666019f3f57..104378a1773a 100644 --- a/extensions/universalchardet/src/base/Makefile.in +++ b/extensions/universalchardet/src/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 708243b99195..6b1337866369 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -173,8 +173,6 @@ endif LOCAL_INCLUDES += -I$(srcdir) -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk ifdef GNU_CC diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index a341b84261f6..97256f8abe56 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -150,8 +150,6 @@ endif LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../../cairo/src -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in index 38b7daa095e9..2f031238b1b0 100644 --- a/gfx/graphite2/src/Makefile.in +++ b/gfx/graphite2/src/Makefile.in @@ -26,13 +26,13 @@ MSVC_ENABLE_PGO := 1 # on Windows, we're going to link graphite with gkmedias instead of libxul ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = +FORCE_STATIC_LIB = 1 else LIBXUL_LIBRARY = 1 endif # MSVC doesn't like the paths in _SOURCES, so strip off the prefix # and leave bare filenames -FORCE_STATIC_LIB = 1 FORCE_USE_PIC = 1 ifeq (WINNT,$(OS_TARGET)) diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in index c86193e2c3ab..f7479e374271 100644 --- a/gfx/harfbuzz/src/Makefile.in +++ b/gfx/harfbuzz/src/Makefile.in @@ -35,11 +35,12 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 ifneq ($(OS_ARCH),WINNT) LIBXUL_LIBRARY = 1 +else +FORCE_STATIC_LIB = 1 endif LOCAL_INCLUDES += -I$(srcdir) -FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index aab4a99e9969..85d20ca031b9 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gfxipc_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 4b4d38541ca9..4440ab86fc69 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -23,7 +23,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = layers MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 DEFINES += -DIMPL_THEBES ifdef MOZ_DEBUG diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in index 0486f83682d7..ff582f524ffb 100644 --- a/gfx/ots/src/Makefile.in +++ b/gfx/ots/src/Makefile.in @@ -33,10 +33,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = +FORCE_STATIC_LIB = 1 else LIBXUL_LIBRARY = 1 endif diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in index 625d025b2a1f..1bf4698994a0 100644 --- a/gfx/qcms/Makefile.in +++ b/gfx/qcms/Makefile.in @@ -57,8 +57,6 @@ endif endif endif -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk CFLAGS += -DMOZ_QCMS diff --git a/hal/Makefile.in b/hal/Makefile.in index 1fc11f9386a3..1c393da459fe 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -22,7 +22,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = hal_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in index c23e5926d969..8fc0569e1f71 100644 --- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in index f46d73036a8b..89d1eeb7342c 100644 --- a/image/decoders/icon/android/Makefile.in +++ b/image/decoders/icon/android/Makefile.in @@ -13,9 +13,6 @@ LIBRARY_NAME = imgiconandroid_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in index 7456c6c95eb7..4f7f51b91a36 100644 --- a/image/decoders/icon/gtk/Makefile.in +++ b/image/decoders/icon/gtk/Makefile.in @@ -19,8 +19,5 @@ else LOCAL_INCLUDES += $(TK_CFLAGS) endif -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/mac/Makefile.in b/image/decoders/icon/mac/Makefile.in index 3c8948c013ed..9eaddda84d76 100644 --- a/image/decoders/icon/mac/Makefile.in +++ b/image/decoders/icon/mac/Makefile.in @@ -14,7 +14,4 @@ FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/os2/Makefile.in b/image/decoders/icon/os2/Makefile.in index 79f28f22d0dc..091686b75ba4 100644 --- a/image/decoders/icon/os2/Makefile.in +++ b/image/decoders/icon/os2/Makefile.in @@ -12,8 +12,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in index 20ddb8fc5730..282c6d1eb7be 100644 --- a/image/decoders/icon/qt/Makefile.in +++ b/image/decoders/icon/qt/Makefile.in @@ -14,9 +14,6 @@ LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - EXTRA_COMPONENTS = gtkqticonsconverter.manifest include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/win/Makefile.in b/image/decoders/icon/win/Makefile.in index b491b566bea5..8dc0a33fdd0f 100644 --- a/image/decoders/icon/win/Makefile.in +++ b/image/decoders/icon/win/Makefile.in @@ -13,8 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in index 781bc2063671..0416c5b51943 100644 --- a/image/encoders/bmp/Makefile.in +++ b/image/encoders/bmp/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in index 091673b120c8..88c17df739f7 100644 --- a/image/encoders/ico/Makefile.in +++ b/image/encoders/ico/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/image/encoders/jpeg/Makefile.in b/image/encoders/jpeg/Makefile.in index c6e9a4396a73..93592f5c0223 100644 --- a/image/encoders/jpeg/Makefile.in +++ b/image/encoders/jpeg/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in index 5dd4b60b8636..2797257edcf7 100644 --- a/image/encoders/png/Makefile.in +++ b/image/encoders/png/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/image/src/Makefile.in b/image/src/Makefile.in index 56b61d300a91..aa9ff826a953 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = imglib2_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index 7840263c1d8f..34d548b5e122 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -22,8 +22,6 @@ EXPORT_RESOURCE = \ $(srcdir)/language.properties \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/uconv/src \ diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in index 2a06e0e1e955..40133bb53267 100644 --- a/intl/locale/src/mac/Makefile.in +++ b/intl/locale/src/mac/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in index be245b34940c..40e7f3a1cfcb 100644 --- a/intl/locale/src/os2/Makefile.in +++ b/intl/locale/src/os2/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in index 2e1d2bacaf66..02eec2debe50 100644 --- a/intl/locale/src/unix/Makefile.in +++ b/intl/locale/src/unix/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB= 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in index 943cde4d7cd4..491834017aef 100644 --- a/intl/locale/src/windows/Makefile.in +++ b/intl/locale/src/windows/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index 65b10a1a70c1..bc3186681768 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in index b9b1d0d23875..0b356512efac 100644 --- a/intl/strres/src/Makefile.in +++ b/intl/strres/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index f333555fe9b0..cc8665fc944d 100644 --- a/intl/uconv/ucvcn/Makefile.in +++ b/intl/uconv/ucvcn/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index 5e5d3a0eb92e..f20937b5c24a 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = -I$(srcdir)/../util diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in index c933518ab12d..dc902b449215 100644 --- a/intl/uconv/ucvja/Makefile.in +++ b/intl/uconv/ucvja/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index 31511463b152..23bf9407313b 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index f9e298133ca5..81344835860b 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index f333555fe9b0..cc8665fc944d 100644 --- a/intl/uconv/ucvtw/Makefile.in +++ b/intl/uconv/ucvtw/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index 2ed65784960c..dc902b449215 100644 --- a/intl/uconv/ucvtw2/Makefile.in +++ b/intl/uconv/ucvtw2/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index edfa1fb6111d..14ad5ad0211f 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 CSRCS = \ diff --git a/intl/unicharutil/src/Makefile.in b/intl/unicharutil/src/Makefile.in index 9666019f3f57..104378a1773a 100644 --- a/intl/unicharutil/src/Makefile.in +++ b/intl/unicharutil/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index 04307a804501..33af2a670a0a 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) LIBRARY_NAME = chromium_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in index 60d72176c230..7a50377d2e69 100644 --- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozdbus_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index bfec1ef4ccd8..6e34856d622d 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter LIBRARY_NAME = mozipc_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 88c2c8e8e031..3d0dc862fa7c 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -13,7 +13,6 @@ GARBAGE_DIRS += _ipdlheaders GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc) LIBRARY_NAME = mozipdlgen_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in index e207fcb59a0f..d638de7c74bd 100644 --- a/ipc/ipdl/test/cxx/Makefile.in +++ b/ipc/ipdl/test/cxx/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = $(MODULE)_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 IPDLTESTS = \ diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in index 7c90dd9782a0..6c131b580baf 100644 --- a/ipc/netd/Makefile.in +++ b/ipc/netd/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = moznetd_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in index 86fb1b77e84b..030939584a97 100644 --- a/ipc/nfc/Makefile.in +++ b/ipc/nfc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = moznfc_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in index cc3792182f4b..08a9aa992174 100644 --- a/ipc/ril/Makefile.in +++ b/ipc/ril/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozril_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index 960615db84fa..84d38bddceed 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -12,7 +12,6 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = ipcshell_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in index 8ff84f39ca8d..3f1ef516ccaa 100644 --- a/ipc/unixsocket/Makefile.in +++ b/ipc/unixsocket/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozipcunixsocket_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index f525f3126648..d134e6f58148 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsipc_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in index 6b5e2eb92400..d0fabaabdb7e 100644 --- a/js/xpconnect/loader/Makefile.in +++ b/js/xpconnect/loader/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk FAIL_ON_WARNINGS := 1 MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../src \ diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 6bc24a0181a6..3311972c5fa1 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpconnect_s MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in index 532a60f25ee1..d14718b6e3a5 100644 --- a/js/xpconnect/wrappers/Makefile.in +++ b/js/xpconnect/wrappers/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 ifndef _MSC_VER # warning C4661 for FilteringWrapper FAIL_ON_WARNINGS := 1 diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index c6b973ff9175..2eb3cf37b366 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -15,8 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index b1876bc6ab29..309a08882b5c 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -14,9 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index f10d4bcd69ee..5f5daa35c0d7 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -20,8 +20,6 @@ RESOURCES_HTML = \ $(srcdir)/folder.png \ $(NULL) -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 6307f836ca14..2ee11661279a 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES += \ -I$(srcdir)/../../style \ -I$(topsrcdir)/content/base/src \ diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 7c7a54111ebd..ad5e9249f4e5 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkipc_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index c00a8a2867a3..0dff8229a53c 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -28,10 +28,6 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/config.mk -# we don't want the shared lib, but we want to force the creation of a static lib. -# do we still want this? - DJF -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk font_properties = \ diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index 5422ff2f24e2..db5a3c1ba8d7 100644 --- a/layout/printing/Makefile.in +++ b/layout/printing/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index d1e7c7f43c2d..76769c5174f0 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -19,8 +19,6 @@ OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow endif -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index 885b2b898720..51613e3f1e46 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -17,9 +17,6 @@ FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index bce41cf36f37..6b326a4baa1e 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -14,9 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DDEBUG_TABLE_STRATEGY_off -D_IMPL_NS_LAYOUT diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 25bd6f144cda..7a5b161be309 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -16,9 +16,6 @@ FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/config.mk -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in index 964a8fb1daed..6ecbd6a0614e 100644 --- a/layout/xul/grid/Makefile.in +++ b/layout/xul/grid/Makefile.in @@ -21,9 +21,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../forms \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_LAYOUT diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in index 629c90245c09..5c80cd85e3de 100644 --- a/layout/xul/tree/Makefile.in +++ b/layout/xul/tree/Makefile.in @@ -24,9 +24,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../forms \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_LAYOUT diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index ca91945a9c4a..4b7121cd5150 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -28,10 +28,6 @@ ifdef MOZ_ENABLE_QTNETWORK endif endif -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index 0ad1f4fb7d07..6613fc656800 100644 --- a/netwerk/cache/Makefile.in +++ b/netwerk/cache/Makefile.in @@ -14,8 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ $(NULL) diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 024ad331498c..61c590238e7d 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -18,7 +18,6 @@ ifdef NECKO_COOKIES LIBRARY_NAME = neckocookie_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/uconv/src \ diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in index 9c4b751867d8..e8196a5ac21a 100644 --- a/netwerk/dash/mpd/Makefile.in +++ b/netwerk/dash/mpd/Makefile.in @@ -16,7 +16,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY := 1 -FORCE_STATIC_LIB := 1 LOCAL_INCLUDES := \ -I$(topsrcdir)/content/base/src \ diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index 76e7805b5a56..1e1ed0b92b5c 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -20,10 +20,6 @@ DISABLED_CSRCS = \ punycode.c \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - # need to include etld_data.inc LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index b6b60ba20213..80e5560a15f7 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = neckoipc_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../protocol/http \ diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index b838f3d42981..18d8d2059b77 100644 --- a/netwerk/mime/Makefile.in +++ b/netwerk/mime/Makefile.in @@ -14,7 +14,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index ca0b6151aff8..8473daa34131 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -14,8 +14,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkabout_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in index 9f9e56c7a99f..82157dddcb8a 100644 --- a/netwerk/protocol/data/Makefile.in +++ b/netwerk/protocol/data/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index cc64f19d36e5..58969b3d25fa 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -11,7 +11,6 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkdevice_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \ diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index 954284c0bd80..ae1e76ac72f2 100644 --- a/netwerk/protocol/file/Makefile.in +++ b/netwerk/protocol/file/Makefile.in @@ -14,8 +14,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index dedc936c6537..082abf4393cf 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -15,8 +15,6 @@ LIBRARY_NAME = nkftp_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 67949f995a17..ca613e07aef3 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkhttp_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 LOCAL_INCLUDES = \ diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index b316ed3e53a9..ff77c4fa0f17 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -15,8 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in index bc10c1702ce2..7057c5829231 100644 --- a/netwerk/protocol/viewsource/Makefile.in +++ b/netwerk/protocol/viewsource/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 45d0040c4900..d891d144a6ff 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwebsocket_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS = 1 LOCAL_INCLUDES = \ diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index ac38eb4dacf7..753a345072e7 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwyciwyg_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS = 1 LOCAL_INCLUDES = \ diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index b74e7396a278..e3677a297c19 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkdatachan_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO FAIL_ON_WARNINGS = 1 diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 42b0456eace9..f88b0332d917 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -16,7 +16,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nksctp_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO DISABLED_CSRCS = \ diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in index a29d4e20688f..f49b7ccf5285 100644 --- a/netwerk/socket/Makefile.in +++ b/netwerk/socket/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index b72b774e046f..42d5f1bef274 100644 --- a/netwerk/srtp/src/Makefile.in +++ b/netwerk/srtp/src/Makefile.in @@ -22,7 +22,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nksrtp_s LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 DISABLED_CSRCS := \ ekt.c \ diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 438830826db6..88f43eb0d300 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -14,10 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index 7db8b1d95f50..18d77d5eedee 100644 --- a/netwerk/streamconv/src/Makefile.in +++ b/netwerk/streamconv/src/Makefile.in @@ -20,10 +20,6 @@ FAIL_ON_WARNINGS := 1 endif endif -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index 23b2f87b5f2e..6537c64d24b9 100644 --- a/netwerk/system/android/Makefile.in +++ b/netwerk/system/android/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in index 5cd5eabb4a58..211db0b53f47 100644 --- a/netwerk/system/mac/Makefile.in +++ b/netwerk/system/mac/Makefile.in @@ -13,8 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in index befd8d4fb22b..f72f7ec5aad9 100644 --- a/netwerk/system/maemo/Makefile.in +++ b/netwerk/system/maemo/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index 0cb5970932e8..44dcd56022ac 100644 --- a/netwerk/system/qt/Makefile.in +++ b/netwerk/system/qt/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in index aba837cc84c6..0a793f9f27d6 100644 --- a/netwerk/system/win32/Makefile.in +++ b/netwerk/system/win32/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index 39d736437f89..f553daee29c0 100644 --- a/netwerk/wifi/Makefile.in +++ b/netwerk/wifi/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - ifneq ($(OS_ARCH),Darwin) # osx_corewlan.mm has warnings I don't understand. FAIL_ON_WARNINGS := 1 diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in index 50e93756e947..a57131a9ca06 100644 --- a/other-licenses/snappy/Makefile.in +++ b/other-licenses/snappy/Makefile.in @@ -13,7 +13,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in index 23273b0d4885..d44d6e0e620b 100644 --- a/parser/html/Makefile.in +++ b/parser/html/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in index c95f8f2a4315..0c4bae861640 100644 --- a/parser/xml/src/Makefile.in +++ b/parser/xml/src/Makefile.in @@ -14,7 +14,4 @@ MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1 - -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/rdf/base/src/Makefile.in b/rdf/base/src/Makefile.in index 541ee89b71c8..99d07d15669e 100644 --- a/rdf/base/src/Makefile.in +++ b/rdf/base/src/Makefile.in @@ -12,8 +12,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in index c7cfa70aedee..ed191e44d09c 100644 --- a/rdf/datasource/src/Makefile.in +++ b/rdf/datasource/src/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk # XXX This is a dependency on rdfutil.h: it'll go away once that becomes diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in index c9dbd03f4ca2..74b6a3a8f479 100644 --- a/storage/src/Makefile.in +++ b/storage/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 # TODO: we do this in crashreporter and xpcom/base too, should be centralized diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index 578eb76956b9..4e19d89a59d9 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = alerts_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index 7a6c26d92d28..c04ff6967f91 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = download_s -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in index 7be0703ede72..84fd69aa96c7 100644 --- a/toolkit/components/feeds/Makefile.in +++ b/toolkit/components/feeds/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MOZILLA_INTERNAL_API = 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/toolkit/components/find/Makefile.in b/toolkit/components/find/Makefile.in index ea89e3cf6dd6..35fbe699bd1a 100644 --- a/toolkit/components/find/Makefile.in +++ b/toolkit/components/find/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/intl/Makefile.in b/toolkit/components/intl/Makefile.in index d17140f1017e..dbc3e1df5120 100644 --- a/toolkit/components/intl/Makefile.in +++ b/toolkit/components/intl/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/osfile/Makefile.in b/toolkit/components/osfile/Makefile.in index d6abd86de524..651502dd640a 100644 --- a/toolkit/components/osfile/Makefile.in +++ b/toolkit/components/osfile/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 EXTRA_PP_JS_MODULES = \ osfile.jsm \ diff --git a/toolkit/components/parentalcontrols/Makefile.in b/toolkit/components/parentalcontrols/Makefile.in index daabe6e9df0a..54eb37cda169 100644 --- a/toolkit/components/parentalcontrols/Makefile.in +++ b/toolkit/components/parentalcontrols/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk ifndef MOZ_DISABLE_PARENTAL_CONTROLS ifeq (WINNT,$(OS_ARCH)) -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 endif endif diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in index b5200d4e3a65..97e8f4373662 100644 --- a/toolkit/components/startup/Makefile.in +++ b/toolkit/components/startup/Makefile.in @@ -10,7 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) diff --git a/toolkit/components/statusfilter/Makefile.in b/toolkit/components/statusfilter/Makefile.in index e4c7485a6a5d..18047041218f 100644 --- a/toolkit/components/statusfilter/Makefile.in +++ b/toolkit/components/statusfilter/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/toolkit/components/typeaheadfind/Makefile.in b/toolkit/components/typeaheadfind/Makefile.in index 0524f3b2ab94..7948ee6dcd43 100644 --- a/toolkit/components/typeaheadfind/Makefile.in +++ b/toolkit/components/typeaheadfind/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index c46b30d3728a..f8a78915b07b 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS = 1 LOCAL_INCLUDES = \ diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in index 660372af49e6..ff9d29f6923e 100644 --- a/toolkit/identity/Makefile.in +++ b/toolkit/identity/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk FAIL_ON_WARNINGS := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in index daf26cda760b..4295e12fd974 100644 --- a/toolkit/mozapps/update/common/Makefile.in +++ b/toolkit/mozapps/update/common/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB =1 LIBXUL_LIBRARY = 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index 7b75a3e30b44..4d53045753f1 100644 --- a/toolkit/profile/Makefile.in +++ b/toolkit/profile/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 28621dc7e524..6319810dedfb 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -21,8 +21,6 @@ LIBRARY_NAME = xulapp_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FORCE_STATIC_LIB = 1 - ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX) DEFINES += -DUSE_GLX_TEST endif diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index e96c0f688a8d..b46b484855da 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 DEFFILE = $(win_srcdir)/tm.def -FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 STL_FLAGS = diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index 20676731a9e3..dc9ad52d4741 100644 --- a/uriloader/base/Makefile.in +++ b/uriloader/base/Makefile.in @@ -14,8 +14,5 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 24cb887c6938..7d980de99862 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -83,8 +83,6 @@ EXTRA_COMPONENTS = \ nsWebHandlerApp.manifest \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index 63b87a59a6a9..77b087eb37a1 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -19,9 +19,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/view/src/Makefile.in b/view/src/Makefile.in index 32861f3900f8..db8035118e6a 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 8193cd68d3a3..2644daaafb98 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -18,9 +18,6 @@ DEFINES += \ -D_IMPL_NS_WIDGET \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index 3737933f9f2b..3d3c00117b42 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -18,9 +18,6 @@ CSRCS = \ keysym2ucs.c \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 5ded723a5546..7d529e5df5c3 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -42,8 +42,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index e149a004f664..008f2bd7e646 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -48,9 +48,6 @@ LOCAL_INCLUDES += \ -I$(srcdir) \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 68952121f8e0..c1c82f7981e9 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -50,9 +50,6 @@ DISABLED_SDK_HEADERS += \ $(NULL) endif -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 99bf4fad2288..27c7e473eb52 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -24,9 +24,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/modules/libjar \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index e7223dadc3bf..e3a4cda8f721 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -19,9 +19,6 @@ EXTRA_COMPONENTS = \ nsINIProcessor.manifest \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index ab6895bc753a..4ca98b7ad77c 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -27,9 +27,6 @@ DISABLED_SDK_HEADERS = \ nsDirectoryServiceUtils.h \ $(NULL) -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index b57c3cb361e5..de8b4dcab26e 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -17,9 +17,6 @@ LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = -I$(srcdir)/../components LOCAL_INCLUDES = -I$(srcdir)/../build -# we don't want the shared lib, but we want to force the creation of a static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in index 73d767e12767..fd7e82c17af4 100644 --- a/xpfe/components/directory/Makefile.in +++ b/xpfe/components/directory/Makefile.in @@ -12,9 +12,5 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# we don't want the shared lib, but we want to force the creation of a -# static lib. -FORCE_STATIC_LIB = 1 - include $(topsrcdir)/config/rules.mk