From 994cfe0b6b14caebd9431ec9bcec32f4a389bf0b Mon Sep 17 00:00:00 2001 From: Mike Shal Date: Tue, 23 Apr 2013 17:54:15 -0400 Subject: [PATCH] Bug 864774 - Part 2: Move CPPSRCS to moz.build as CPP_SOURCES; r=joey CLOSED TREE From 9e0ba7f425143f545eb6c4b26a9a96b5ade4d8e9 Mon Sep 17 00:00:00 2001 --- accessible/src/atk/Makefile.in | 23 -- accessible/src/atk/moz.build | 22 ++ accessible/src/base/Makefile.in | 34 -- accessible/src/base/moz.build | 34 ++ accessible/src/generic/Makefile.in | 16 - accessible/src/generic/moz.build | 15 + accessible/src/html/Makefile.in | 13 - accessible/src/html/moz.build | 11 + accessible/src/jsat/moz.build | 4 + accessible/src/other/Makefile.in | 6 - accessible/src/other/moz.build | 5 + accessible/src/shared.mozbuild | 12 + accessible/src/windows/ia2/Makefile.in | 15 - accessible/src/windows/ia2/moz.build | 14 + accessible/src/windows/msaa/Makefile.in | 28 -- accessible/src/windows/msaa/moz.build | 25 ++ accessible/src/windows/sdn/Makefile.in | 5 - accessible/src/windows/sdn/moz.build | 5 + accessible/src/windows/uia/Makefile.in | 5 - accessible/src/windows/uia/moz.build | 4 + accessible/src/xpcom/Makefile.in | 7 - accessible/src/xpcom/moz.build | 7 + accessible/src/xul/Makefile.in | 17 - accessible/src/xul/moz.build | 15 + b2g/app/Makefile.in | 2 - b2g/app/moz.build | 3 + b2g/gaia/Makefile.in | 1 - b2g/gaia/moz.build | 4 + browser/app/Makefile.in | 2 - browser/app/moz.build | 3 + browser/components/about/Makefile.in | 2 - browser/components/about/moz.build | 4 + browser/components/build/Makefile.in | 3 - browser/components/build/moz.build | 4 + browser/components/dirprovider/Makefile.in | 2 - browser/components/dirprovider/moz.build | 4 + browser/components/feeds/src/Makefile.in | 2 - browser/components/feeds/src/moz.build | 4 + browser/components/migration/src/Makefile.in | 2 - browser/components/migration/src/moz.build | 4 + browser/components/shell/src/Makefile.in | 19 +- browser/components/shell/src/moz.build | 12 + .../shell/commandexecutehandler/Makefile.in | 5 - .../shell/commandexecutehandler/moz.build | 5 + browser/metro/shell/linktool/Makefile.in | 2 - browser/metro/shell/linktool/moz.build | 3 + browser/metro/shell/testing/Makefile.in | 4 - browser/metro/shell/testing/moz.build | 3 + build/stlport/Makefile.in | 1 - build/stlport/moz.build | 4 + build/unix/stdc++compat/Makefile.in | 2 - build/unix/stdc++compat/moz.build | 4 + build/win32/Makefile.in | 1 - build/win32/crashinjectdll/Makefile.in | 2 - build/win32/crashinjectdll/moz.build | 4 + build/win32/moz.build | 3 + build/win32/vmwarerecordinghelper/Makefile.in | 2 - build/win32/vmwarerecordinghelper/moz.build | 4 + caps/src/Makefile.in | 10 - caps/src/moz.build | 10 + chrome/src/Makefile.in | 7 - chrome/src/moz.build | 7 + content/base/src/Makefile.in | 97 ------ content/base/src/moz.build | 100 ++++++ content/canvas/src/Makefile.in | 46 --- content/canvas/src/moz.build | 44 +++ content/events/src/Makefile.in | 47 --- content/events/src/moz.build | 45 +++ content/html/content/src/Makefile.in | 78 ----- content/html/content/src/moz.build | 78 +++++ content/html/document/src/Makefile.in | 9 - content/html/document/src/moz.build | 9 + content/mathml/content/src/Makefile.in | 5 - content/mathml/content/src/moz.build | 5 + content/media/Makefile.in | 29 -- content/media/dash/Makefile.in | 6 - content/media/dash/moz.build | 6 + content/media/gstreamer/Makefile.in | 8 - content/media/gstreamer/moz.build | 7 + content/media/moz.build | 29 ++ content/media/ogg/Makefile.in | 6 - content/media/ogg/moz.build | 6 + content/media/omx/Makefile.in | 6 - content/media/omx/moz.build | 6 + content/media/plugins/Makefile.in | 6 - content/media/plugins/moz.build | 6 + content/media/raw/Makefile.in | 5 - content/media/raw/moz.build | 5 + content/media/wave/Makefile.in | 5 - content/media/wave/moz.build | 5 + content/media/webaudio/Makefile.in | 26 -- content/media/webaudio/blink/Makefile.in | 7 - content/media/webaudio/blink/moz.build | 7 + content/media/webaudio/moz.build | 26 ++ content/media/webm/Makefile.in | 6 - content/media/webm/moz.build | 6 + content/media/webrtc/Makefile.in | 12 - content/media/webrtc/moz.build | 10 + .../media/webspeech/recognition/Makefile.in | 15 - content/media/webspeech/recognition/moz.build | 15 + .../webspeech/recognition/test/Makefile.in | 4 - .../webspeech/recognition/test/moz.build | 5 + content/media/webspeech/synth/Makefile.in | 11 - content/media/webspeech/synth/moz.build | 11 + content/media/wmf/Makefile.in | 9 - content/media/wmf/moz.build | 9 + content/smil/Makefile.in | 27 -- content/smil/moz.build | 27 ++ content/svg/content/src/Makefile.in | 142 -------- content/svg/content/src/moz.build | 142 ++++++++ content/svg/document/src/Makefile.in | 4 - content/svg/document/src/moz.build | 4 + content/xbl/src/Makefile.in | 20 -- content/xbl/src/moz.build | 20 ++ content/xml/content/src/Makefile.in | 7 - content/xml/content/src/moz.build | 7 + content/xml/document/src/Makefile.in | 7 - content/xml/document/src/moz.build | 7 + content/xslt/src/base/Makefile.in | 6 - content/xslt/src/base/moz.build | 8 + content/xslt/src/xml/Makefile.in | 5 - content/xslt/src/xml/moz.build | 5 + content/xslt/src/xpath/Makefile.in | 40 --- content/xslt/src/xpath/moz.build | 41 +++ content/xslt/src/xslt/Makefile.in | 32 -- content/xslt/src/xslt/moz.build | 33 ++ content/xul/content/src/Makefile.in | 9 - content/xul/content/src/moz.build | 6 + content/xul/document/src/Makefile.in | 13 - content/xul/document/src/moz.build | 12 + content/xul/templates/src/Makefile.in | 30 -- content/xul/templates/src/moz.build | 29 ++ docshell/base/Makefile.in | 15 - docshell/base/moz.build | 15 + docshell/build/Makefile.in | 4 - docshell/build/moz.build | 4 + docshell/shistory/src/Makefile.in | 6 - docshell/shistory/src/moz.build | 7 + dom/activities/src/Makefile.in | 4 - dom/activities/src/moz.build | 4 + dom/alarm/Makefile.in | 4 - dom/alarm/moz.build | 4 + dom/audiochannel/Makefile.in | 6 - dom/audiochannel/moz.build | 6 + dom/base/Makefile.in | 34 -- dom/base/moz.build | 34 ++ dom/battery/Makefile.in | 4 - dom/battery/moz.build | 4 + dom/bindings/test/Makefile.in | 2 - dom/bindings/test/moz.build | 4 + dom/bluetooth/Makefile.in | 28 -- dom/bluetooth/moz.build | 35 ++ dom/browser-element/Makefile.in | 6 - dom/browser-element/moz.build | 6 + dom/camera/Makefile.in | 37 --- dom/camera/moz.build | 34 ++ dom/cellbroadcast/src/Makefile.in | 4 - dom/cellbroadcast/src/moz.build | 4 + dom/devicestorage/Makefile.in | 6 - dom/devicestorage/moz.build | 6 + dom/encoding/Makefile.in | 6 - dom/encoding/moz.build | 6 + dom/file/Makefile.in | 20 -- dom/file/moz.build | 20 ++ dom/fm/Makefile.in | 5 - dom/fm/moz.build | 5 + dom/icc/src/Makefile.in | 5 - dom/icc/src/moz.build | 5 + dom/indexedDB/Makefile.in | 25 -- dom/indexedDB/ipc/Makefile.in | 5 - dom/indexedDB/ipc/moz.build | 5 + dom/indexedDB/moz.build | 25 ++ dom/ipc/Makefile.in | 18 - dom/ipc/moz.build | 18 + dom/media/Makefile.in | 4 - dom/media/bridge/Makefile.in | 4 - dom/media/bridge/moz.build | 4 + dom/media/moz.build | 4 + dom/mobilemessage/src/Makefile.in | 24 -- dom/mobilemessage/src/moz.build | 23 ++ dom/network/src/Makefile.in | 13 - dom/network/src/moz.build | 11 + dom/plugins/base/Makefile.in | 38 --- dom/plugins/base/android/Makefile.in | 13 - dom/plugins/base/android/moz.build | 14 + dom/plugins/base/moz.build | 46 +++ dom/plugins/ipc/Makefile.in | 39 --- dom/plugins/ipc/hangui/Makefile.in | 5 - dom/plugins/ipc/hangui/moz.build | 4 + dom/plugins/ipc/moz.build | 33 ++ dom/power/Makefile.in | 6 - dom/power/moz.build | 6 + dom/quota/Makefile.in | 7 - dom/quota/moz.build | 7 + dom/src/events/Makefile.in | 5 - dom/src/events/moz.build | 4 + dom/src/geolocation/Makefile.in | 5 - dom/src/geolocation/moz.build | 5 + dom/src/json/Makefile.in | 4 - dom/src/json/moz.build | 4 + dom/src/jsurl/Makefile.in | 2 - dom/src/jsurl/moz.build | 4 + dom/src/notification/Makefile.in | 5 - dom/src/notification/moz.build | 5 + dom/src/offline/Makefile.in | 4 - dom/src/offline/moz.build | 4 + dom/src/storage/Makefile.in | 9 - dom/src/storage/moz.build | 9 + dom/system/Makefile.in | 9 - dom/system/android/Makefile.in | 5 - dom/system/android/moz.build | 5 + dom/system/gonk/Makefile.in | 24 -- dom/system/gonk/moz.build | 21 ++ dom/system/moz.build | 8 + dom/system/unix/Makefile.in | 6 - dom/system/unix/moz.build | 15 + dom/system/windows/Makefile.in | 4 - dom/system/windows/moz.build | 4 + dom/telephony/Makefile.in | 5 - dom/telephony/moz.build | 5 + dom/time/Makefile.in | 7 - dom/time/moz.build | 7 + dom/voicemail/Makefile.in | 4 - dom/voicemail/moz.build | 4 + dom/workers/Makefile.in | 26 -- dom/workers/moz.build | 26 ++ editor/composer/src/Makefile.in | 11 - editor/composer/src/moz.build | 11 + editor/libeditor/base/Makefile.in | 30 -- editor/libeditor/base/moz.build | 25 ++ editor/libeditor/html/Makefile.in | 23 -- editor/libeditor/html/moz.build | 24 ++ editor/libeditor/text/Makefile.in | 10 - editor/libeditor/text/moz.build | 9 + editor/txmgr/src/Makefile.in | 8 - editor/txmgr/src/moz.build | 8 + editor/txtsvc/src/Makefile.in | 5 - editor/txtsvc/src/moz.build | 5 + embedding/browser/build/Makefile.in | 4 - embedding/browser/build/moz.build | 4 + embedding/browser/webBrowser/Makefile.in | 9 - embedding/browser/webBrowser/moz.build | 9 + .../components/appstartup/src/Makefile.in | 4 - embedding/components/appstartup/src/moz.build | 4 + embedding/components/build/Makefile.in | 2 - embedding/components/build/moz.build | 4 + .../components/commandhandler/src/Makefile.in | 9 - .../components/commandhandler/src/moz.build | 8 + embedding/components/find/src/Makefile.in | 5 - embedding/components/find/src/moz.build | 5 + .../components/printingui/src/mac/Makefile.in | 5 - .../components/printingui/src/mac/moz.build | 5 + .../components/printingui/src/os2/Makefile.in | 7 - .../components/printingui/src/os2/moz.build | 6 + .../printingui/src/unixshared/Makefile.in | 7 - .../printingui/src/unixshared/moz.build | 6 + .../components/printingui/src/win/Makefile.in | 8 - .../components/printingui/src/win/moz.build | 7 + .../webbrowserpersist/src/Makefile.in | 4 - .../webbrowserpersist/src/moz.build | 4 + .../components/windowwatcher/src/Makefile.in | 10 - .../components/windowwatcher/src/moz.build | 9 + embedding/tests/winEmbed/Makefile.in | 6 - embedding/tests/winEmbed/moz.build | 5 + extensions/auth/Makefile.in | 10 - extensions/auth/moz.build | 15 + extensions/cookie/Makefile.in | 9 - extensions/cookie/moz.build | 9 + extensions/gio/Makefile.in | 4 - extensions/gio/moz.build | 4 + extensions/gnomevfs/Makefile.in | 4 - extensions/gnomevfs/moz.build | 4 + extensions/permissions/Makefile.in | 5 - extensions/permissions/moz.build | 5 + extensions/pref/autoconfig/src/Makefile.in | 6 - extensions/pref/autoconfig/src/moz.build | 7 + .../spellcheck/hunspell/src/Makefile.in | 17 - extensions/spellcheck/hunspell/src/moz.build | 19 ++ extensions/spellcheck/src/Makefile.in | 11 - extensions/spellcheck/src/moz.build | 11 + .../universalchardet/src/base/Makefile.in | 28 -- .../universalchardet/src/base/moz.build | 28 ++ .../universalchardet/src/xpcom/Makefile.in | 5 - .../universalchardet/src/xpcom/moz.build | 5 + extensions/widgetutils/src/Makefile.in | 2 - extensions/widgetutils/src/moz.build | 4 + gfx/2d/Makefile.in | 69 ---- gfx/2d/moz.build | 61 ++++ gfx/angle/Makefile.in | 85 ----- gfx/angle/moz.build | 94 ++++++ gfx/angle/src/libEGL/Makefile.in | 13 - gfx/angle/src/libEGL/moz.build | 10 + gfx/angle/src/libGLESv2/Makefile.in | 110 ------ gfx/angle/src/libGLESv2/moz.build | 87 +++++ gfx/cairo/cairo/src/Makefile.in | 11 - gfx/cairo/cairo/src/moz.build | 14 + gfx/gl/Makefile.in | 35 +- gfx/gl/moz.build | 67 ++++ gfx/graphite2/src/Makefile.in | 2 - gfx/graphite2/src/moz.build | 43 +++ gfx/harfbuzz/src/Makefile.in | 27 -- gfx/harfbuzz/src/moz.build | 27 ++ gfx/ipc/Makefile.in | 9 - gfx/ipc/moz.build | 8 + gfx/layers/Makefile.in | 136 -------- gfx/layers/moz.build | 120 +++++++ gfx/ots/src/Makefile.in | 34 -- gfx/ots/src/moz.build | 34 ++ gfx/skia/Makefile.in | 313 ------------------ gfx/skia/moz.build | 312 +++++++++++++++++ gfx/src/Makefile.in | 19 -- gfx/src/moz.build | 19 ++ gfx/thebes/Makefile.in | 140 -------- gfx/thebes/moz.build | 135 ++++++++ gfx/ycbcr/Makefile.in | 47 --- gfx/ycbcr/moz.build | 52 +++ hal/Makefile.in | 110 +----- hal/moz.build | 119 +++++++ image/build/Makefile.in | 4 - image/build/moz.build | 4 + image/decoders/Makefile.in | 9 - image/decoders/icon/Makefile.in | 6 - image/decoders/icon/android/Makefile.in | 2 - image/decoders/icon/android/moz.build | 4 + image/decoders/icon/gtk/Makefile.in | 2 - image/decoders/icon/gtk/moz.build | 4 + image/decoders/icon/moz.build | 6 + image/decoders/icon/os2/Makefile.in | 3 - image/decoders/icon/os2/moz.build | 4 + image/decoders/icon/qt/Makefile.in | 2 - image/decoders/icon/qt/moz.build | 4 + image/decoders/icon/win/Makefile.in | 3 - image/decoders/icon/win/moz.build | 4 + image/decoders/moz.build | 13 + image/encoders/bmp/Makefile.in | 2 - image/encoders/bmp/moz.build | 4 + image/encoders/ico/Makefile.in | 2 - image/encoders/ico/moz.build | 4 + image/encoders/jpeg/Makefile.in | 2 - image/encoders/jpeg/moz.build | 4 + image/encoders/png/Makefile.in | 2 - image/encoders/png/moz.build | 4 + image/src/Makefile.in | 23 -- image/src/moz.build | 22 ++ intl/build/Makefile.in | 5 - intl/build/moz.build | 4 + intl/chardet/src/Makefile.in | 5 - intl/chardet/src/moz.build | 5 + intl/hyphenation/src/Makefile.in | 5 - intl/hyphenation/src/moz.build | 6 + intl/locale/src/Makefile.in | 10 - intl/locale/src/mac/Makefile.in | 6 - intl/locale/src/mac/moz.build | 6 + intl/locale/src/moz.build | 10 + intl/locale/src/os2/Makefile.in | 8 - intl/locale/src/os2/moz.build | 7 + intl/locale/src/unix/Makefile.in | 13 - intl/locale/src/unix/moz.build | 14 + intl/locale/src/windows/Makefile.in | 7 - intl/locale/src/windows/moz.build | 7 + intl/lwbrk/src/Makefile.in | 19 -- intl/lwbrk/src/moz.build | 22 ++ intl/strres/src/Makefile.in | 6 - intl/strres/src/moz.build | 5 + intl/uconv/src/Makefile.in | 24 -- intl/uconv/src/moz.build | 22 ++ intl/uconv/ucvcn/Makefile.in | 11 - intl/uconv/ucvcn/moz.build | 11 + intl/uconv/ucvibm/Makefile.in | 27 -- intl/uconv/ucvibm/moz.build | 24 ++ intl/uconv/ucvja/Makefile.in | 10 - intl/uconv/ucvja/moz.build | 8 + intl/uconv/ucvko/Makefile.in | 8 - intl/uconv/ucvko/moz.build | 8 + intl/uconv/ucvlatin/Makefile.in | 117 ------- intl/uconv/ucvlatin/moz.build | 117 +++++++ intl/uconv/ucvtw/Makefile.in | 8 - intl/uconv/ucvtw/moz.build | 8 + intl/uconv/ucvtw2/Makefile.in | 7 - intl/uconv/ucvtw2/moz.build | 5 + intl/uconv/util/Makefile.in | 7 - intl/uconv/util/moz.build | 7 + intl/unicharutil/src/Makefile.in | 8 - intl/unicharutil/src/moz.build | 8 + intl/unicharutil/tests/Makefile.in | 4 - intl/unicharutil/tests/moz.build | 5 + intl/unicharutil/util/Makefile.in | 7 - intl/unicharutil/util/internal/Makefile.in | 2 - intl/unicharutil/util/internal/moz.build | 4 + intl/unicharutil/util/moz.build | 7 + ipc/app/Makefile.in | 5 - ipc/app/moz.build | 8 + ipc/chromium/Makefile.in | 208 ------------ ipc/chromium/moz.build | 208 ++++++++++++ ipc/dbus/Makefile.in | 6 - ipc/dbus/moz.build | 6 + ipc/glue/Makefile.in | 45 --- ipc/glue/moz.build | 42 +++ ipc/ipdl/Makefile.in | 7 - ipc/ipdl/moz.build | 7 + ipc/ipdl/test/cxx/Makefile.in | 7 - ipc/ipdl/test/cxx/app/Makefile.in | 4 - ipc/ipdl/test/cxx/app/moz.build | 3 + ipc/ipdl/test/cxx/moz.build | 7 + ipc/netd/Makefile.in | 4 - ipc/netd/moz.build | 4 + ipc/ril/Makefile.in | 4 - ipc/ril/moz.build | 4 + ipc/testshell/Makefile.in | 6 - ipc/testshell/moz.build | 6 + ipc/unixsocket/Makefile.in | 2 - ipc/unixsocket/moz.build | 4 + js/ductwork/debugger/Makefile.in | 4 - js/ductwork/debugger/moz.build | 4 + js/ipc/Makefile.in | 5 - js/ipc/moz.build | 5 + js/jsd/Makefile.in | 17 - js/jsd/moz.build | 16 + js/src/Makefile.in | 257 -------------- js/src/gdb/Makefile.in | 11 - js/src/gdb/moz.build | 10 + js/src/jsapi-tests/Makefile.in | 68 ---- js/src/jsapi-tests/moz.build | 59 ++++ js/src/moz.build | 257 ++++++++++++++ js/src/shell/Makefile.in | 6 - js/src/shell/moz.build | 5 + js/xpconnect/loader/Makefile.in | 2 - js/xpconnect/loader/moz.build | 6 + js/xpconnect/shell/Makefile.in | 2 - js/xpconnect/shell/moz.build | 3 + js/xpconnect/src/Makefile.in | 37 --- js/xpconnect/src/moz.build | 37 +++ .../tests/components/native/Makefile.in | 6 - .../tests/components/native/moz.build | 6 + js/xpconnect/wrappers/Makefile.in | 9 - js/xpconnect/wrappers/moz.build | 9 + layout/base/Makefile.in | 56 ---- layout/base/moz.build | 49 +++ layout/build/Makefile.in | 6 - layout/build/moz.build | 6 + layout/forms/Makefile.in | 20 -- layout/forms/moz.build | 20 ++ layout/generic/Makefile.in | 47 --- layout/generic/moz.build | 46 +++ layout/inspector/src/Makefile.in | 17 - layout/inspector/src/moz.build | 15 + layout/ipc/Makefile.in | 5 - layout/ipc/moz.build | 5 + layout/mathml/Makefile.in | 27 -- layout/mathml/moz.build | 28 ++ layout/printing/Makefile.in | 8 - layout/printing/moz.build | 8 + layout/style/Makefile.in | 47 --- layout/style/moz.build | 47 +++ layout/svg/Makefile.in | 38 --- layout/svg/moz.build | 38 +++ layout/tables/Makefile.in | 17 - layout/tables/moz.build | 15 + layout/tools/layout-debug/src/Makefile.in | 7 - layout/tools/layout-debug/src/moz.build | 7 + layout/xul/base/src/Makefile.in | 50 --- layout/xul/base/src/moz.build | 47 +++ layout/xul/grid/Makefile.in | 12 - layout/xul/grid/moz.build | 12 + layout/xul/tree/Makefile.in | 12 - layout/xul/tree/moz.build | 12 + media/libsoundtouch/src/Makefile.in | 17 - media/libsoundtouch/src/moz.build | 19 ++ media/mtransport/build/Makefile.in | 4 - media/mtransport/build/moz.build | 4 + media/mtransport/standalone/Makefile.in | 5 - media/mtransport/standalone/moz.build | 4 + media/omx-plugin/Makefile.in | 4 - media/omx-plugin/froyo/Makefile.in | 4 - media/omx-plugin/froyo/moz.build | 4 + media/omx-plugin/gb/Makefile.in | 4 - media/omx-plugin/gb/moz.build | 4 + media/omx-plugin/gb235/Makefile.in | 4 - media/omx-plugin/gb235/moz.build | 4 + media/omx-plugin/hc/Makefile.in | 4 - media/omx-plugin/hc/moz.build | 4 + media/omx-plugin/jb-htc/Makefile.in | 4 - media/omx-plugin/jb-htc/moz.build | 4 + .../lib/froyo/libstagefright/Makefile.in | 6 - .../lib/froyo/libstagefright/moz.build | 4 + .../lib/gb/libstagefright/Makefile.in | 6 - .../lib/gb/libstagefright/moz.build | 4 + .../Makefile.in | 6 - .../libstagefright_color_conversion/moz.build | 4 + media/omx-plugin/lib/gb/libutils/Makefile.in | 6 - media/omx-plugin/lib/gb/libutils/moz.build | 4 + .../lib/gb235/libstagefright/Makefile.in | 6 - .../lib/gb235/libstagefright/moz.build | 4 + .../lib/hc/libstagefright/Makefile.in | 6 - .../lib/hc/libstagefright/moz.build | 4 + .../lib/ics/libstagefright/Makefile.in | 6 - .../lib/ics/libstagefright/moz.build | 4 + media/omx-plugin/lib/ics/libutils/Makefile.in | 6 - media/omx-plugin/lib/ics/libutils/moz.build | 4 + media/omx-plugin/moz.build | 4 + media/omx-plugin/sony/Makefile.in | 4 - media/omx-plugin/sony/moz.build | 4 + memory/mozalloc/Makefile.in | 28 -- memory/mozalloc/moz.build | 10 + memory/replace/dmd/Makefile.in | 5 - memory/replace/dmd/moz.build | 6 + mobile/android/components/build/Makefile.in | 6 - mobile/android/components/build/moz.build | 9 + modules/libjar/Makefile.in | 2 - modules/libjar/moz.build | 5 + modules/libjar/zipwriter/src/Makefile.in | 9 - modules/libjar/zipwriter/src/moz.build | 9 + modules/libpref/src/Makefile.in | 8 - modules/libpref/src/moz.build | 8 + mozglue/android/Makefile.in | 7 - mozglue/android/moz.build | 7 + mozglue/build/Makefile.in | 2 - mozglue/build/moz.build | 23 ++ mozglue/linker/Makefile.in | 11 - mozglue/linker/moz.build | 8 + mozglue/tests/Makefile.in | 6 +- mozglue/tests/moz.build | 4 + netwerk/base/src/Makefile.in | 74 ----- netwerk/base/src/moz.build | 86 +++++ netwerk/build/Makefile.in | 1 - netwerk/build/moz.build | 4 + netwerk/cache/Makefile.in | 20 -- netwerk/cache/moz.build | 20 ++ netwerk/cookie/Makefile.in | 9 - netwerk/cookie/moz.build | 6 + netwerk/dash/mpd/Makefile.in | 13 - netwerk/dash/mpd/moz.build | 12 + netwerk/dns/Makefile.in | 8 - netwerk/dns/moz.build | 8 + netwerk/ipc/Makefile.in | 9 - netwerk/ipc/moz.build | 9 + netwerk/mime/Makefile.in | 4 - netwerk/mime/moz.build | 4 + netwerk/protocol/about/Makefile.in | 8 - netwerk/protocol/about/moz.build | 8 + netwerk/protocol/data/Makefile.in | 5 - netwerk/protocol/data/moz.build | 5 + netwerk/protocol/device/Makefile.in | 11 - netwerk/protocol/device/moz.build | 9 + netwerk/protocol/file/Makefile.in | 5 - netwerk/protocol/file/moz.build | 5 + netwerk/protocol/ftp/Makefile.in | 9 - netwerk/protocol/ftp/moz.build | 9 + netwerk/protocol/http/Makefile.in | 34 -- netwerk/protocol/http/moz.build | 34 ++ netwerk/protocol/res/Makefile.in | 4 - netwerk/protocol/res/moz.build | 4 + netwerk/protocol/viewsource/Makefile.in | 5 - netwerk/protocol/viewsource/moz.build | 5 + netwerk/protocol/websocket/Makefile.in | 7 - netwerk/protocol/websocket/moz.build | 7 + netwerk/protocol/wyciwyg/Makefile.in | 8 - netwerk/protocol/wyciwyg/moz.build | 8 + netwerk/sctp/datachannel/Makefile.in | 4 - netwerk/sctp/datachannel/moz.build | 4 + netwerk/sctp/src/Makefile.in | 6 - netwerk/sctp/src/moz.build | 5 + netwerk/socket/Makefile.in | 7 - netwerk/socket/moz.build | 7 + netwerk/streamconv/converters/Makefile.in | 27 -- netwerk/streamconv/converters/moz.build | 21 ++ netwerk/streamconv/src/Makefile.in | 12 - netwerk/streamconv/src/moz.build | 9 + netwerk/streamconv/test/Makefile.in | 5 - netwerk/streamconv/test/moz.build | 4 + netwerk/system/android/Makefile.in | 4 - netwerk/system/android/moz.build | 4 + netwerk/system/maemo/Makefile.in | 5 - netwerk/system/maemo/moz.build | 5 + netwerk/system/qt/Makefile.in | 9 - netwerk/system/qt/moz.build | 6 + netwerk/system/win32/Makefile.in | 4 - netwerk/system/win32/moz.build | 4 + netwerk/test/Makefile.in | 4 +- netwerk/test/moz.build | 19 ++ netwerk/wifi/Makefile.in | 15 - netwerk/wifi/moz.build | 30 ++ other-licenses/skia-npapi/Makefile.in | 8 - other-licenses/skia-npapi/moz.build | 8 + other-licenses/snappy/Makefile.in | 7 - other-licenses/snappy/moz.build | 7 + parser/html/Makefile.in | 36 -- parser/html/moz.build | 36 ++ parser/htmlparser/src/Makefile.in | 20 -- parser/htmlparser/src/moz.build | 20 ++ parser/xml/src/Makefile.in | 6 - parser/xml/src/moz.build | 6 + profile/dirserviceprovider/src/Makefile.in | 3 - profile/dirserviceprovider/src/moz.build | 4 + .../dirserviceprovider/standalone/Makefile.in | 2 - .../dirserviceprovider/standalone/moz.build | 4 + rdf/base/src/Makefile.in | 18 - rdf/base/src/moz.build | 17 + rdf/build/Makefile.in | 4 - rdf/build/moz.build | 4 + rdf/datasource/src/Makefile.in | 6 - rdf/datasource/src/moz.build | 5 + rdf/tests/dsds/Makefile.in | 5 - rdf/tests/dsds/moz.build | 5 + rdf/tests/rdfcat/Makefile.in | 2 - rdf/tests/rdfcat/moz.build | 3 + rdf/tests/rdfpoll/Makefile.in | 3 - rdf/tests/rdfpoll/moz.build | 3 + rdf/tests/triplescat/Makefile.in | 2 - rdf/tests/triplescat/moz.build | 3 + rdf/util/src/Makefile.in | 3 - rdf/util/src/internal/Makefile.in | 3 - rdf/util/src/internal/moz.build | 4 + rdf/util/src/moz.build | 4 + security/manager/boot/src/Makefile.in | 8 - security/manager/boot/src/moz.build | 8 + security/manager/pki/src/Makefile.in | 10 - security/manager/pki/src/moz.build | 9 + security/manager/ssl/src/Makefile.in | 68 ---- security/manager/ssl/src/moz.build | 66 ++++ services/crypto/component/Makefile.in | 4 - services/crypto/component/moz.build | 4 + startupcache/Makefile.in | 5 - startupcache/moz.build | 6 + storage/build/Makefile.in | 2 - storage/build/moz.build | 4 + storage/src/Makefile.in | 26 -- storage/src/moz.build | 26 ++ testing/gtest/Makefile.in | 6 - testing/gtest/moz.build | 6 + testing/mochitest/ssltunnel/Makefile.in | 2 - testing/mochitest/ssltunnel/moz.build | 3 + testing/tools/screenshot/Makefile.in | 2 - testing/tools/screenshot/moz.build | 6 + toolkit/components/alerts/Makefile.in | 4 - toolkit/components/alerts/moz.build | 6 + toolkit/components/autocomplete/Makefile.in | 5 - toolkit/components/autocomplete/moz.build | 5 + toolkit/components/build/Makefile.in | 2 - toolkit/components/build/moz.build | 4 + toolkit/components/commandlines/Makefile.in | 4 - toolkit/components/commandlines/moz.build | 4 + toolkit/components/ctypes/Makefile.in | 4 - toolkit/components/ctypes/moz.build | 4 + toolkit/components/ctypes/tests/Makefile.in | 5 - toolkit/components/ctypes/tests/moz.build | 6 + .../components/diskspacewatcher/Makefile.in | 4 - toolkit/components/diskspacewatcher/moz.build | 4 + toolkit/components/downloads/Makefile.in | 9 - toolkit/components/downloads/moz.build | 9 + toolkit/components/filepicker/Makefile.in | 3 - toolkit/components/filepicker/moz.build | 3 + toolkit/components/find/Makefile.in | 4 - toolkit/components/find/moz.build | 4 + toolkit/components/intl/Makefile.in | 4 - toolkit/components/intl/moz.build | 4 + .../components/maintenanceservice/Makefile.in | 9 - .../components/maintenanceservice/moz.build | 8 + toolkit/components/mediasniffer/Makefile.in | 5 - toolkit/components/mediasniffer/moz.build | 5 + .../components/parentalcontrols/Makefile.in | 3 - toolkit/components/parentalcontrols/moz.build | 5 + toolkit/components/perf/Makefile.in | 4 - toolkit/components/perf/moz.build | 4 + toolkit/components/places/Makefile.in | 19 -- toolkit/components/places/moz.build | 19 ++ toolkit/components/protobuf/Makefile.in | 16 - toolkit/components/protobuf/moz.build | 13 + toolkit/components/reflect/Makefile.in | 4 - toolkit/components/reflect/moz.build | 4 + toolkit/components/remote/Makefile.in | 10 - toolkit/components/remote/moz.build | 12 + toolkit/components/satchel/Makefile.in | 4 - toolkit/components/satchel/moz.build | 4 + toolkit/components/startup/Makefile.in | 15 - toolkit/components/startup/moz.build | 21 ++ toolkit/components/statusfilter/Makefile.in | 4 - toolkit/components/statusfilter/moz.build | 4 + toolkit/components/telemetry/Makefile.in | 4 - toolkit/components/telemetry/moz.build | 4 + toolkit/components/typeaheadfind/Makefile.in | 4 - toolkit/components/typeaheadfind/moz.build | 4 + toolkit/components/url-classifier/Makefile.in | 14 - toolkit/components/url-classifier/moz.build | 14 + toolkit/crashreporter/Makefile.in | 11 - .../breakpad-windows-libxul/Makefile.in | 8 - .../breakpad-windows-libxul/moz.build | 8 + .../breakpad-windows-standalone/Makefile.in | 6 - .../breakpad-windows-standalone/moz.build | 6 + toolkit/crashreporter/client/Makefile.in | 13 - toolkit/crashreporter/client/moz.build | 32 ++ .../google-breakpad/src/client/Makefile.in | 4 - .../client/linux/crash_generation/Makefile.in | 5 - .../client/linux/crash_generation/moz.build | 5 + .../src/client/linux/handler/Makefile.in | 6 - .../src/client/linux/handler/moz.build | 6 + .../client/linux/minidump_writer/Makefile.in | 6 - .../client/linux/minidump_writer/moz.build | 6 + .../client/mac/crash_generation/Makefile.in | 5 - .../src/client/mac/crash_generation/moz.build | 5 + .../src/client/mac/handler/Makefile.in | 7 - .../src/client/mac/handler/moz.build | 7 + .../google-breakpad/src/client/moz.build | 4 + .../src/client/solaris/handler/Makefile.in | 6 - .../src/client/solaris/handler/moz.build | 6 + .../google-breakpad/src/common/Makefile.in | 31 -- .../src/common/linux/Makefile.in | 10 - .../src/common/linux/moz.build | 13 + .../src/common/mac/Makefile.in | 11 - .../google-breakpad/src/common/mac/moz.build | 11 + .../google-breakpad/src/common/moz.build | 35 ++ .../src/common/solaris/Makefile.in | 6 - .../src/common/solaris/moz.build | 6 + .../google-breakpad/src/processor/Makefile.in | 17 - .../google-breakpad/src/processor/moz.build | 17 + toolkit/crashreporter/injector/Makefile.in | 2 - toolkit/crashreporter/injector/moz.build | 4 + toolkit/crashreporter/moz.build | 8 + toolkit/crashreporter/test/Makefile.in | 9 - toolkit/crashreporter/test/moz.build | 9 + toolkit/devtools/server/Makefile.in | 4 - toolkit/devtools/server/moz.build | 4 + toolkit/identity/Makefile.in | 4 - toolkit/identity/moz.build | 4 + toolkit/library/Makefile.in | 40 --- toolkit/library/moz.build | 29 ++ toolkit/library/winvccorlib/Makefile.in | 4 - toolkit/library/winvccorlib/moz.build | 4 + toolkit/mozapps/plugins/tests/Makefile.in | 5 - toolkit/mozapps/plugins/tests/moz.build | 5 + toolkit/mozapps/update/common/Makefile.in | 12 - toolkit/mozapps/update/common/moz.build | 11 + toolkit/mozapps/update/test/Makefile.in | 6 +- toolkit/mozapps/update/test/moz.build | 4 + toolkit/mozapps/update/updater/Makefile.in | 28 -- toolkit/mozapps/update/updater/moz.build | 34 ++ toolkit/profile/Makefile.in | 5 - toolkit/profile/moz.build | 5 + toolkit/system/androidproxy/Makefile.in | 4 - toolkit/system/androidproxy/moz.build | 4 + toolkit/system/dbus/Makefile.in | 6 - toolkit/system/dbus/moz.build | 6 + toolkit/system/gnome/Makefile.in | 24 -- toolkit/system/gnome/moz.build | 19 ++ toolkit/system/unixproxy/Makefile.in | 12 - toolkit/system/unixproxy/moz.build | 8 + toolkit/system/windowsproxy/Makefile.in | 4 - toolkit/system/windowsproxy/moz.build | 4 + toolkit/xre/Makefile.in | 42 --- toolkit/xre/moz.build | 61 ++++ toolkit/xre/test/win/Makefile.in | 5 - toolkit/xre/test/win/moz.build | 5 + tools/jprof/Makefile.in | 9 - tools/jprof/moz.build | 8 + tools/jprof/stub/Makefile.in | 4 - tools/jprof/stub/moz.build | 4 + tools/profiler/Makefile.in | 32 -- tools/profiler/moz.build | 29 ++ tools/trace-malloc/Makefile.in | 2 - tools/trace-malloc/lib/Makefile.in | 8 - tools/trace-malloc/lib/moz.build | 9 + tools/trace-malloc/moz.build | 5 + uriloader/base/Makefile.in | 6 - uriloader/base/moz.build | 5 + uriloader/exthandler/Makefile.in | 40 --- uriloader/exthandler/moz.build | 57 ++++ uriloader/exthandler/tests/Makefile.in | 4 - uriloader/exthandler/tests/moz.build | 4 + uriloader/prefetch/Makefile.in | 9 - uriloader/prefetch/moz.build | 9 + view/src/Makefile.in | 5 - view/src/moz.build | 5 + webapprt/gtk2/Makefile.in | 3 - webapprt/gtk2/moz.build | 3 + webapprt/win/Makefile.in | 3 - webapprt/win/moz.build | 3 + widget/android/Makefile.in | 21 -- widget/android/moz.build | 21 ++ widget/gonk/Makefile.in | 38 --- widget/gonk/libdisplay/Makefile.in | 14 - widget/gonk/libdisplay/moz.build | 17 + widget/gonk/moz.build | 38 +++ widget/gtk2/Makefile.in | 42 --- widget/gtk2/moz.build | 43 +++ widget/os2/Makefile.in | 21 -- widget/os2/moz.build | 21 ++ widget/qt/Makefile.in | 44 --- widget/qt/faststartupqt/Makefile.in | 13 - widget/qt/faststartupqt/moz.build | 9 + widget/qt/moz.build | 38 +++ widget/shared/Makefile.in | 5 - widget/shared/moz.build | 5 + widget/windows/Makefile.in | 61 ---- widget/windows/moz.build | 59 ++++ widget/windows/winrt/Makefile.in | 15 - widget/windows/winrt/moz.build | 15 + widget/xpwidgets/Makefile.in | 41 --- widget/xpwidgets/moz.build | 44 +++ widget/xremoteclient/Makefile.in | 2 - widget/xremoteclient/moz.build | 3 + xpcom/base/Makefile.in | 36 -- xpcom/base/moz.build | 37 +++ xpcom/build/Makefile.in | 23 -- xpcom/build/moz.build | 26 ++ xpcom/components/Makefile.in | 7 - xpcom/components/moz.build | 7 + xpcom/ds/Makefile.in | 37 --- xpcom/ds/moz.build | 39 +++ xpcom/glue/Makefile.in | 7 - xpcom/glue/moz.build | 7 + xpcom/glue/nomozalloc/Makefile.in | 7 - xpcom/glue/nomozalloc/moz.build | 7 + xpcom/glue/standalone/Makefile.in | 7 - xpcom/glue/standalone/moz.build | 6 + .../glue/standalone/staticruntime/Makefile.in | 6 - xpcom/glue/standalone/staticruntime/moz.build | 6 + xpcom/glue/staticruntime/Makefile.in | 7 - xpcom/glue/staticruntime/moz.build | 7 + xpcom/glue/tests/gtest/Makefile.in | 4 - xpcom/glue/tests/gtest/moz.build | 4 + xpcom/io/Makefile.in | 35 -- xpcom/io/moz.build | 34 ++ xpcom/reflect/xptcall/src/Makefile.in | 2 - xpcom/reflect/xptcall/src/md/os2/Makefile.in | 4 - xpcom/reflect/xptcall/src/md/os2/moz.build | 5 + xpcom/reflect/xptcall/src/md/test/Makefile.in | 3 +- xpcom/reflect/xptcall/src/md/test/moz.build | 4 + xpcom/reflect/xptcall/src/md/unix/Makefile.in | 115 ------- xpcom/reflect/xptcall/src/md/unix/moz.build | 258 +++++++++++++++ .../reflect/xptcall/src/md/win32/Makefile.in | 15 - xpcom/reflect/xptcall/src/md/win32/moz.build | 22 ++ xpcom/reflect/xptcall/src/moz.build | 4 + xpcom/reflect/xptcall/tests/Makefile.in | 2 - xpcom/reflect/xptcall/tests/moz.build | 4 + xpcom/reflect/xptinfo/src/Makefile.in | 8 - xpcom/reflect/xptinfo/src/moz.build | 7 + xpcom/reflect/xptinfo/tests/Makefile.in | 2 - xpcom/reflect/xptinfo/tests/moz.build | 4 + xpcom/sample/Makefile.in | 5 - xpcom/sample/moz.build | 5 + xpcom/sample/program/Makefile.in | 4 - xpcom/sample/program/moz.build | 6 + xpcom/string/src/Makefile.in | 20 -- xpcom/string/src/moz.build | 18 + xpcom/tests/Makefile.in | 13 +- xpcom/tests/bug656331_component/Makefile.in | 1 - xpcom/tests/bug656331_component/moz.build | 4 + xpcom/tests/component/Makefile.in | 1 - xpcom/tests/component/moz.build | 4 + xpcom/tests/component_no_aslr/Makefile.in | 1 - xpcom/tests/component_no_aslr/moz.build | 4 + xpcom/tests/external/Makefile.in | 4 - xpcom/tests/external/moz.build | 4 + xpcom/tests/moz.build | 25 ++ xpcom/threads/Makefile.in | 13 - xpcom/threads/moz.build | 13 + xpcom/windbgdlg/Makefile.in | 2 - xpcom/windbgdlg/moz.build | 4 + xpfe/appshell/src/Makefile.in | 12 - xpfe/appshell/src/moz.build | 11 + xpfe/components/autocomplete/src/Makefile.in | 2 - xpfe/components/autocomplete/src/moz.build | 4 + xpfe/components/build/Makefile.in | 2 - xpfe/components/build/moz.build | 4 + xpfe/components/directory/Makefile.in | 2 - xpfe/components/directory/moz.build | 4 + xpfe/components/windowds/Makefile.in | 2 - xpfe/components/windowds/moz.build | 4 + xulrunner/app/Makefile.in | 2 - xulrunner/app/moz.build | 3 + .../simple/components/src/Makefile.in | 2 - .../examples/simple/components/src/moz.build | 4 + xulrunner/stub/Makefile.in | 2 - xulrunner/stub/moz.build | 3 + xulrunner/tools/redit/Makefile.in | 1 - xulrunner/tools/redit/moz.build | 3 + 876 files changed, 6995 insertions(+), 6595 deletions(-) create mode 100644 accessible/src/shared.mozbuild diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in index 33a3e065e5c..71ce0db24eb 100644 --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -13,29 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_s EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - AccessibleWrap.cpp \ - ApplicationAccessibleWrap.cpp \ - AtkSocketAccessible.cpp \ - DocAccessibleWrap.cpp \ - nsMaiInterfaceComponent.cpp \ - nsMaiInterfaceAction.cpp \ - nsMaiInterfaceText.cpp \ - nsMaiInterfaceEditableText.cpp \ - nsMaiInterfaceSelection.cpp \ - nsMaiInterfaceValue.cpp \ - nsMaiHyperlink.cpp \ - nsMaiInterfaceHypertext.cpp \ - nsMaiInterfaceHyperlinkImpl.cpp \ - nsMaiInterfaceTable.cpp \ - nsMaiInterfaceDocument.cpp \ - nsMaiInterfaceImage.cpp \ - Platform.cpp \ - RootAccessibleWrap.cpp \ - UtilInterface.cpp \ - $(NULL) - # we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/atk/moz.build b/accessible/src/atk/moz.build index 92eb82ffbb3..405e2116a1c 100644 --- a/accessible/src/atk/moz.build +++ b/accessible/src/atk/moz.build @@ -11,3 +11,25 @@ EXPORTS.mozilla.a11y += [ 'HyperTextAccessibleWrap.h', ] +CPP_SOURCES += [ + 'AccessibleWrap.cpp', + 'ApplicationAccessibleWrap.cpp', + 'AtkSocketAccessible.cpp', + 'DocAccessibleWrap.cpp', + 'Platform.cpp', + 'RootAccessibleWrap.cpp', + 'UtilInterface.cpp', + 'nsMaiHyperlink.cpp', + 'nsMaiInterfaceAction.cpp', + 'nsMaiInterfaceComponent.cpp', + 'nsMaiInterfaceDocument.cpp', + 'nsMaiInterfaceEditableText.cpp', + 'nsMaiInterfaceHyperlinkImpl.cpp', + 'nsMaiInterfaceHypertext.cpp', + 'nsMaiInterfaceImage.cpp', + 'nsMaiInterfaceSelection.cpp', + 'nsMaiInterfaceTable.cpp', + 'nsMaiInterfaceText.cpp', + 'nsMaiInterfaceValue.cpp', +] + diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in index 6035c920a36..39f108a3dae 100644 --- a/accessible/src/base/Makefile.in +++ b/accessible/src/base/Makefile.in @@ -12,40 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_base_s LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - AccCollector.cpp \ - AccEvent.cpp \ - AccGroupInfo.cpp \ - AccIterator.cpp \ - Filters.cpp \ - ARIAMap.cpp \ - ARIAStateMap.cpp \ - DocManager.cpp \ - EventQueue.cpp \ - FocusManager.cpp \ - NotificationController.cpp \ - nsAccessNode.cpp \ - nsCoreUtils.cpp \ - nsAccUtils.cpp \ - nsAccessibilityService.cpp \ - nsAccessiblePivot.cpp \ - nsEventShell.cpp \ - nsTextEquivUtils.cpp \ - RoleAsserts.cpp \ - SelectionManager.cpp \ - StyleInfo.cpp \ - TextAttrs.cpp \ - TextUpdater.cpp \ - TreeWalker.cpp \ - $(NULL) - -ifneq ($(A11Y_LOG),0) -CPPSRCS += \ - Logging.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build index 3076be5c7e1..62fe6bab066 100644 --- a/accessible/src/base/moz.build +++ b/accessible/src/base/moz.build @@ -4,6 +4,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +include('../shared.mozbuild') + MODULE = 'accessibility' EXPORTS += [ @@ -26,3 +28,35 @@ if CONFIG['MOZ_DEBUG']: EXPORTS.mozilla.a11y += [ 'Logging.h', ] + +CPP_SOURCES += [ + 'AccCollector.cpp', + 'AccEvent.cpp', + 'AccGroupInfo.cpp', + 'AccIterator.cpp', + 'ARIAMap.cpp', + 'ARIAStateMap.cpp', + 'DocManager.cpp', + 'EventQueue.cpp', + 'Filters.cpp', + 'FocusManager.cpp', + 'NotificationController.cpp', + 'nsAccessibilityService.cpp', + 'nsAccessiblePivot.cpp', + 'nsAccessNode.cpp', + 'nsAccUtils.cpp', + 'nsCoreUtils.cpp', + 'nsEventShell.cpp', + 'nsTextEquivUtils.cpp', + 'RoleAsserts.cpp', + 'SelectionManager.cpp', + 'StyleInfo.cpp', + 'TextAttrs.cpp', + 'TextUpdater.cpp', + 'TreeWalker.cpp', +] + +if a11y_log: + CPP_SOURCES += [ + 'Logging.cpp', + ] diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in index 441a644b2ee..34021a5bbf9 100644 --- a/accessible/src/generic/Makefile.in +++ b/accessible/src/generic/Makefile.in @@ -12,22 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_generic_s LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - Accessible.cpp \ - ApplicationAccessible.cpp \ - ARIAGridAccessible.cpp \ - BaseAccessibles.cpp \ - DocAccessible.cpp \ - FormControlAccessible.cpp \ - HyperTextAccessible.cpp \ - ImageAccessible.cpp \ - OuterDocAccessible.cpp \ - RootAccessible.cpp \ - TableCellAccessible.cpp \ - TextLeafAccessible.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build index 74390fe424b..353f9372119 100644 --- a/accessible/src/generic/moz.build +++ b/accessible/src/generic/moz.build @@ -12,3 +12,18 @@ EXPORTS.mozilla.a11y += [ 'HyperTextAccessible.h', ] +CPP_SOURCES += [ + 'ARIAGridAccessible.cpp', + 'Accessible.cpp', + 'ApplicationAccessible.cpp', + 'BaseAccessibles.cpp', + 'DocAccessible.cpp', + 'FormControlAccessible.cpp', + 'HyperTextAccessible.cpp', + 'ImageAccessible.cpp', + 'OuterDocAccessible.cpp', + 'RootAccessible.cpp', + 'TableCellAccessible.cpp', + 'TextLeafAccessible.cpp', +] + diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in index 121796e431a..b7fe6b81f81 100644 --- a/accessible/src/html/Makefile.in +++ b/accessible/src/html/Makefile.in @@ -13,19 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_html_s LIBXUL_LIBRARY = 1 - - -CPPSRCS = \ - HTMLCanvasAccessible.cpp \ - HTMLElementAccessibles.cpp \ - HTMLFormControlAccessible.cpp \ - HTMLImageMapAccessible.cpp \ - HTMLLinkAccessible.cpp \ - HTMLListAccessible.cpp \ - HTMLSelectAccessible.cpp \ - HTMLTableAccessible.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build index c7f93f43bd4..fab37b04127 100644 --- a/accessible/src/html/moz.build +++ b/accessible/src/html/moz.build @@ -6,3 +6,14 @@ MODULE = 'accessibility' +CPP_SOURCES += [ + 'HTMLCanvasAccessible.cpp', + 'HTMLElementAccessibles.cpp', + 'HTMLFormControlAccessible.cpp', + 'HTMLImageMapAccessible.cpp', + 'HTMLLinkAccessible.cpp', + 'HTMLListAccessible.cpp', + 'HTMLSelectAccessible.cpp', + 'HTMLTableAccessible.cpp', +] + diff --git a/accessible/src/jsat/moz.build b/accessible/src/jsat/moz.build index b7a9662bcaa..6c626f09ce4 100644 --- a/accessible/src/jsat/moz.build +++ b/accessible/src/jsat/moz.build @@ -6,3 +6,7 @@ MODULE = 'alerts' +CPP_SOURCES += [ + 'nsAccessibilityFactory.cpp', +] + diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in index 22efccbd242..9be9afb1bf0 100644 --- a/accessible/src/other/Makefile.in +++ b/accessible/src/other/Makefile.in @@ -13,12 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_s EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - AccessibleWrap.cpp \ - Platform.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/other/moz.build b/accessible/src/other/moz.build index 92eb82ffbb3..eaa14a1d61a 100644 --- a/accessible/src/other/moz.build +++ b/accessible/src/other/moz.build @@ -11,3 +11,8 @@ EXPORTS.mozilla.a11y += [ 'HyperTextAccessibleWrap.h', ] +CPP_SOURCES += [ + 'AccessibleWrap.cpp', + 'Platform.cpp', +] + diff --git a/accessible/src/shared.mozbuild b/accessible/src/shared.mozbuild new file mode 100644 index 00000000000..839ef829677 --- /dev/null +++ b/accessible/src/shared.mozbuild @@ -0,0 +1,12 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +a11y_log = 0 +if CONFIG['MOZ_DEBUG']: + a11y_log = 1 + +if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'beta', 'release', 'esr'): + a11y_log = 1 diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in index b5ed88e1b6e..3672bbb1f98 100644 --- a/accessible/src/windows/ia2/Makefile.in +++ b/accessible/src/windows/ia2/Makefile.in @@ -13,21 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_ia2_s EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 - -CPPSRCS += \ - ia2AccessibleAction.cpp \ - ia2AccessibleComponent.cpp \ - ia2AccessibleEditableText.cpp \ - ia2AccessibleHyperlink.cpp \ - ia2AccessibleHypertext.cpp \ - ia2AccessibleImage.cpp \ - ia2AccessibleRelation.cpp \ - ia2AccessibleTable.cpp \ - ia2AccessibleTableCell.cpp \ - ia2AccessibleText.cpp \ - ia2AccessibleValue.cpp \ - $(NULL) - # The midl generated code include Windows headers which defines min and max # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build index f5da405ee9c..54f52890d53 100644 --- a/accessible/src/windows/ia2/moz.build +++ b/accessible/src/windows/ia2/moz.build @@ -16,3 +16,17 @@ EXPORTS += [ 'ia2AccessibleValue.h', ] +CPP_SOURCES += [ + 'ia2AccessibleAction.cpp', + 'ia2AccessibleComponent.cpp', + 'ia2AccessibleEditableText.cpp', + 'ia2AccessibleHyperlink.cpp', + 'ia2AccessibleHypertext.cpp', + 'ia2AccessibleImage.cpp', + 'ia2AccessibleRelation.cpp', + 'ia2AccessibleTable.cpp', + 'ia2AccessibleTableCell.cpp', + 'ia2AccessibleText.cpp', + 'ia2AccessibleValue.cpp', +] + diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in index d0d7d510a8f..092deff85ed 100644 --- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -13,34 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_msaa_s EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - AccessibleWrap.cpp \ - ApplicationAccessibleWrap.cpp \ - ARIAGridAccessibleWrap.cpp \ - DocAccessibleWrap.cpp \ - HTMLTableAccessibleWrap.cpp \ - HTMLWin32ObjectAccessible.cpp \ - HyperTextAccessibleWrap.cpp \ - ImageAccessibleWrap.cpp \ - IUnknownImpl.cpp \ - nsWinUtils.cpp \ - Compatibility.cpp \ - EnumVariant.cpp \ - Platform.cpp \ - ServiceProvider.cpp \ - RootAccessibleWrap.cpp \ - TextLeafAccessibleWrap.cpp \ - $(NULL) - -ifdef MOZ_XUL -CPPSRCS += \ - XULListboxAccessibleWrap.cpp \ - XULMenuAccessibleWrap.cpp \ - XULTreeGridAccessibleWrap.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build index 074f7e7e375..febc7f713dd 100644 --- a/accessible/src/windows/msaa/moz.build +++ b/accessible/src/windows/msaa/moz.build @@ -16,3 +16,28 @@ EXPORTS.mozilla.a11y += [ 'HyperTextAccessibleWrap.h', ] +CPP_SOURCES += [ + 'AccessibleWrap.cpp', + 'ApplicationAccessibleWrap.cpp', + 'ARIAGridAccessibleWrap.cpp', + 'DocAccessibleWrap.cpp', + 'HTMLTableAccessibleWrap.cpp', + 'HTMLWin32ObjectAccessible.cpp', + 'HyperTextAccessibleWrap.cpp', + 'ImageAccessibleWrap.cpp', + 'IUnknownImpl.cpp', + 'nsWinUtils.cpp', + 'Compatibility.cpp', + 'EnumVariant.cpp', + 'Platform.cpp', + 'ServiceProvider.cpp', + 'RootAccessibleWrap.cpp', + 'TextLeafAccessibleWrap.cpp', +] + +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'XULListboxAccessibleWrap.cpp', + 'XULMenuAccessibleWrap.cpp', + 'XULTreeGridAccessibleWrap.cpp', + ] diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in index b3769381e00..b61c86a86d1 100644 --- a/accessible/src/windows/sdn/Makefile.in +++ b/accessible/src/windows/sdn/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX -CPPSRCS += \ - sdnAccessible.cpp \ - sdnTextAccessible.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build index c7f93f43bd4..3736a2980ac 100644 --- a/accessible/src/windows/sdn/moz.build +++ b/accessible/src/windows/sdn/moz.build @@ -6,3 +6,8 @@ MODULE = 'accessibility' +CPP_SOURCES += [ + 'sdnAccessible.cpp', + 'sdnTextAccessible.cpp', +] + diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index 5ad8cb5ea47..86f84a2a62d 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX - -CPPSRCS += \ - uiaRawElmProvider.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build index c7f93f43bd4..f6c2ee69dc5 100644 --- a/accessible/src/windows/uia/moz.build +++ b/accessible/src/windows/uia/moz.build @@ -6,3 +6,7 @@ MODULE = 'accessibility' +CPP_SOURCES += [ + 'uiaRawElmProvider.cpp', +] + diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in index 3c791eee845..06f1310f602 100644 --- a/accessible/src/xpcom/Makefile.in +++ b/accessible/src/xpcom/Makefile.in @@ -13,13 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_xpcom_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - xpcAccEvents.cpp \ - nsAccessibleRelation.cpp \ - xpcAccessibleTable.cpp \ - xpcAccessibleTableCell.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build index 7d24d9eacd5..1c240857468 100644 --- a/accessible/src/xpcom/moz.build +++ b/accessible/src/xpcom/moz.build @@ -10,3 +10,10 @@ EXPORTS += [ 'xpcAccEvents.h', ] +CPP_SOURCES += [ + 'nsAccessibleRelation.cpp', + 'xpcAccEvents.cpp', + 'xpcAccessibleTable.cpp', + 'xpcAccessibleTableCell.cpp', +] + diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in index 87f204f575c..4487545195b 100644 --- a/accessible/src/xul/Makefile.in +++ b/accessible/src/xul/Makefile.in @@ -13,23 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_xul_s LIBXUL_LIBRARY = 1 - - -CPPSRCS = \ - XULAlertAccessible.cpp \ - XULColorPickerAccessible.cpp \ - XULComboboxAccessible.cpp \ - XULElementAccessibles.cpp \ - XULFormControlAccessible.cpp \ - XULListboxAccessible.cpp \ - XULMenuAccessible.cpp \ - XULSelectControlAccessible.cpp \ - XULSliderAccessible.cpp \ - XULTabAccessible.cpp \ - XULTreeAccessible.cpp \ - XULTreeGridAccessible.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build index c7f93f43bd4..449e489c840 100644 --- a/accessible/src/xul/moz.build +++ b/accessible/src/xul/moz.build @@ -6,3 +6,18 @@ MODULE = 'accessibility' +CPP_SOURCES += [ + 'XULAlertAccessible.cpp', + 'XULColorPickerAccessible.cpp', + 'XULComboboxAccessible.cpp', + 'XULElementAccessibles.cpp', + 'XULFormControlAccessible.cpp', + 'XULListboxAccessible.cpp', + 'XULMenuAccessible.cpp', + 'XULSelectControlAccessible.cpp', + 'XULSliderAccessible.cpp', + 'XULTabAccessible.cpp', + 'XULTreeAccessible.cpp', + 'XULTreeGridAccessible.cpp', +] + diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in index 5e38e050632..55788d37bfc 100644 --- a/b2g/app/Makefile.in +++ b/b2g/app/Makefile.in @@ -19,8 +19,6 @@ endif ifndef LIBXUL_SDK -CPPSRCS = nsBrowserApp.cpp - ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) LIBS += \ -lui \ diff --git a/b2g/app/moz.build b/b2g/app/moz.build index 9abd79dcd7a..e957dab654f 100644 --- a/b2g/app/moz.build +++ b/b2g/app/moz.build @@ -9,3 +9,6 @@ if not CONFIG['LIBXUL_SDK']: PROGRAM = CONFIG['MOZ_APP_NAME'] + "-bin" else: PROGRAM = CONFIG['MOZ_APP_NAME'] + CPP_SOURCES += [ + 'nsBrowserApp.cpp', + ] diff --git a/b2g/gaia/Makefile.in b/b2g/gaia/Makefile.in index c29b480d35f..e4c11fbb745 100644 --- a/b2g/gaia/Makefile.in +++ b/b2g/gaia/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk GAIA_PATH := gaia/profile ifeq ($(OS_ARCH),WINNT) -CPPSRCS = run-b2g.cpp DEFINES += \ -DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \ -DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \ diff --git a/b2g/gaia/moz.build b/b2g/gaia/moz.build index 75e290033c5..6767e13076d 100644 --- a/b2g/gaia/moz.build +++ b/b2g/gaia/moz.build @@ -6,3 +6,7 @@ PROGRAM = CONFIG['MOZ_APP_NAME'] +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'run-b2g.cpp', + ] diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 55b613807f8..81f9d9fad27 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -43,8 +43,6 @@ endif #} LIBXUL_SDK # Build a binary bootstrapping with XRE_main -CPPSRCS = nsBrowserApp.cpp - LOCAL_INCLUDES += \ -I$(topsrcdir)/toolkit/xre \ -I$(topsrcdir)/xpcom/base \ diff --git a/browser/app/moz.build b/browser/app/moz.build index dc284bc8006..e0f8bc22dd9 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -8,3 +8,6 @@ DIRS += ['profile/extensions'] PROGRAM = CONFIG['MOZ_APP_NAME'] +CPP_SOURCES += [ + 'nsBrowserApp.cpp', +] diff --git a/browser/components/about/Makefile.in b/browser/components/about/Makefile.in index 50397b72037..5a51bb96c9f 100644 --- a/browser/components/about/Makefile.in +++ b/browser/components/about/Makefile.in @@ -14,8 +14,6 @@ LIBRARY_NAME = browserabout_s FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 -CPPSRCS = AboutRedirector.cpp - LOCAL_INCLUDES = -I$(srcdir)/../build include $(topsrcdir)/config/rules.mk diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build index 214a10bb83a..09276062568 100644 --- a/browser/components/about/moz.build +++ b/browser/components/about/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.browser += [ 'AboutRedirector.h', ] +CPP_SOURCES += [ + 'AboutRedirector.cpp', +] + diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index 5f4ebaffadd..a5b843c8b72 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -17,9 +17,6 @@ FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 -CPPSRCS = nsModule.cpp \ - $(NULL) - ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32 shlwapi) endif diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build index eae645ad5c7..0ccc03f76fc 100644 --- a/browser/components/build/moz.build +++ b/browser/components/build/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'nsBrowserCompsCID.h', ] +CPP_SOURCES += [ + 'nsModule.cpp', +] + diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in index 5574c1b4948..9534e682afd 100644 --- a/browser/components/dirprovider/Makefile.in +++ b/browser/components/dirprovider/Makefile.in @@ -14,8 +14,6 @@ LIBRARY_NAME = browserdir_s FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 -CPPSRCS = DirectoryProvider.cpp - LOCAL_INCLUDES = -I$(srcdir)/../build EXTRA_DSO_LDOPTS = \ diff --git a/browser/components/dirprovider/moz.build b/browser/components/dirprovider/moz.build index 08b678163a2..d92ccfd63fb 100644 --- a/browser/components/dirprovider/moz.build +++ b/browser/components/dirprovider/moz.build @@ -12,3 +12,7 @@ EXPORTS.mozilla.browser += [ 'DirectoryProvider.h', ] +CPP_SOURCES += [ + 'DirectoryProvider.cpp', +] + diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in index b0e90816315..91be7dc0c8c 100644 --- a/browser/components/feeds/src/Makefile.in +++ b/browser/components/feeds/src/Makefile.in @@ -30,8 +30,6 @@ EXTRA_PP_COMPONENTS = \ $(NULL) -CPPSRCS = nsFeedSniffer.cpp - LOCAL_INCLUDES = -I$(srcdir)/../../build include $(topsrcdir)/config/rules.mk diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build index ab95a22c500..e2fe4cf8dbd 100644 --- a/browser/components/feeds/src/moz.build +++ b/browser/components/feeds/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'browser_feeds' +CPP_SOURCES += [ + 'nsFeedSniffer.cpp', +] + diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in index 49eb46de753..0feb848fe9f 100644 --- a/browser/components/migration/src/Makefile.in +++ b/browser/components/migration/src/Makefile.in @@ -24,8 +24,6 @@ EXTRA_PP_COMPONENTS = \ $(NULL) ifeq ($(OS_ARCH),WINNT) -CPPSRCS += nsIEHistoryEnumerator.cpp - EXTRA_COMPONENTS += IEProfileMigrator.js \ $(NULL) diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build index d923078b3c7..9316133af69 100644 --- a/browser/components/migration/src/moz.build +++ b/browser/components/migration/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'migration' +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsIEHistoryEnumerator.cpp', + ] diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in index b4f12cff263..c8c01038237 100644 --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in @@ -13,21 +13,24 @@ include $(DEPTH)/config/autoconf.mk FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 + +# TODO: Previously, LIBRARY_NAME was set as follows: +#ifdef CPPSRCS +#LIBRARY_NAME = shellservice_s +#endif +# But now we set CPPSRCS in moz.build, which isn't defined at this point. +# This can be simplified when LIBRARY_NAME is in moz.build as well. ifeq ($(OS_ARCH),WINNT) -CPPSRCS = nsWindowsShellService.cpp +LIBRARY_NAME = shellservice_s else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS = nsMacShellService.cpp +LIBRARY_NAME = shellservice_s else ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) -CPPSRCS = nsGNOMEShellService.cpp -endif -endif -endif - -ifdef CPPSRCS LIBRARY_NAME = shellservice_s endif +endif +endif EXTRA_COMPONENTS = nsSetDefaultBrowser.js nsSetDefaultBrowser.manifest diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build index d7e401c5d91..af43661064b 100644 --- a/browser/components/shell/src/moz.build +++ b/browser/components/shell/src/moz.build @@ -6,3 +6,15 @@ MODULE = 'shellservice' +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsWindowsShellService.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CPP_SOURCES += [ + 'nsMacShellService.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'nsGNOMEShellService.cpp', + ] diff --git a/browser/metro/shell/commandexecutehandler/Makefile.in b/browser/metro/shell/commandexecutehandler/Makefile.in index 21436e930ee..80b73787b23 100644 --- a/browser/metro/shell/commandexecutehandler/Makefile.in +++ b/browser/metro/shell/commandexecutehandler/Makefile.in @@ -22,11 +22,6 @@ DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX) MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = -CPPSRCS = \ - CommandExecuteHandler.cpp \ - CEHHelper.cpp \ - $(NULL) - OS_LIBS = \ kernel32.lib \ user32.lib \ diff --git a/browser/metro/shell/commandexecutehandler/moz.build b/browser/metro/shell/commandexecutehandler/moz.build index 68ce1ccdd4a..9def8c68341 100644 --- a/browser/metro/shell/commandexecutehandler/moz.build +++ b/browser/metro/shell/commandexecutehandler/moz.build @@ -5,3 +5,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. PROGRAM = 'CommandExecuteHandler' + +CPP_SOURCES += [ + 'CEHHelper.cpp', + 'CommandExecuteHandler.cpp', +] diff --git a/browser/metro/shell/linktool/Makefile.in b/browser/metro/shell/linktool/Makefile.in index 3373c0b80b1..896515cace7 100644 --- a/browser/metro/shell/linktool/Makefile.in +++ b/browser/metro/shell/linktool/Makefile.in @@ -15,8 +15,6 @@ include $(topsrcdir)/config/config.mk DIST_SUBDIR = metro/install -CPPSRCS = linktool.cpp - OS_LIBS = \ kernel32.lib \ user32.lib \ diff --git a/browser/metro/shell/linktool/moz.build b/browser/metro/shell/linktool/moz.build index e50ad540264..440a82cc419 100644 --- a/browser/metro/shell/linktool/moz.build +++ b/browser/metro/shell/linktool/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'linktool' +CPP_SOURCES += [ + 'linktool.cpp', +] diff --git a/browser/metro/shell/testing/Makefile.in b/browser/metro/shell/testing/Makefile.in index de3fec1e7bb..c201df0fafd 100644 --- a/browser/metro/shell/testing/Makefile.in +++ b/browser/metro/shell/testing/Makefile.in @@ -23,10 +23,6 @@ include $(topsrcdir)/config/config.mk # We want this exe in dist/bin DIST_SUBDIR = -CPPSRCS = \ - metrotestharness.cpp \ - $(NULL) - OS_LIBS = \ kernel32.lib \ user32.lib \ diff --git a/browser/metro/shell/testing/moz.build b/browser/metro/shell/testing/moz.build index a1387ba6e84..b8e7f9e92a7 100644 --- a/browser/metro/shell/testing/moz.build +++ b/browser/metro/shell/testing/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'metrotestharness' +CPP_SOURCES += [ + 'metrotestharness.cpp', +] diff --git a/build/stlport/Makefile.in b/build/stlport/Makefile.in index 6bc2af3ea97..2bc23d19285 100644 --- a/build/stlport/Makefile.in +++ b/build/stlport/Makefile.in @@ -20,7 +20,6 @@ LIBRARY = $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX) VPATH += $(STLPORT_SOURCES)/src -CPPSRCS = $(notdir $(wildcard $(STLPORT_SOURCES)/src/*.cpp)) CSRCS = $(notdir $(wildcard $(STLPORT_SOURCES)/src/*.c)) include $(topsrcdir)/config/rules.mk diff --git a/build/stlport/moz.build b/build/stlport/moz.build index 7e1d22773ca..c8e334f43f2 100644 --- a/build/stlport/moz.build +++ b/build/stlport/moz.build @@ -6,3 +6,7 @@ CONFIGURE_SUBST_FILES += ['stl/config/_android.h'] +CPP_SOURCES += [ + '$(notdir $(wildcard $(STLPORT_SOURCES)/src/*.cpp))', +] + diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in index 96b1eb354cb..2ec8caf6da7 100644 --- a/build/unix/stdc++compat/Makefile.in +++ b/build/unix/stdc++compat/Makefile.in @@ -16,8 +16,6 @@ STL_FLAGS = NO_EXPAND_LIBS = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 -CPPSRCS = \ - stdc++compat.cpp $(NULL) HOST_CPPSRCS = $(CPPSRCS) diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build index 707c68432d0..76cd122cd60 100644 --- a/build/unix/stdc++compat/moz.build +++ b/build/unix/stdc++compat/moz.build @@ -6,3 +6,7 @@ MODULE = 'build' +CPP_SOURCES += [ + 'stdc++compat.cpp', +] + diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 1a77a7b2864..c6a7dc45ece 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -14,7 +14,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1 ifdef ENABLE_TESTS USE_STATIC_LIBS = 1 -CPPSRCS = crashinject.cpp endif # ENABLE_TESTS diff --git a/build/win32/crashinjectdll/Makefile.in b/build/win32/crashinjectdll/Makefile.in index b5ce557f82d..7db31f912ff 100644 --- a/build/win32/crashinjectdll/Makefile.in +++ b/build/win32/crashinjectdll/Makefile.in @@ -14,8 +14,6 @@ DEFFILE = $(srcdir)/crashinjectdll.def FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 -CPPSRCS = crashinjectdll.cpp - MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk diff --git a/build/win32/crashinjectdll/moz.build b/build/win32/crashinjectdll/moz.build index 895d11993cf..75292c0a286 100644 --- a/build/win32/crashinjectdll/moz.build +++ b/build/win32/crashinjectdll/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'crashinjectdll.cpp', +] + diff --git a/build/win32/moz.build b/build/win32/moz.build index c22520393c3..c02c976eaec 100644 --- a/build/win32/moz.build +++ b/build/win32/moz.build @@ -11,3 +11,6 @@ TEST_DIRS += ['crashinjectdll'] if CONFIG['ENABLE_TESTS']: PROGRAM = 'crashinject' + CPP_SOURCES += [ + 'crashinject.cpp', + ] diff --git a/build/win32/vmwarerecordinghelper/Makefile.in b/build/win32/vmwarerecordinghelper/Makefile.in index 8f69b9cfdce..c0fc82b935c 100644 --- a/build/win32/vmwarerecordinghelper/Makefile.in +++ b/build/win32/vmwarerecordinghelper/Makefile.in @@ -15,8 +15,6 @@ DEFFILE = $(srcdir)/$(LIBRARY_NAME).def FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 -CPPSRCS = $(LIBRARY_NAME).cpp - MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk diff --git a/build/win32/vmwarerecordinghelper/moz.build b/build/win32/vmwarerecordinghelper/moz.build index 895d11993cf..8f42c021714 100644 --- a/build/win32/vmwarerecordinghelper/moz.build +++ b/build/win32/vmwarerecordinghelper/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'vmwarerecordinghelper.cpp', +] + diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index 54fe37bc3e7..70a1c5be862 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -16,16 +16,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsPrincipal.cpp \ - nsSystemPrincipal.cpp \ - nsNullPrincipal.cpp \ - nsNullPrincipalURI.cpp \ - nsJSPrincipals.cpp \ - nsScriptSecurityManager.cpp \ - nsSecurityManagerFactory.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../include \ diff --git a/caps/src/moz.build b/caps/src/moz.build index 30195b33bf0..cb52d2b4e0c 100644 --- a/caps/src/moz.build +++ b/caps/src/moz.build @@ -6,3 +6,13 @@ MODULE = 'caps' +CPP_SOURCES += [ + 'nsJSPrincipals.cpp', + 'nsNullPrincipal.cpp', + 'nsNullPrincipalURI.cpp', + 'nsPrincipal.cpp', + 'nsScriptSecurityManager.cpp', + 'nsSecurityManagerFactory.cpp', + 'nsSystemPrincipal.cpp', +] + diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 6db8c103cc0..c31e622428c 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -15,13 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsChromeRegistry.cpp \ - nsChromeRegistryChrome.cpp \ - nsChromeProtocolHandler.cpp \ - nsChromeRegistryContent.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/chrome/src/moz.build b/chrome/src/moz.build index 65551267e63..5fb69ed750c 100644 --- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -10,3 +10,10 @@ EXPORTS.mozilla.chrome += [ 'RegistryMessageUtils.h', ] +CPP_SOURCES += [ + 'nsChromeProtocolHandler.cpp', + 'nsChromeRegistry.cpp', + 'nsChromeRegistryChrome.cpp', + 'nsChromeRegistryContent.cpp', +] + diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 208af67ccfb..eb061b5b48e 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -14,109 +14,12 @@ LIBRARY_NAME = gkconbase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - Comment.cpp \ - DirectionalityUtils.cpp \ - DocumentType.cpp \ - DOMImplementation.cpp \ - EventSource.cpp \ - FileIOObject.cpp \ - nsAtomListUtils.cpp \ - nsAttrAndChildArray.cpp \ - nsAttrValue.cpp \ - nsAttrValueOrString.cpp \ - nsCCUncollectableMarker.cpp \ - nsChannelPolicy.cpp \ - nsContentAreaDragDrop.cpp \ - nsContentIterator.cpp \ - nsContentList.cpp \ - nsContentPolicy.cpp \ - nsContentSink.cpp \ - nsContentUtils.cpp \ - nsCopySupport.cpp \ - nsCrossSiteListenerProxy.cpp \ - nsCSPService.cpp \ - nsDataDocumentContentPolicy.cpp \ - Attr.cpp \ - nsDOMAttributeMap.cpp \ - nsDOMBlobBuilder.cpp \ - nsDOMCaretPosition.cpp \ - nsDOMFile.cpp \ - nsDOMFileReader.cpp \ - nsDOMLists.cpp \ - nsDOMParser.cpp \ - nsDOMSerializer.cpp \ - nsDOMTokenList.cpp \ - nsDOMSettableTokenList.cpp \ - nsDocument.cpp \ - nsDocumentEncoder.cpp \ - DocumentFragment.cpp \ - nsFrameLoader.cpp \ - Element.cpp \ - nsFormData.cpp \ - nsGenConImageContent.cpp \ - nsGenericDOMDataNode.cpp \ - nsGkAtoms.cpp \ - nsHTMLContentSerializer.cpp \ - nsImageLoadingContent.cpp \ - nsINode.cpp \ - nsLineBreaker.cpp \ - nsMappedAttributeElement.cpp \ - nsMappedAttributes.cpp \ - nsNameSpaceManager.cpp \ - nsNoDataProtocolContentPolicy.cpp \ - nsNodeInfo.cpp \ - nsNodeInfoManager.cpp \ - NodeIterator.cpp \ - nsNodeUtils.cpp \ - nsObjectLoadingContent.cpp \ - nsPlainTextSerializer.cpp \ - nsPropertyTable.cpp \ - nsRange.cpp \ - nsReferencedElement.cpp \ - nsScriptElement.cpp \ - nsScriptLoader.cpp \ - nsStubDocumentObserver.cpp \ - nsStubMutationObserver.cpp \ - nsStyledElement.cpp \ - nsStyleLinkElement.cpp \ - nsSyncLoadService.cpp \ - Text.cpp \ - nsTextFragment.cpp \ - nsTextNode.cpp \ - nsTraversal.cpp \ - nsTreeSanitizer.cpp \ - TreeWalker.cpp \ - nsViewportInfo.cpp \ - WebSocket.cpp \ - nsXHTMLContentSerializer.cpp \ - nsXMLContentSerializer.cpp \ - nsXMLHttpRequest.cpp \ - nsXMLNameSpaceMap.cpp \ - FragmentOrElement.cpp \ - Link.cpp \ - nsHostObjectProtocolHandler.cpp \ - nsHostObjectURI.cpp \ - nsFrameMessageManager.cpp \ - nsInProcessTabChildGlobal.cpp \ - ThirdPartyUtil.cpp \ - nsDOMMutationObserver.cpp \ - nsMixedContentBlocker.cpp \ - $(NULL) - ifdef MOZ_WEBRTC -CPPSRCS += nsDOMDataChannel.cpp LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ $(NULL) endif -# Are we targeting x86-32 or x86-64? If so, we want to include SSE2 code for -# nsTextFragment.cpp -ifneq (,$(INTEL_ARCHITECTURE)) -CPPSRCS += nsTextFragmentSSE2.cpp -endif - GQI_SRCS = contentbase.gqi # we don't want the shared lib, but we want to force the creation of a diff --git a/content/base/src/moz.build b/content/base/src/moz.build index de6a16a0e41..383955bcde6 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -39,6 +39,16 @@ if CONFIG['MOZ_WEBRTC']: 'nsDOMDataChannel.h', 'nsDOMDataChannelDeclarations.h', ] + CPP_SOURCES += [ + 'nsDOMDataChannel.cpp', + ] + +# Are we targeting x86-32 or x86-64? If so, we want to include SSE2 code for +# nsTextFragment.cpp +if CONFIG['INTEL_ARCHITECTURE']: + CPP_SOURCES += [ + 'nsTextFragmentSSE2.cpp', + ] EXPORTS.mozilla.dom += [ 'Attr.h', @@ -53,3 +63,93 @@ EXPORTS.mozilla.dom += [ 'TreeWalker.h', ] +CPP_SOURCES += [ + 'Attr.cpp', + 'Comment.cpp', + 'DOMImplementation.cpp', + 'DirectionalityUtils.cpp', + 'DocumentFragment.cpp', + 'DocumentType.cpp', + 'Element.cpp', + 'EventSource.cpp', + 'FileIOObject.cpp', + 'FragmentOrElement.cpp', + 'Link.cpp', + 'NodeIterator.cpp', + 'Text.cpp', + 'ThirdPartyUtil.cpp', + 'TreeWalker.cpp', + 'WebSocket.cpp', + 'nsAtomListUtils.cpp', + 'nsAttrAndChildArray.cpp', + 'nsAttrValue.cpp', + 'nsAttrValueOrString.cpp', + 'nsCCUncollectableMarker.cpp', + 'nsCSPService.cpp', + 'nsChannelPolicy.cpp', + 'nsContentAreaDragDrop.cpp', + 'nsContentIterator.cpp', + 'nsContentList.cpp', + 'nsContentPolicy.cpp', + 'nsContentSink.cpp', + 'nsContentUtils.cpp', + 'nsCopySupport.cpp', + 'nsCrossSiteListenerProxy.cpp', + 'nsDOMAttributeMap.cpp', + 'nsDOMBlobBuilder.cpp', + 'nsDOMCaretPosition.cpp', + 'nsDOMFile.cpp', + 'nsDOMFileReader.cpp', + 'nsDOMLists.cpp', + 'nsDOMMutationObserver.cpp', + 'nsDOMParser.cpp', + 'nsDOMSerializer.cpp', + 'nsDOMSettableTokenList.cpp', + 'nsDOMTokenList.cpp', + 'nsDataDocumentContentPolicy.cpp', + 'nsDocument.cpp', + 'nsDocumentEncoder.cpp', + 'nsFormData.cpp', + 'nsFrameLoader.cpp', + 'nsFrameMessageManager.cpp', + 'nsGenConImageContent.cpp', + 'nsGenericDOMDataNode.cpp', + 'nsGkAtoms.cpp', + 'nsHTMLContentSerializer.cpp', + 'nsHostObjectProtocolHandler.cpp', + 'nsHostObjectURI.cpp', + 'nsINode.cpp', + 'nsImageLoadingContent.cpp', + 'nsInProcessTabChildGlobal.cpp', + 'nsLineBreaker.cpp', + 'nsMappedAttributeElement.cpp', + 'nsMappedAttributes.cpp', + 'nsMixedContentBlocker.cpp', + 'nsNameSpaceManager.cpp', + 'nsNoDataProtocolContentPolicy.cpp', + 'nsNodeInfo.cpp', + 'nsNodeInfoManager.cpp', + 'nsNodeUtils.cpp', + 'nsObjectLoadingContent.cpp', + 'nsPlainTextSerializer.cpp', + 'nsPropertyTable.cpp', + 'nsRange.cpp', + 'nsReferencedElement.cpp', + 'nsScriptElement.cpp', + 'nsScriptLoader.cpp', + 'nsStubDocumentObserver.cpp', + 'nsStubMutationObserver.cpp', + 'nsStyleLinkElement.cpp', + 'nsStyledElement.cpp', + 'nsSyncLoadService.cpp', + 'nsTextFragment.cpp', + 'nsTextNode.cpp', + 'nsTraversal.cpp', + 'nsTreeSanitizer.cpp', + 'nsViewportInfo.cpp', + 'nsXHTMLContentSerializer.cpp', + 'nsXMLContentSerializer.cpp', + 'nsXMLHttpRequest.cpp', + 'nsXMLNameSpaceMap.cpp', +] + diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index ce2afdee16f..02222034b32 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -15,56 +15,10 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - CanvasImageCache.cpp \ - CanvasRenderingContext2D.cpp \ - CanvasUtils.cpp \ - DocumentRendererParent.cpp \ - DocumentRendererChild.cpp \ - ImageData.cpp \ - $(NULL) - ifdef MOZ_WEBGL - -CPPSRCS += \ - WebGLActiveInfo.cpp \ - WebGLBuffer.cpp \ - WebGLContext.cpp \ - WebGLContextGL.cpp \ - WebGLContextUtils.cpp \ - WebGLContextReporter.cpp \ - WebGLContextValidate.cpp \ - WebGLElementArrayCache.cpp \ - WebGLExtensionBase.cpp \ - WebGLExtensionCompressedTextureATC.cpp \ - WebGLExtensionCompressedTexturePVRTC.cpp \ - WebGLExtensionCompressedTextureS3TC.cpp \ - WebGLExtensionDebugRendererInfo.cpp \ - WebGLExtensionDepthTexture.cpp \ - WebGLExtensionElementIndexUint.cpp \ - WebGLExtensionLoseContext.cpp \ - WebGLExtensionStandardDerivatives.cpp \ - WebGLExtensionTextureFilterAnisotropic.cpp \ - WebGLExtensionTextureFloat.cpp \ - WebGLFramebuffer.cpp \ - WebGLObjectModel.cpp \ - WebGLProgram.cpp \ - WebGLRenderbuffer.cpp \ - WebGLShader.cpp \ - WebGLShaderPrecisionFormat.cpp \ - WebGLTexelConversions.cpp \ - WebGLTexture.cpp \ - WebGLUniformLocation.cpp \ - $(NULL) - LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ $(NULL) - -else - -CPPSRCS += WebGLContextNotSupported.cpp - endif # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index 49edcf8289f..90130f4d5f7 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -15,3 +15,47 @@ EXPORTS.mozilla.dom += [ 'TextMetrics.h', ] +CPP_SOURCES += [ + 'CanvasImageCache.cpp', + 'CanvasRenderingContext2D.cpp', + 'CanvasUtils.cpp', + 'DocumentRendererChild.cpp', + 'DocumentRendererParent.cpp', + 'ImageData.cpp', +] + +if CONFIG['MOZ_WEBGL']: + CPP_SOURCES += [ + 'WebGLActiveInfo.cpp', + 'WebGLBuffer.cpp', + 'WebGLContext.cpp', + 'WebGLContextGL.cpp', + 'WebGLContextUtils.cpp', + 'WebGLContextReporter.cpp', + 'WebGLContextValidate.cpp', + 'WebGLElementArrayCache.cpp', + 'WebGLExtensionBase.cpp', + 'WebGLExtensionCompressedTextureATC.cpp', + 'WebGLExtensionCompressedTexturePVRTC.cpp', + 'WebGLExtensionCompressedTextureS3TC.cpp', + 'WebGLExtensionDebugRendererInfo.cpp', + 'WebGLExtensionDepthTexture.cpp', + 'WebGLExtensionElementIndexUint.cpp', + 'WebGLExtensionLoseContext.cpp', + 'WebGLExtensionStandardDerivatives.cpp', + 'WebGLExtensionTextureFilterAnisotropic.cpp', + 'WebGLExtensionTextureFloat.cpp', + 'WebGLFramebuffer.cpp', + 'WebGLObjectModel.cpp', + 'WebGLProgram.cpp', + 'WebGLRenderbuffer.cpp', + 'WebGLShader.cpp', + 'WebGLShaderPrecisionFormat.cpp', + 'WebGLTexelConversions.cpp', + 'WebGLTexture.cpp', + 'WebGLUniformLocation.cpp', + ] +else: + CPP_SOURCES += [ + 'WebGLContextNotSupported.cpp', + ] diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 44f44e8af4a..4e075bdb99e 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -15,53 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - EventTarget.cpp \ - nsEventListenerManager.cpp \ - nsEventStateManager.cpp \ - nsDOMEvent.cpp \ - nsDOMDataContainerEvent.cpp \ - nsDOMUIEvent.cpp \ - nsDOMKeyboardEvent.cpp \ - nsDOMTextEvent.cpp \ - nsDOMMouseEvent.cpp \ - nsDOMMouseScrollEvent.cpp \ - nsDOMDragEvent.cpp \ - nsDOMMutationEvent.cpp \ - nsDOMDeviceMotionEvent.cpp \ - nsDOMBeforeUnloadEvent.cpp \ - nsDOMXULCommandEvent.cpp \ - nsDOMCommandEvent.cpp \ - nsDOMMessageEvent.cpp \ - nsPaintRequest.cpp \ - nsPrivateTextRange.cpp \ - nsAsyncDOMEvent.cpp \ - nsEventDispatcher.cpp \ - nsIMEStateManager.cpp \ - nsContentEventHandler.cpp \ - nsEventListenerService.cpp \ - nsDOMDataTransfer.cpp \ - nsDOMNotifyPaintEvent.cpp \ - nsDOMNotifyAudioAvailableEvent.cpp \ - nsDOMSimpleGestureEvent.cpp \ - nsDOMEventTargetHelper.cpp \ - nsDOMScrollAreaEvent.cpp \ - nsDOMTransitionEvent.cpp \ - nsDOMAnimationEvent.cpp \ - nsDOMTouchEvent.cpp \ - nsDOMCompositionEvent.cpp \ - nsDOMClipboardEvent.cpp \ - DOMWheelEvent.cpp \ - TextComposition.cpp \ - Touch.cpp \ - $(NULL) - -ifdef MOZ_GAMEPAD -CPPSRCS += \ - nsDOMGamepad.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/events/src/moz.build b/content/events/src/moz.build index 0f6a3d95a73..9eb4b33ef9c 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -20,3 +20,48 @@ EXPORTS.mozilla.dom += [ 'Touch.h', ] +CPP_SOURCES += [ + 'DOMWheelEvent.cpp', + 'EventTarget.cpp', + 'TextComposition.cpp', + 'Touch.cpp', + 'nsAsyncDOMEvent.cpp', + 'nsContentEventHandler.cpp', + 'nsDOMAnimationEvent.cpp', + 'nsDOMBeforeUnloadEvent.cpp', + 'nsDOMClipboardEvent.cpp', + 'nsDOMCommandEvent.cpp', + 'nsDOMCompositionEvent.cpp', + 'nsDOMDataContainerEvent.cpp', + 'nsDOMDataTransfer.cpp', + 'nsDOMDeviceMotionEvent.cpp', + 'nsDOMDragEvent.cpp', + 'nsDOMEvent.cpp', + 'nsDOMEventTargetHelper.cpp', + 'nsDOMKeyboardEvent.cpp', + 'nsDOMMessageEvent.cpp', + 'nsDOMMouseEvent.cpp', + 'nsDOMMouseScrollEvent.cpp', + 'nsDOMMutationEvent.cpp', + 'nsDOMNotifyAudioAvailableEvent.cpp', + 'nsDOMNotifyPaintEvent.cpp', + 'nsDOMScrollAreaEvent.cpp', + 'nsDOMSimpleGestureEvent.cpp', + 'nsDOMTextEvent.cpp', + 'nsDOMTouchEvent.cpp', + 'nsDOMTransitionEvent.cpp', + 'nsDOMUIEvent.cpp', + 'nsDOMXULCommandEvent.cpp', + 'nsEventDispatcher.cpp', + 'nsEventListenerManager.cpp', + 'nsEventListenerService.cpp', + 'nsEventStateManager.cpp', + 'nsIMEStateManager.cpp', + 'nsPaintRequest.cpp', + 'nsPrivateTextRange.cpp', +] + +if CONFIG['MOZ_GAMEPAD']: + CPP_SOURCES += [ + 'nsDOMGamepad.cpp', + ] diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index c0c0a5bc07e..e1ce906c9ed 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -15,84 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - HTMLPropertiesCollection.cpp \ - nsClientRect.cpp \ - nsHTMLDNSPrefetch.cpp \ - nsGenericHTMLElement.cpp \ - nsGenericHTMLFrameElement.cpp \ - nsFormSubmission.cpp \ - nsTextEditorState.cpp \ - HTMLElement.cpp \ - HTMLAnchorElement.cpp \ - HTMLAreaElement.cpp \ - HTMLAudioElement.cpp \ - HTMLBRElement.cpp \ - HTMLBodyElement.cpp \ - HTMLButtonElement.cpp \ - HTMLCanvasElement.cpp \ - HTMLDataElement.cpp \ - HTMLDataListElement.cpp \ - HTMLDivElement.cpp \ - HTMLFieldSetElement.cpp \ - HTMLFontElement.cpp \ - nsHTMLFormElement.cpp \ - HTMLFrameElement.cpp \ - HTMLFrameSetElement.cpp \ - HTMLHRElement.cpp \ - HTMLHeadingElement.cpp \ - HTMLIFrameElement.cpp \ - HTMLImageElement.cpp \ - HTMLInputElement.cpp \ - HTMLLIElement.cpp \ - HTMLLabelElement.cpp \ - HTMLLegendElement.cpp \ - HTMLLinkElement.cpp \ - HTMLMapElement.cpp \ - HTMLMediaElement.cpp \ - HTMLMenuElement.cpp \ - HTMLMenuItemElement.cpp \ - HTMLMetaElement.cpp \ - HTMLMeterElement.cpp \ - HTMLModElement.cpp \ - HTMLObjectElement.cpp \ - HTMLSharedObjectElement.cpp \ - HTMLOptionElement.cpp \ - HTMLOptionsCollection.cpp \ - HTMLOptGroupElement.cpp \ - HTMLOutputElement.cpp \ - HTMLParagraphElement.cpp \ - HTMLPreElement.cpp \ - HTMLProgressElement.cpp \ - HTMLScriptElement.cpp \ - HTMLSelectElement.cpp \ - HTMLSharedElement.cpp \ - HTMLSharedListElement.cpp \ - HTMLSourceElement.cpp \ - HTMLSpanElement.cpp \ - HTMLStyleElement.cpp \ - HTMLTableElement.cpp \ - HTMLTableCaptionElement.cpp \ - HTMLTableCellElement.cpp \ - HTMLTableColElement.cpp \ - HTMLTableRowElement.cpp \ - HTMLTableSectionElement.cpp \ - HTMLTemplateElement.cpp \ - HTMLTextAreaElement.cpp \ - HTMLTimeElement.cpp \ - HTMLTitleElement.cpp \ - HTMLTrackElement.cpp \ - HTMLVideoElement.cpp \ - HTMLUnknownElement.cpp \ - MediaError.cpp \ - TimeRanges.cpp \ - ValidityState.cpp \ - nsIConstraintValidation.cpp \ - nsRadioVisitor.cpp \ - nsDOMStringMap.cpp \ - UndoManager.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index d57b0631638..7ce66be9ef5 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -75,3 +75,81 @@ EXPORTS.mozilla.dom += [ 'ValidityState.h', ] +CPP_SOURCES += [ + 'HTMLAnchorElement.cpp', + 'HTMLAreaElement.cpp', + 'HTMLAudioElement.cpp', + 'HTMLBRElement.cpp', + 'HTMLBodyElement.cpp', + 'HTMLButtonElement.cpp', + 'HTMLCanvasElement.cpp', + 'HTMLDataElement.cpp', + 'HTMLDataListElement.cpp', + 'HTMLDivElement.cpp', + 'HTMLElement.cpp', + 'HTMLFieldSetElement.cpp', + 'HTMLFontElement.cpp', + 'HTMLFrameElement.cpp', + 'HTMLFrameSetElement.cpp', + 'HTMLHRElement.cpp', + 'HTMLHeadingElement.cpp', + 'HTMLIFrameElement.cpp', + 'HTMLImageElement.cpp', + 'HTMLInputElement.cpp', + 'HTMLLIElement.cpp', + 'HTMLLabelElement.cpp', + 'HTMLLegendElement.cpp', + 'HTMLLinkElement.cpp', + 'HTMLMapElement.cpp', + 'HTMLMediaElement.cpp', + 'HTMLMenuElement.cpp', + 'HTMLMenuItemElement.cpp', + 'HTMLMetaElement.cpp', + 'HTMLMeterElement.cpp', + 'HTMLModElement.cpp', + 'HTMLObjectElement.cpp', + 'HTMLOptGroupElement.cpp', + 'HTMLOptionElement.cpp', + 'HTMLOptionsCollection.cpp', + 'HTMLOutputElement.cpp', + 'HTMLParagraphElement.cpp', + 'HTMLPreElement.cpp', + 'HTMLProgressElement.cpp', + 'HTMLPropertiesCollection.cpp', + 'HTMLScriptElement.cpp', + 'HTMLSelectElement.cpp', + 'HTMLSharedElement.cpp', + 'HTMLSharedListElement.cpp', + 'HTMLSharedObjectElement.cpp', + 'HTMLSourceElement.cpp', + 'HTMLSpanElement.cpp', + 'HTMLStyleElement.cpp', + 'HTMLTableCaptionElement.cpp', + 'HTMLTableCellElement.cpp', + 'HTMLTableColElement.cpp', + 'HTMLTableElement.cpp', + 'HTMLTableRowElement.cpp', + 'HTMLTableSectionElement.cpp', + 'HTMLTemplateElement.cpp', + 'HTMLTextAreaElement.cpp', + 'HTMLTimeElement.cpp', + 'HTMLTitleElement.cpp', + 'HTMLTrackElement.cpp', + 'HTMLUnknownElement.cpp', + 'HTMLVideoElement.cpp', + 'MediaError.cpp', + 'TimeRanges.cpp', + 'UndoManager.cpp', + 'ValidityState.cpp', + 'nsClientRect.cpp', + 'nsDOMStringMap.cpp', + 'nsFormSubmission.cpp', + 'nsGenericHTMLElement.cpp', + 'nsGenericHTMLFrameElement.cpp', + 'nsHTMLDNSPrefetch.cpp', + 'nsHTMLFormElement.cpp', + 'nsIConstraintValidation.cpp', + 'nsRadioVisitor.cpp', + 'nsTextEditorState.cpp', +] + diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index 96a96bcc888..a77a371e879 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -15,15 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsHTMLContentSink.cpp \ - nsHTMLDocument.cpp \ - ImageDocument.cpp \ - MediaDocument.cpp \ - PluginDocument.cpp \ - VideoDocument.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build index 86ccea5efa7..79028b4307d 100644 --- a/content/html/document/src/moz.build +++ b/content/html/document/src/moz.build @@ -13,3 +13,12 @@ EXPORTS += [ EXPORTS.mozilla.dom += [ 'ImageDocument.h', ] + +CPP_SOURCES += [ + 'ImageDocument.cpp', + 'MediaDocument.cpp', + 'PluginDocument.cpp', + 'VideoDocument.cpp', + 'nsHTMLContentSink.cpp', + 'nsHTMLDocument.cpp', +] diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index 4b06d12577c..ae9b5f5e31c 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -14,11 +14,6 @@ LIBRARY_NAME = gkcontentmathml_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsMathMLElement.cpp \ - nsMathMLElementFactory.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build index cefde4764ea..cfd45e762bf 100644 --- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'content' +CPP_SOURCES += [ + 'nsMathMLElement.cpp', + 'nsMathMLElementFactory.cpp', +] + diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 6bdf8db9e05..623636dbe40 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -16,35 +16,6 @@ ifndef _MSC_VER FAIL_ON_WARNINGS := 1 endif # !_MSC_VER -CPPSRCS = \ - AudioAvailableEventManager.cpp \ - AudioChannelFormat.cpp \ - AudioNodeEngine.cpp \ - AudioNodeStream.cpp \ - AudioSegment.cpp \ - AudioStream.cpp \ - AudioStreamTrack.cpp \ - DecoderTraits.cpp \ - DOMMediaStream.cpp \ - FileBlockCache.cpp \ - MediaCache.cpp \ - MediaDecoder.cpp \ - MediaDecoderStateMachine.cpp \ - MediaDecoderReader.cpp \ - MediaResource.cpp \ - MediaStreamGraph.cpp \ - MediaStreamTrack.cpp \ - StreamBuffer.cpp \ - TextTrack.cpp \ - TextTrackList.cpp \ - TextTrackCue.cpp \ - TextTrackCueList.cpp \ - VideoFrameContainer.cpp \ - VideoSegment.cpp \ - VideoStreamTrack.cpp \ - VideoUtils.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/config.mk diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in index 22f90f1711a..389b78976b7 100644 --- a/content/media/dash/Makefile.in +++ b/content/media/dash/Makefile.in @@ -18,12 +18,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME := gkcondash_s LIBXUL_LIBRARY := 1 -CPPSRCS := \ - DASHDecoder.cpp \ - DASHRepDecoder.cpp \ - DASHReader.cpp \ - $(NULL) - FORCE_STATIC_LIB := 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/dash/moz.build b/content/media/dash/moz.build index 6900c8fb3e9..6d5966e41aa 100644 --- a/content/media/dash/moz.build +++ b/content/media/dash/moz.build @@ -13,3 +13,9 @@ EXPORTS += [ 'DASHRepReader.h', ] +CPP_SOURCES += [ + 'DASHDecoder.cpp', + 'DASHReader.cpp', + 'DASHRepDecoder.cpp', +] + diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in index 9b4d4a5968b..9c4738d3f0f 100644 --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in @@ -13,14 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkcongstreamer_s LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - GStreamerReader.cpp \ - GStreamerDecoder.cpp \ - GStreamerFormatHelper.cpp \ - GStreamerMozVideoBuffer.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build index bbaf1e86805..d07fd7b7325 100644 --- a/content/media/gstreamer/moz.build +++ b/content/media/gstreamer/moz.build @@ -12,3 +12,10 @@ EXPORTS += [ 'GStreamerReader.h', ] +CPP_SOURCES += [ + 'GStreamerDecoder.cpp', + 'GStreamerFormatHelper.cpp', + 'GStreamerReader.cpp', + 'GStreamerMozVideoBuffer.cpp', +] + diff --git a/content/media/moz.build b/content/media/moz.build index 514da77fac6..2e7596cd3a5 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -83,3 +83,32 @@ EXPORTS.mozilla.dom += [ 'TextTrackList.h', 'VideoStreamTrack.h', ] + +CPP_SOURCES += [ + 'AudioAvailableEventManager.cpp', + 'AudioChannelFormat.cpp', + 'AudioNodeEngine.cpp', + 'AudioNodeStream.cpp', + 'AudioSegment.cpp', + 'AudioStream.cpp', + 'AudioStreamTrack.cpp', + 'DOMMediaStream.cpp', + 'DecoderTraits.cpp', + 'FileBlockCache.cpp', + 'MediaCache.cpp', + 'MediaDecoder.cpp', + 'MediaDecoderReader.cpp', + 'MediaDecoderStateMachine.cpp', + 'MediaResource.cpp', + 'MediaStreamGraph.cpp', + 'MediaStreamTrack.cpp', + 'StreamBuffer.cpp', + 'TextTrack.cpp', + 'TextTrackCue.cpp', + 'TextTrackCueList.cpp', + 'TextTrackList.cpp', + 'VideoFrameContainer.cpp', + 'VideoSegment.cpp', + 'VideoStreamTrack.cpp', + 'VideoUtils.cpp', +] diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in index c12aa9a0dd3..5327767a619 100644 --- a/content/media/ogg/Makefile.in +++ b/content/media/ogg/Makefile.in @@ -14,12 +14,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - OggDecoder.cpp \ - OggCodecState.cpp \ - OggReader.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build index 295e287988d..a4e6a0db2d2 100644 --- a/content/media/ogg/moz.build +++ b/content/media/ogg/moz.build @@ -12,3 +12,9 @@ EXPORTS += [ 'OggReader.h', ] +CPP_SOURCES += [ + 'OggCodecState.cpp', + 'OggDecoder.cpp', + 'OggReader.cpp', +] + diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in index bf6cdf06820..33f0310785f 100644 --- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -12,12 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconomx_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - MediaOmxDecoder.cpp \ - MediaOmxReader.cpp \ - OmxDecoder.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build index 3ceb1f4e26c..57aa713dcf1 100644 --- a/content/media/omx/moz.build +++ b/content/media/omx/moz.build @@ -11,3 +11,9 @@ EXPORTS += [ 'MediaOmxReader.h', ] +CPP_SOURCES += [ + 'MediaOmxDecoder.cpp', + 'MediaOmxReader.cpp', + 'OmxDecoder.cpp', +] + diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in index 084d06f08d9..e4c703ddd47 100644 --- a/content/media/plugins/Makefile.in +++ b/content/media/plugins/Makefile.in @@ -12,12 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconmediaplugins_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - MediaPluginHost.cpp \ - MediaPluginDecoder.cpp \ - MediaPluginReader.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/plugins/moz.build b/content/media/plugins/moz.build index 7735395aabe..c551bf073c5 100644 --- a/content/media/plugins/moz.build +++ b/content/media/plugins/moz.build @@ -13,3 +13,9 @@ EXPORTS += [ 'MediaPluginReader.h', ] +CPP_SOURCES += [ + 'MediaPluginDecoder.cpp', + 'MediaPluginHost.cpp', + 'MediaPluginReader.cpp', +] + diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in index e94e6655167..8f0e5c111a3 100644 --- a/content/media/raw/Makefile.in +++ b/content/media/raw/Makefile.in @@ -14,11 +14,6 @@ LIBRARY_NAME = gkconraw_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS += \ - RawDecoder.cpp \ - RawReader.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build index a96852e9113..33500bf50c8 100644 --- a/content/media/raw/moz.build +++ b/content/media/raw/moz.build @@ -12,3 +12,8 @@ EXPORTS += [ 'RawStructs.h', ] +CPP_SOURCES += [ + 'RawDecoder.cpp', + 'RawReader.cpp', +] + diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in index 882fbffd225..cda681888d6 100644 --- a/content/media/wave/Makefile.in +++ b/content/media/wave/Makefile.in @@ -14,11 +14,6 @@ LIBRARY_NAME = gkconwave_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - WaveDecoder.cpp \ - WaveReader.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build index 16d70ae615f..f9d8c61e59c 100644 --- a/content/media/wave/moz.build +++ b/content/media/wave/moz.build @@ -11,3 +11,8 @@ EXPORTS += [ 'WaveReader.h', ] +CPP_SOURCES += [ + 'WaveDecoder.cpp', + 'WaveReader.cpp', +] + diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in index 9b1cc1365bf..ba100bd39c8 100644 --- a/content/media/webaudio/Makefile.in +++ b/content/media/webaudio/Makefile.in @@ -15,32 +15,6 @@ ifndef _MSC_VER FAIL_ON_WARNINGS := 1 endif # !_MSC_VER -CPPSRCS := \ - AnalyserNode.cpp \ - AudioBuffer.cpp \ - AudioBufferSourceNode.cpp \ - AudioContext.cpp \ - AudioDestinationNode.cpp \ - AudioListener.cpp \ - AudioNode.cpp \ - AudioParam.cpp \ - AudioProcessingEvent.cpp \ - BiquadFilterNode.cpp \ - ChannelMergerNode.cpp \ - ChannelSplitterNode.cpp \ - DelayNode.cpp \ - DynamicsCompressorNode.cpp \ - EnableWebAudioCheck.cpp \ - GainNode.cpp \ - MediaBufferDecoder.cpp \ - OfflineAudioCompletionEvent.cpp \ - PannerNode.cpp \ - ScriptProcessorNode.cpp \ - ThreeDPoint.cpp \ - WaveShaperNode.cpp \ - WebAudioUtils.cpp \ - $(NULL) - FORCE_STATIC_LIB := 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in index ae188ce3fb9..8a062b45249 100644 --- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -12,13 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME := gkconwebaudio_blink_s LIBXUL_LIBRARY := 1 -CPPSRCS := \ - Biquad.cpp \ - DynamicsCompressor.cpp \ - DynamicsCompressorKernel.cpp \ - ZeroPole.cpp \ - $(NULL) - FORCE_STATIC_LIB := 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build index cefde4764ea..569be179c35 100644 --- a/content/media/webaudio/blink/moz.build +++ b/content/media/webaudio/blink/moz.build @@ -6,3 +6,10 @@ MODULE = 'content' +CPP_SOURCES += [ + 'Biquad.cpp', + 'DynamicsCompressor.cpp', + 'DynamicsCompressorKernel.cpp', + 'ZeroPole.cpp', +] + diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build index 4150fa97bed..c5dd3664e1d 100644 --- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -40,3 +40,29 @@ EXPORTS.mozilla.dom += [ 'WaveShaperNode.h', ] +CPP_SOURCES += [ + 'AnalyserNode.cpp', + 'AudioBuffer.cpp', + 'AudioBufferSourceNode.cpp', + 'AudioContext.cpp', + 'AudioDestinationNode.cpp', + 'AudioListener.cpp', + 'AudioNode.cpp', + 'AudioParam.cpp', + 'AudioProcessingEvent.cpp', + 'BiquadFilterNode.cpp', + 'ChannelMergerNode.cpp', + 'ChannelSplitterNode.cpp', + 'DelayNode.cpp', + 'DynamicsCompressorNode.cpp', + 'EnableWebAudioCheck.cpp', + 'GainNode.cpp', + 'MediaBufferDecoder.cpp', + 'OfflineAudioCompletionEvent.cpp', + 'PannerNode.cpp', + 'ScriptProcessorNode.cpp', + 'ThreeDPoint.cpp', + 'WaveShaperNode.cpp', + 'WebAudioUtils.cpp', +] + diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in index 0c76ef92921..c56807a0154 100644 --- a/content/media/webm/Makefile.in +++ b/content/media/webm/Makefile.in @@ -14,12 +14,6 @@ LIBRARY_NAME = gkconwebm_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - WebMBufferedParser.cpp \ - WebMDecoder.cpp \ - WebMReader.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build index 1430913ad4a..fdab0fa6afb 100644 --- a/content/media/webm/moz.build +++ b/content/media/webm/moz.build @@ -11,3 +11,9 @@ EXPORTS += [ 'WebMReader.h', ] +CPP_SOURCES += [ + 'WebMBufferedParser.cpp', + 'WebMDecoder.cpp', + 'WebMReader.cpp', +] + diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in index a72fe8fe85f..b12f5b2f66a 100644 --- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -12,18 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconwebrtc_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - MediaEngineDefault.cpp \ - $(NULL) - -ifdef MOZ_WEBRTC -CPPSRCS += \ - MediaEngineWebRTC.cpp \ - MediaEngineWebRTCVideo.cpp \ - MediaEngineWebRTCAudio.cpp \ - $(NULL) -endif - ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build index 3f5d4a0834d..ab8eae1e0cf 100644 --- a/content/media/webrtc/moz.build +++ b/content/media/webrtc/moz.build @@ -13,3 +13,13 @@ EXPORTS += [ if CONFIG['MOZ_WEBRTC']: EXPORTS += ['MediaEngineWebRTC.h'] + CPP_SOURCES += [ + 'MediaEngineWebRTC.cpp', + 'MediaEngineWebRTCVideo.cpp', + 'MediaEngineWebRTCAudio.cpp', + ] + +CPP_SOURCES += [ + 'MediaEngineDefault.cpp', +] + diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in index 5f5aad0c282..a8e30c4d09e 100644 --- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -19,21 +19,6 @@ LIBXUL_LIBRARY := 1 LOCAL_INCLUDES += $(VPATH:%=-I%) -CPPSRCS := \ - EnableWebSpeechRecognitionCheck.cpp \ - SpeechGrammar.cpp \ - SpeechGrammarList.cpp \ - SpeechRecognitionAlternative.cpp \ - SpeechRecognition.cpp \ - SpeechRecognitionResult.cpp \ - SpeechRecognitionResultList.cpp \ - SpeechStreamListener.cpp \ - endpointer.cc \ - energy_endpointer.cc \ - energy_endpointer_params.cc \ - FakeSpeechRecognitionService.cpp \ - $(NULL) - FORCE_STATIC_LIB := 1 include $(topsrcdir)/config/config.mk diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build index 36fcdd8b04e..fac3ce876a4 100644 --- a/content/media/webspeech/recognition/moz.build +++ b/content/media/webspeech/recognition/moz.build @@ -26,3 +26,18 @@ EXPORTS.mozilla.dom += [ 'SpeechStreamListener.h', ] +CPP_SOURCES += [ + 'EnableWebSpeechRecognitionCheck.cpp', + 'FakeSpeechRecognitionService.cpp', + 'SpeechGrammar.cpp', + 'SpeechGrammarList.cpp', + 'SpeechRecognition.cpp', + 'SpeechRecognitionAlternative.cpp', + 'SpeechRecognitionResult.cpp', + 'SpeechRecognitionResultList.cpp', + 'SpeechStreamListener.cpp', + 'endpointer.cc', + 'energy_endpointer.cc', + 'energy_endpointer_params.cc', +] + diff --git a/content/media/webspeech/recognition/test/Makefile.in b/content/media/webspeech/recognition/test/Makefile.in index 0223ca9995d..7fe87335ddd 100644 --- a/content/media/webspeech/recognition/test/Makefile.in +++ b/content/media/webspeech/recognition/test/Makefile.in @@ -10,10 +10,6 @@ relativesrcdir := @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS := \ - FakeSpeechRecognitionService.cpp \ - $(NULL) - MOCHITEST_FILES := \ head.js \ test_success_without_recognition_service.html \ diff --git a/content/media/webspeech/recognition/test/moz.build b/content/media/webspeech/recognition/test/moz.build index 89251dc3962..cc65d57e5e9 100644 --- a/content/media/webspeech/recognition/test/moz.build +++ b/content/media/webspeech/recognition/test/moz.build @@ -2,3 +2,8 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +CPP_SOURCES += [ + 'FakeSpeechRecognitionService.cpp', +] + diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index f975cba430c..7e1d90922f5 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -22,17 +22,6 @@ LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += $(VPATH:%=-I%) -CPPSRCS := \ - EnableSpeechSynthesisCheck.cpp \ - SpeechSynthesisUtterance.cpp \ - SpeechSynthesisVoice.cpp \ - SpeechSynthesis.cpp \ - SpeechSynthesisChild.cpp \ - SpeechSynthesisParent.cpp \ - nsSynthVoiceRegistry.cpp \ - nsSpeechTask.cpp \ - $(NULL) - FORCE_STATIC_LIB := 1 include $(topsrcdir)/config/config.mk diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build index 0cb086b7b8c..24722e75c7c 100644 --- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -26,3 +26,14 @@ EXPORTS.mozilla.dom += [ 'nsSynthVoiceRegistry.h', ] +CPP_SOURCES += [ + 'EnableSpeechSynthesisCheck.cpp', + 'SpeechSynthesis.cpp', + 'SpeechSynthesisChild.cpp', + 'SpeechSynthesisParent.cpp', + 'SpeechSynthesisUtterance.cpp', + 'SpeechSynthesisVoice.cpp', + 'nsSpeechTask.cpp', + 'nsSynthVoiceRegistry.cpp', +] + diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in index 42230f43cdb..de81163f9bb 100644 --- a/content/media/wmf/Makefile.in +++ b/content/media/wmf/Makefile.in @@ -13,15 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconwmf_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - DXVA2Manager.cpp \ - WMFByteStream.cpp \ - WMFDecoder.cpp \ - WMFReader.cpp \ - WMFUtils.cpp \ - WMFSourceReaderCallback.cpp \ - $(NULL) - ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build index 2637b9183e2..025228dfc49 100644 --- a/content/media/wmf/moz.build +++ b/content/media/wmf/moz.build @@ -12,3 +12,12 @@ EXPORTS += [ 'WMFReader.h', ] +CPP_SOURCES += [ + 'DXVA2Manager.cpp', + 'WMFByteStream.cpp', + 'WMFDecoder.cpp', + 'WMFReader.cpp', + 'WMFSourceReaderCallback.cpp', + 'WMFUtils.cpp', +] + diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index 083aa503bf3..62777db54ae 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -14,33 +14,6 @@ LIBRARY_NAME = gkconsmil_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsDOMTimeEvent.cpp \ - nsSMILAnimationController.cpp \ - nsSMILAnimationFunction.cpp \ - nsSMILCompositor.cpp \ - nsSMILCSSProperty.cpp \ - nsSMILCSSValueType.cpp \ - nsSMILFloatType.cpp \ - nsSMILInstanceTime.cpp \ - nsSMILInterval.cpp \ - nsSMILKeySpline.cpp \ - nsSMILMappedAttribute.cpp \ - nsSMILNullType.cpp \ - nsSMILParserUtils.cpp \ - nsSMILRepeatCount.cpp \ - nsSMILSetAnimationFunction.cpp \ - nsSMILTimeContainer.cpp \ - nsSMILTimedElement.cpp \ - nsSMILTimeValue.cpp \ - nsSMILTimeValueSpec.cpp \ - nsSMILValue.cpp \ - SMILBoolType.cpp \ - SMILEnumType.cpp \ - SMILIntegerType.cpp \ - SMILStringType.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/content/smil/moz.build b/content/smil/moz.build index 17134595b18..ed9f2281a76 100644 --- a/content/smil/moz.build +++ b/content/smil/moz.build @@ -34,3 +34,30 @@ EXPORTS += [ 'nsSMILValue.h', ] +CPP_SOURCES += [ + 'SMILBoolType.cpp', + 'SMILEnumType.cpp', + 'SMILIntegerType.cpp', + 'SMILStringType.cpp', + 'nsDOMTimeEvent.cpp', + 'nsSMILAnimationController.cpp', + 'nsSMILAnimationFunction.cpp', + 'nsSMILCSSProperty.cpp', + 'nsSMILCSSValueType.cpp', + 'nsSMILCompositor.cpp', + 'nsSMILFloatType.cpp', + 'nsSMILInstanceTime.cpp', + 'nsSMILInterval.cpp', + 'nsSMILKeySpline.cpp', + 'nsSMILMappedAttribute.cpp', + 'nsSMILNullType.cpp', + 'nsSMILParserUtils.cpp', + 'nsSMILRepeatCount.cpp', + 'nsSMILSetAnimationFunction.cpp', + 'nsSMILTimeContainer.cpp', + 'nsSMILTimeValue.cpp', + 'nsSMILTimeValueSpec.cpp', + 'nsSMILTimedElement.cpp', + 'nsSMILValue.cpp', +] + diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index f7740856618..4a9d8ca6414 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -14,148 +14,6 @@ LIBRARY_NAME = gkcontentsvg_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - DOMSVGAnimatedLengthList.cpp \ - DOMSVGAnimatedNumberList.cpp \ - DOMSVGLength.cpp \ - DOMSVGLengthList.cpp \ - DOMSVGNumber.cpp \ - DOMSVGNumberList.cpp \ - DOMSVGPathSeg.cpp \ - DOMSVGPathSegList.cpp \ - DOMSVGPoint.cpp \ - DOMSVGPointList.cpp \ - DOMSVGStringList.cpp \ - DOMSVGTransformList.cpp \ - nsISVGPoint.cpp \ - nsSVGAngle.cpp \ - nsSVGAnimatedTransformList.cpp \ - nsSVGBoolean.cpp \ - nsSVGClass.cpp \ - nsSVGDataParser.cpp \ - nsSVGElement.cpp \ - nsSVGEnum.cpp \ - nsSVGFeatures.cpp \ - nsSVGFilters.cpp \ - nsSVGInteger.cpp \ - nsSVGIntegerPair.cpp \ - nsSVGLength2.cpp \ - nsSVGNumber2.cpp \ - nsSVGNumberPair.cpp \ - nsSVGPathDataParser.cpp \ - nsSVGPathGeometryElement.cpp \ - nsSVGPolyElement.cpp \ - nsSVGString.cpp \ - nsSVGTransform.cpp \ - nsSVGViewBox.cpp \ - SVGAElement.cpp \ - SVGAltGlyphElement.cpp \ - SVGAngle.cpp \ - SVGAnimatedAngle.cpp \ - SVGAnimatedBoolean.cpp \ - SVGAnimatedLength.cpp \ - SVGAnimatedLengthList.cpp \ - SVGAnimatedNumberList.cpp \ - SVGAnimatedPathSegList.cpp \ - SVGAnimatedPointList.cpp \ - SVGAnimatedPreserveAspectRatio.cpp \ - SVGAnimatedRect.cpp \ - SVGAnimatedTransformList.cpp \ - SVGAnimateElement.cpp \ - SVGAnimateTransformElement.cpp \ - SVGAnimateMotionElement.cpp \ - SVGAnimationElement.cpp \ - SVGAttrValueWrapper.cpp \ - SVGClipPathElement.cpp \ - SVGCircleElement.cpp \ - SVGContentUtils.cpp \ - SVGDefsElement.cpp \ - SVGDescElement.cpp \ - SVGElementFactory.cpp \ - SVGEllipseElement.cpp \ - SVGFEBlendElement.cpp \ - SVGFEColorMatrixElement.cpp \ - SVGFEComponentTransferElement.cpp \ - SVGFECompositeElement.cpp \ - SVGFEConvolveMatrixElement.cpp \ - SVGFEDiffuseLightingElement.cpp \ - SVGFEDisplacementMapElement.cpp \ - SVGFEDistantLightElement.cpp \ - SVGFEFloodElement.cpp \ - SVGFEGaussianBlurElement.cpp \ - SVGFEImageElement.cpp \ - SVGFEMergeElement.cpp \ - SVGFEMergeNodeElement.cpp \ - SVGFEMorphologyElement.cpp \ - SVGFEOffsetElement.cpp \ - SVGFEPointLightElement.cpp \ - SVGFESpecularLightingElement.cpp \ - SVGFESpotLightElement.cpp \ - SVGFETileElement.cpp \ - SVGFETurbulenceElement.cpp \ - SVGFilterElement.cpp \ - SVGForeignObjectElement.cpp \ - SVGFragmentIdentifier.cpp \ - SVGGElement.cpp \ - SVGGradientElement.cpp \ - SVGGraphicsElement.cpp \ - SVGImageElement.cpp \ - SVGIntegerPairSMILType.cpp \ - SVGLength.cpp \ - SVGLengthList.cpp \ - SVGLengthListSMILType.cpp \ - SVGLineElement.cpp \ - SVGMarkerElement.cpp \ - SVGMaskElement.cpp \ - SVGMatrix.cpp \ - SVGMetadataElement.cpp \ - SVGMotionSMILType.cpp \ - SVGMotionSMILAttr.cpp \ - SVGMotionSMILAnimationFunction.cpp \ - SVGMotionSMILPathUtils.cpp \ - SVGMPathElement.cpp \ - SVGNumberList.cpp \ - SVGNumberListSMILType.cpp \ - SVGNumberPairSMILType.cpp \ - SVGOrientSMILType.cpp \ - SVGPathData.cpp \ - SVGPathElement.cpp \ - SVGPathSegUtils.cpp \ - SVGPathSegListSMILType.cpp \ - SVGPatternElement.cpp \ - SVGPointList.cpp \ - SVGPointListSMILType.cpp \ - SVGPolygonElement.cpp \ - SVGPolylineElement.cpp \ - SVGPreserveAspectRatio.cpp \ - SVGRect.cpp \ - SVGRectElement.cpp \ - SVGScriptElement.cpp \ - SVGSetElement.cpp \ - SVGStopElement.cpp \ - SVGStringList.cpp \ - SVGStyleElement.cpp \ - SVGSymbolElement.cpp \ - SVGSVGElement.cpp \ - SVGSwitchElement.cpp \ - SVGTests.cpp \ - SVGTextContentElement.cpp \ - SVGTextElement.cpp \ - SVGTextPathElement.cpp \ - SVGTextPositioningElement.cpp \ - SVGTitleElement.cpp \ - SVGTransform.cpp \ - SVGTransformableElement.cpp \ - SVGTransformList.cpp \ - SVGTransformListParser.cpp \ - SVGTransformListSMILType.cpp \ - SVGTSpanElement.cpp \ - SVGUseElement.cpp \ - SVGViewBoxSMILType.cpp \ - SVGViewElement.cpp \ - SVGZoomEvent.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build index 45afa0da21e..9f8d7ecbb72 100644 --- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -94,3 +94,145 @@ EXPORTS.mozilla.dom += [ 'nsSVGAnimatedTransformList.h', ] +CPP_SOURCES += [ + 'DOMSVGAnimatedLengthList.cpp', + 'DOMSVGAnimatedNumberList.cpp', + 'DOMSVGLength.cpp', + 'DOMSVGLengthList.cpp', + 'DOMSVGNumber.cpp', + 'DOMSVGNumberList.cpp', + 'DOMSVGPathSeg.cpp', + 'DOMSVGPathSegList.cpp', + 'DOMSVGPoint.cpp', + 'DOMSVGPointList.cpp', + 'DOMSVGStringList.cpp', + 'DOMSVGTransformList.cpp', + 'SVGAElement.cpp', + 'SVGAltGlyphElement.cpp', + 'SVGAngle.cpp', + 'SVGAnimateElement.cpp', + 'SVGAnimateMotionElement.cpp', + 'SVGAnimateTransformElement.cpp', + 'SVGAnimatedAngle.cpp', + 'SVGAnimatedBoolean.cpp', + 'SVGAnimatedLength.cpp', + 'SVGAnimatedLengthList.cpp', + 'SVGAnimatedNumberList.cpp', + 'SVGAnimatedPathSegList.cpp', + 'SVGAnimatedPointList.cpp', + 'SVGAnimatedPreserveAspectRatio.cpp', + 'SVGAnimatedRect.cpp', + 'SVGAnimatedTransformList.cpp', + 'SVGAnimationElement.cpp', + 'SVGAttrValueWrapper.cpp', + 'SVGCircleElement.cpp', + 'SVGClipPathElement.cpp', + 'SVGContentUtils.cpp', + 'SVGDefsElement.cpp', + 'SVGDescElement.cpp', + 'SVGElementFactory.cpp', + 'SVGEllipseElement.cpp', + 'SVGFEBlendElement.cpp', + 'SVGFEColorMatrixElement.cpp', + 'SVGFEComponentTransferElement.cpp', + 'SVGFECompositeElement.cpp', + 'SVGFEConvolveMatrixElement.cpp', + 'SVGFEDiffuseLightingElement.cpp', + 'SVGFEDisplacementMapElement.cpp', + 'SVGFEDistantLightElement.cpp', + 'SVGFEFloodElement.cpp', + 'SVGFEGaussianBlurElement.cpp', + 'SVGFEImageElement.cpp', + 'SVGFEMergeElement.cpp', + 'SVGFEMergeNodeElement.cpp', + 'SVGFEMorphologyElement.cpp', + 'SVGFEOffsetElement.cpp', + 'SVGFEPointLightElement.cpp', + 'SVGFESpecularLightingElement.cpp', + 'SVGFESpotLightElement.cpp', + 'SVGFETileElement.cpp', + 'SVGFETurbulenceElement.cpp', + 'SVGFilterElement.cpp', + 'SVGForeignObjectElement.cpp', + 'SVGFragmentIdentifier.cpp', + 'SVGGElement.cpp', + 'SVGGradientElement.cpp', + 'SVGGraphicsElement.cpp', + 'SVGImageElement.cpp', + 'SVGIntegerPairSMILType.cpp', + 'SVGLength.cpp', + 'SVGLengthList.cpp', + 'SVGLengthListSMILType.cpp', + 'SVGLineElement.cpp', + 'SVGMPathElement.cpp', + 'SVGMarkerElement.cpp', + 'SVGMaskElement.cpp', + 'SVGMatrix.cpp', + 'SVGMetadataElement.cpp', + 'SVGMotionSMILAnimationFunction.cpp', + 'SVGMotionSMILAttr.cpp', + 'SVGMotionSMILPathUtils.cpp', + 'SVGMotionSMILType.cpp', + 'SVGNumberList.cpp', + 'SVGNumberListSMILType.cpp', + 'SVGNumberPairSMILType.cpp', + 'SVGOrientSMILType.cpp', + 'SVGPathData.cpp', + 'SVGPathElement.cpp', + 'SVGPathSegListSMILType.cpp', + 'SVGPathSegUtils.cpp', + 'SVGPatternElement.cpp', + 'SVGPointList.cpp', + 'SVGPointListSMILType.cpp', + 'SVGPolygonElement.cpp', + 'SVGPolylineElement.cpp', + 'SVGPreserveAspectRatio.cpp', + 'SVGRect.cpp', + 'SVGRectElement.cpp', + 'SVGSVGElement.cpp', + 'SVGScriptElement.cpp', + 'SVGSetElement.cpp', + 'SVGStopElement.cpp', + 'SVGStringList.cpp', + 'SVGStyleElement.cpp', + 'SVGSwitchElement.cpp', + 'SVGSymbolElement.cpp', + 'SVGTSpanElement.cpp', + 'SVGTests.cpp', + 'SVGTextContentElement.cpp', + 'SVGTextElement.cpp', + 'SVGTextPathElement.cpp', + 'SVGTextPositioningElement.cpp', + 'SVGTitleElement.cpp', + 'SVGTransform.cpp', + 'SVGTransformList.cpp', + 'SVGTransformListParser.cpp', + 'SVGTransformListSMILType.cpp', + 'SVGTransformableElement.cpp', + 'SVGUseElement.cpp', + 'SVGViewBoxSMILType.cpp', + 'SVGViewElement.cpp', + 'SVGZoomEvent.cpp', + 'nsISVGPoint.cpp', + 'nsSVGAngle.cpp', + 'nsSVGAnimatedTransformList.cpp', + 'nsSVGBoolean.cpp', + 'nsSVGClass.cpp', + 'nsSVGDataParser.cpp', + 'nsSVGElement.cpp', + 'nsSVGEnum.cpp', + 'nsSVGFeatures.cpp', + 'nsSVGFilters.cpp', + 'nsSVGInteger.cpp', + 'nsSVGIntegerPair.cpp', + 'nsSVGLength2.cpp', + 'nsSVGNumber2.cpp', + 'nsSVGNumberPair.cpp', + 'nsSVGPathDataParser.cpp', + 'nsSVGPathGeometryElement.cpp', + 'nsSVGPolyElement.cpp', + 'nsSVGString.cpp', + 'nsSVGTransform.cpp', + 'nsSVGViewBox.cpp', +] + diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in index 267008b2109..e885fc56085 100644 --- a/content/svg/document/src/Makefile.in +++ b/content/svg/document/src/Makefile.in @@ -14,10 +14,6 @@ LIBRARY_NAME = gkconsvgdoc_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - SVGDocument.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build index efec01c7709..20cd489316d 100644 --- a/content/svg/document/src/moz.build +++ b/content/svg/document/src/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.dom += [ 'SVGDocument.h', ] +CPP_SOURCES += [ + 'SVGDocument.cpp', +] + diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 4a3a536ac67..590e8a05537 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -15,26 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsXBLBinding.cpp \ - nsXBLPrototypeBinding.cpp \ - nsXBLPrototypeResources.cpp \ - nsXBLResourceLoader.cpp \ - nsXBLDocumentInfo.cpp \ - nsXBLContentSink.cpp \ - nsXBLProtoImplProperty.cpp \ - nsXBLProtoImplMethod.cpp \ - nsXBLProtoImplField.cpp \ - nsXBLProtoImpl.cpp \ - nsXBLEventHandler.cpp \ - nsXBLWindowKeyHandler.cpp \ - nsXBLPrototypeHandler.cpp \ - nsXBLService.cpp \ - nsBindingManager.cpp \ - nsXBLInsertionPoint.cpp \ - nsXBLSerialize.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build index ec7467308fa..829b9ceb2c6 100644 --- a/content/xbl/src/moz.build +++ b/content/xbl/src/moz.build @@ -12,3 +12,23 @@ EXPORTS += [ 'nsXBLService.h', ] +CPP_SOURCES += [ + 'nsBindingManager.cpp', + 'nsXBLBinding.cpp', + 'nsXBLContentSink.cpp', + 'nsXBLDocumentInfo.cpp', + 'nsXBLEventHandler.cpp', + 'nsXBLInsertionPoint.cpp', + 'nsXBLProtoImpl.cpp', + 'nsXBLProtoImplField.cpp', + 'nsXBLProtoImplMethod.cpp', + 'nsXBLProtoImplProperty.cpp', + 'nsXBLPrototypeBinding.cpp', + 'nsXBLPrototypeHandler.cpp', + 'nsXBLPrototypeResources.cpp', + 'nsXBLResourceLoader.cpp', + 'nsXBLSerialize.cpp', + 'nsXBLService.cpp', + 'nsXBLWindowKeyHandler.cpp', +] + diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index d5b991aa22c..baec51c834a 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -15,13 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsXMLElement.cpp \ - CDATASection.cpp \ - ProcessingInstruction.cpp \ - XMLStylesheetProcessingInstruction.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build index fe062faa87b..de74b68a667 100644 --- a/content/xml/content/src/moz.build +++ b/content/xml/content/src/moz.build @@ -12,3 +12,10 @@ EXPORTS.mozilla.dom += [ 'XMLStylesheetProcessingInstruction.h', ] +CPP_SOURCES += [ + 'CDATASection.cpp', + 'ProcessingInstruction.cpp', + 'XMLStylesheetProcessingInstruction.cpp', + 'nsXMLElement.cpp', +] + diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index ddb187dfdc6..2da7cba7bb5 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -15,13 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsXMLContentSink.cpp \ - nsXMLFragmentContentSink.cpp \ - XMLDocument.cpp \ - nsXMLPrettyPrinter.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build index 0fdfde9ef0d..bd393c5816c 100644 --- a/content/xml/document/src/moz.build +++ b/content/xml/document/src/moz.build @@ -10,3 +10,10 @@ EXPORTS.mozilla.dom += [ 'XMLDocument.h', ] +CPP_SOURCES += [ + 'XMLDocument.cpp', + 'nsXMLContentSink.cpp', + 'nsXMLFragmentContentSink.cpp', + 'nsXMLPrettyPrinter.cpp', +] + diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index cc3bb8104f5..70054963498 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -13,12 +13,6 @@ LIBRARY_NAME = txbase_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = txDouble.cpp \ - txList.cpp \ - txExpandedNameMap.cpp \ - txNamespaceMap.cpp \ - txURIUtils.cpp - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build index e10a4f5a88b..5a7acaa94f4 100644 --- a/content/xslt/src/base/moz.build +++ b/content/xslt/src/base/moz.build @@ -6,3 +6,11 @@ MODULE = 'transformiix' +CPP_SOURCES += [ + 'txDouble.cpp', + 'txExpandedNameMap.cpp', + 'txList.cpp', + 'txNamespaceMap.cpp', + 'txURIUtils.cpp', +] + diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index 37ae54b9a5e..52bca0c2eb2 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -13,11 +13,6 @@ LIBRARY_NAME = txxml_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - txXMLUtils.cpp \ - txXMLParser.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build index e10a4f5a88b..995f10c012e 100644 --- a/content/xslt/src/xml/moz.build +++ b/content/xslt/src/xml/moz.build @@ -6,3 +6,8 @@ MODULE = 'transformiix' +CPP_SOURCES += [ + 'txXMLParser.cpp', + 'txXMLUtils.cpp', +] + diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index e690044088c..eeb1156dd1d 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -13,46 +13,6 @@ LIBRARY_NAME = txxpath_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - txBooleanExpr.cpp \ - txBooleanResult.cpp \ - txCoreFunctionCall.cpp \ - txExpr.cpp \ - txExprLexer.cpp \ - txExprParser.cpp \ - txFilterExpr.cpp \ - txFunctionCall.cpp \ - txLocationStep.cpp \ - txNumberExpr.cpp \ - txNumberResult.cpp \ - txPathExpr.cpp \ - txPredicatedNodeTest.cpp \ - txPredicateList.cpp \ - txRelationalExpr.cpp \ - txRootExpr.cpp \ - txStringResult.cpp \ - txErrorExpr.cpp \ - txLiteralExpr.cpp \ - txNameTest.cpp \ - txNamedAttributeStep.cpp \ - txNodeSet.cpp \ - txNodeTypeTest.cpp \ - txForwardContext.cpp \ - txNodeSetContext.cpp \ - txResultRecycler.cpp \ - txUnionExpr.cpp \ - txUnionNodeTest.cpp \ - txUnaryExpr.cpp \ - txVariableRefExpr.cpp \ - txXPathOptimizer.cpp \ - nsXPathEvaluator.cpp \ - nsXPathExpression.cpp \ - nsXPathNSResolver.cpp \ - nsXPathResult.cpp \ - txMozillaXPathTreeWalker.cpp \ - txNodeSetAdaptor.cpp \ - txXPCOMExtensionFunction.cpp - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build index e10a4f5a88b..53f7efddb69 100644 --- a/content/xslt/src/xpath/moz.build +++ b/content/xslt/src/xpath/moz.build @@ -6,3 +6,44 @@ MODULE = 'transformiix' +CPP_SOURCES += [ + 'nsXPathEvaluator.cpp', + 'nsXPathExpression.cpp', + 'nsXPathNSResolver.cpp', + 'nsXPathResult.cpp', + 'txBooleanExpr.cpp', + 'txBooleanResult.cpp', + 'txCoreFunctionCall.cpp', + 'txErrorExpr.cpp', + 'txExpr.cpp', + 'txExprLexer.cpp', + 'txExprParser.cpp', + 'txFilterExpr.cpp', + 'txForwardContext.cpp', + 'txFunctionCall.cpp', + 'txLiteralExpr.cpp', + 'txLocationStep.cpp', + 'txMozillaXPathTreeWalker.cpp', + 'txNameTest.cpp', + 'txNamedAttributeStep.cpp', + 'txNodeSet.cpp', + 'txNodeSetAdaptor.cpp', + 'txNodeSetContext.cpp', + 'txNodeTypeTest.cpp', + 'txNumberExpr.cpp', + 'txNumberResult.cpp', + 'txPathExpr.cpp', + 'txPredicateList.cpp', + 'txPredicatedNodeTest.cpp', + 'txRelationalExpr.cpp', + 'txResultRecycler.cpp', + 'txRootExpr.cpp', + 'txStringResult.cpp', + 'txUnaryExpr.cpp', + 'txUnionExpr.cpp', + 'txUnionNodeTest.cpp', + 'txVariableRefExpr.cpp', + 'txXPCOMExtensionFunction.cpp', + 'txXPathOptimizer.cpp', +] + diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index ca810f6a8f6..74fcbe2d63b 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -13,38 +13,6 @@ LIBRARY_NAME = txxslt_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - txNodeSorter.cpp \ - txXPathResultComparator.cpp \ - txBufferingHandler.cpp \ - txExecutionState.cpp \ - txEXSLTFunctions.cpp \ - txInstructions.cpp \ - txOutputFormat.cpp \ - txRtfHandler.cpp \ - txStylesheet.cpp \ - txStylesheetCompileHandlers.cpp \ - txStylesheetCompiler.cpp \ - txTextHandler.cpp \ - txToplevelItems.cpp \ - txXSLTNumber.cpp \ - txXSLTNumberCounters.cpp \ - txPatternOptimizer.cpp \ - txXSLTPatterns.cpp \ - txXSLTProcessor.cpp \ - txPatternParser.cpp \ - txUnknownHandler.cpp \ - txCurrentFunctionCall.cpp \ - txDocumentFunctionCall.cpp \ - txFormatNumberFunctionCall.cpp \ - txGenerateIdFunctionCall.cpp \ - txKeyFunctionCall.cpp \ - txXSLTEnvironmentFunctionCall.cpp \ - txMozillaStylesheetCompiler.cpp \ - txMozillaTextOutput.cpp \ - txMozillaXMLOutput.cpp \ - txMozillaXSLTProcessor.cpp - # For nsDependentJSString LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build index e10a4f5a88b..303f5fbc232 100644 --- a/content/xslt/src/xslt/moz.build +++ b/content/xslt/src/xslt/moz.build @@ -6,3 +6,36 @@ MODULE = 'transformiix' +CPP_SOURCES += [ + 'txBufferingHandler.cpp', + 'txCurrentFunctionCall.cpp', + 'txDocumentFunctionCall.cpp', + 'txEXSLTFunctions.cpp', + 'txExecutionState.cpp', + 'txFormatNumberFunctionCall.cpp', + 'txGenerateIdFunctionCall.cpp', + 'txInstructions.cpp', + 'txKeyFunctionCall.cpp', + 'txMozillaStylesheetCompiler.cpp', + 'txMozillaTextOutput.cpp', + 'txMozillaXMLOutput.cpp', + 'txMozillaXSLTProcessor.cpp', + 'txNodeSorter.cpp', + 'txOutputFormat.cpp', + 'txPatternOptimizer.cpp', + 'txPatternParser.cpp', + 'txRtfHandler.cpp', + 'txStylesheet.cpp', + 'txStylesheetCompileHandlers.cpp', + 'txStylesheetCompiler.cpp', + 'txTextHandler.cpp', + 'txToplevelItems.cpp', + 'txUnknownHandler.cpp', + 'txXPathResultComparator.cpp', + 'txXSLTEnvironmentFunctionCall.cpp', + 'txXSLTNumber.cpp', + 'txXSLTNumberCounters.cpp', + 'txXSLTPatterns.cpp', + 'txXSLTProcessor.cpp', +] + diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index ffa8ed33524..d7e541b94e8 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -17,15 +17,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 endif - -ifdef MOZ_XUL -CPPSRCS += \ - nsXULElement.cpp \ - nsXULPopupListener.cpp \ - nsXULContextMenuBuilder.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build index df1126d41d8..951c344331a 100644 --- a/content/xul/content/src/moz.build +++ b/content/xul/content/src/moz.build @@ -6,3 +6,9 @@ MODULE = 'xul' +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'nsXULElement.cpp', + 'nsXULPopupListener.cpp', + 'nsXULContextMenuBuilder.cpp', + ] diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index b641990b643..74c13afc347 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -14,19 +14,6 @@ LIBRARY_NAME = gkconxuldoc_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = nsXULControllers.cpp - -ifdef MOZ_XUL -CPPSRCS += \ - nsXULCommandDispatcher.cpp \ - nsXULContentSink.cpp \ - XULDocument.cpp \ - nsXULPrototypeCache.cpp \ - nsXULPrototypeDocument.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build index fc23a1ad66b..04d49440553 100644 --- a/content/xul/document/src/moz.build +++ b/content/xul/document/src/moz.build @@ -6,3 +6,15 @@ MODULE = 'xuldoc' +CPP_SOURCES += [ + 'nsXULControllers.cpp', +] + +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'nsXULCommandDispatcher.cpp', + 'nsXULContentSink.cpp', + 'XULDocument.cpp', + 'nsXULPrototypeCache.cpp', + 'nsXULPrototypeDocument.cpp', + ] diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index ef69e807f70..783d7d40ba4 100644 --- a/content/xul/templates/src/Makefile.in +++ b/content/xul/templates/src/Makefile.in @@ -14,36 +14,6 @@ LIBRARY_NAME = gkconxultmpl_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsContentSupportMap.cpp \ - nsContentTestNode.cpp \ - nsInstantiationNode.cpp \ - nsTreeRows.cpp \ - nsRDFConInstanceTestNode.cpp \ - nsRDFConMemberTestNode.cpp \ - nsRDFPropertyTestNode.cpp \ - nsRDFBinding.cpp \ - nsRDFQuery.cpp \ - nsResourceSet.cpp \ - nsRuleNetwork.cpp \ - nsTemplateMatch.cpp \ - nsTemplateRule.cpp \ - nsXULContentBuilder.cpp \ - nsXULContentUtils.cpp \ - nsXULTreeBuilder.cpp \ - nsXULSortService.cpp \ - nsXULTemplateBuilder.cpp \ - nsXULTemplateQueryProcessorRDF.cpp \ - nsXULTemplateResultRDF.cpp \ - nsXULTemplateResultSetRDF.cpp \ - nsXMLBinding.cpp \ - nsXULTemplateQueryProcessorXML.cpp \ - nsXULTemplateResultXML.cpp \ - nsXULTemplateQueryProcessorStorage.cpp \ - nsXULTemplateResultStorage.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xul/templates/src/moz.build b/content/xul/templates/src/moz.build index cd09795453e..c4b8bcce100 100644 --- a/content/xul/templates/src/moz.build +++ b/content/xul/templates/src/moz.build @@ -6,3 +6,32 @@ MODULE = 'xultmpl' +CPP_SOURCES += [ + 'nsContentSupportMap.cpp', + 'nsContentTestNode.cpp', + 'nsInstantiationNode.cpp', + 'nsRDFBinding.cpp', + 'nsRDFConInstanceTestNode.cpp', + 'nsRDFConMemberTestNode.cpp', + 'nsRDFPropertyTestNode.cpp', + 'nsRDFQuery.cpp', + 'nsResourceSet.cpp', + 'nsRuleNetwork.cpp', + 'nsTemplateMatch.cpp', + 'nsTemplateRule.cpp', + 'nsTreeRows.cpp', + 'nsXMLBinding.cpp', + 'nsXULContentBuilder.cpp', + 'nsXULContentUtils.cpp', + 'nsXULSortService.cpp', + 'nsXULTemplateBuilder.cpp', + 'nsXULTemplateQueryProcessorRDF.cpp', + 'nsXULTemplateQueryProcessorStorage.cpp', + 'nsXULTemplateQueryProcessorXML.cpp', + 'nsXULTemplateResultRDF.cpp', + 'nsXULTemplateResultSetRDF.cpp', + 'nsXULTemplateResultStorage.cpp', + 'nsXULTemplateResultXML.cpp', + 'nsXULTreeBuilder.cpp', +] + diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 6797c457d47..22c97703ffa 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -18,21 +18,6 @@ ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif -CPPSRCS = \ - nsDocShell.cpp \ - nsDocShellLoadInfo.cpp \ - nsDocShellEditorData.cpp \ - nsDocShellTransferableHooks.cpp \ - nsDocShellEnumerator.cpp \ - nsDSURIContentListener.cpp \ - nsDefaultURIFixup.cpp \ - nsWebNavigationInfo.cpp \ - nsAboutRedirector.cpp \ - nsDownloadHistory.cpp \ - SerializedLoadContext.cpp \ - LoadContext.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 1d4cc374925..8c3927b4855 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -47,3 +47,18 @@ EXPORTS.mozilla += [ 'LoadContext.h', ] +CPP_SOURCES += [ + 'LoadContext.cpp', + 'SerializedLoadContext.cpp', + 'nsAboutRedirector.cpp', + 'nsDSURIContentListener.cpp', + 'nsDefaultURIFixup.cpp', + 'nsDocShell.cpp', + 'nsDocShellEditorData.cpp', + 'nsDocShellEnumerator.cpp', + 'nsDocShellLoadInfo.cpp', + 'nsDocShellTransferableHooks.cpp', + 'nsDownloadHistory.cpp', + 'nsWebNavigationInfo.cpp', +] + diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in index b6ee7f4427b..cc83ef2e067 100644 --- a/docshell/build/Makefile.in +++ b/docshell/build/Makefile.in @@ -18,10 +18,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsDocShellModule.cpp \ - $(NULL) - SHARED_LIBRARY_LIBS= \ ../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \ $(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \ diff --git a/docshell/build/moz.build b/docshell/build/moz.build index 53c06ab9b4b..bc7bafe0280 100644 --- a/docshell/build/moz.build +++ b/docshell/build/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'nsDocShellCID.h', ] +CPP_SOURCES += [ + 'nsDocShellModule.cpp', +] + diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index 8531149e32e..f7c6b1128c5 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -16,12 +16,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = nsSHEntry.cpp \ - nsSHTransaction.cpp \ - nsSHistory.cpp \ - nsSHEntryShared.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build index 91cf3305336..edb54c80d3f 100644 --- a/docshell/shistory/src/moz.build +++ b/docshell/shistory/src/moz.build @@ -10,3 +10,10 @@ EXPORTS += [ 'nsSHEntryShared.h', ] +CPP_SOURCES += [ + 'nsSHEntry.cpp', + 'nsSHEntryShared.cpp', + 'nsSHTransaction.cpp', + 'nsSHistory.cpp', +] + diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index 6969280dddb..403c02944ff 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -16,10 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - Activity.cpp \ - $(NULL) - EXTRA_COMPONENTS = \ ActivityOptions.js \ ActivityProxy.js \ diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build index 1f94e4971e8..c74b1802c44 100644 --- a/dom/activities/src/moz.build +++ b/dom/activities/src/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.dom += [ 'Activity.h', ] +CPP_SOURCES += [ + 'Activity.cpp', +] + diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index 55a697fb64b..0210e05a94e 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -26,10 +26,6 @@ EXTRA_JS_MODULES = \ AlarmService.jsm \ $(NULL) -CPPSRCS = \ - AlarmHalService.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build index ef521315cc0..4807e7dd334 100644 --- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -23,3 +23,7 @@ EXPORTS.mozilla.dom.alarm += [ 'AlarmHalService.h', ] +CPP_SOURCES += [ + 'AlarmHalService.cpp', +] + diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in index ef93cd4d67b..6c0f3452d23 100644 --- a/dom/audiochannel/Makefile.in +++ b/dom/audiochannel/Makefile.in @@ -25,12 +25,6 @@ FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS += \ - AudioChannelService.cpp \ - AudioChannelServiceChild.cpp \ - AudioChannelAgent.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index 7763b61cbd3..5b116f5a320 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -21,3 +21,9 @@ EXPORTS += [ 'AudioChannelServiceChild.h', ] +CPP_SOURCES += [ + 'AudioChannelAgent.cpp', + 'AudioChannelService.cpp', + 'AudioChannelServiceChild.cpp', +] + diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 41c64874298..753b146f979 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -31,40 +31,6 @@ EXTRA_JS_MODULES += \ ObjectWrapper.jsm \ $(NULL) -CPPSRCS = \ - nsBarProps.cpp \ - nsDOMException.cpp \ - nsDOMWindowUtils.cpp \ - nsJSEnvironment.cpp \ - nsJSTimeoutHandler.cpp \ - nsFocusManager.cpp \ - nsGlobalWindow.cpp \ - nsGlobalWindowCommands.cpp \ - nsLocation.cpp \ - nsDOMWindowList.cpp \ - nsJSUtils.cpp \ - nsScreen.cpp \ - nsHistory.cpp \ - nsMimeTypeArray.cpp \ - nsPluginArray.cpp \ - nsWindowRoot.cpp \ - nsDOMClassInfo.cpp \ - nsScriptNameSpaceManager.cpp \ - nsDOMScriptObjectFactory.cpp \ - nsQueryContentEventResult.cpp \ - nsContentPermissionHelper.cpp \ - nsStructuredCloneContainer.cpp \ - nsDOMNavigationTiming.cpp \ - nsPerformance.cpp \ - nsWindowMemoryReporter.cpp \ - Crypto.cpp \ - DOMError.cpp \ - DOMRequest.cpp \ - DOMCursor.cpp \ - Navigator.cpp \ - URL.cpp \ - $(NULL) - include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER diff --git a/dom/base/moz.build b/dom/base/moz.build index 12cee79bc65..ec4a0197c7f 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -62,3 +62,37 @@ EXPORTS.mozilla.dom += [ 'URL.h', ] +CPP_SOURCES += [ + 'Crypto.cpp', + 'DOMCursor.cpp', + 'DOMError.cpp', + 'DOMRequest.cpp', + 'Navigator.cpp', + 'URL.cpp', + 'nsBarProps.cpp', + 'nsContentPermissionHelper.cpp', + 'nsDOMClassInfo.cpp', + 'nsDOMException.cpp', + 'nsDOMNavigationTiming.cpp', + 'nsDOMScriptObjectFactory.cpp', + 'nsDOMWindowList.cpp', + 'nsDOMWindowUtils.cpp', + 'nsFocusManager.cpp', + 'nsGlobalWindow.cpp', + 'nsGlobalWindowCommands.cpp', + 'nsHistory.cpp', + 'nsJSEnvironment.cpp', + 'nsJSTimeoutHandler.cpp', + 'nsJSUtils.cpp', + 'nsLocation.cpp', + 'nsMimeTypeArray.cpp', + 'nsPerformance.cpp', + 'nsPluginArray.cpp', + 'nsQueryContentEventResult.cpp', + 'nsScreen.cpp', + 'nsScriptNameSpaceManager.cpp', + 'nsStructuredCloneContainer.cpp', + 'nsWindowMemoryReporter.cpp', + 'nsWindowRoot.cpp', +] + diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index 9690540bcc7..b93ed50009c 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -16,10 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - BatteryManager.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 318c1aa4542..d49d90c7478 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -22,3 +22,7 @@ EXPORTS.mozilla.dom.battery += [ 'Types.h', ] +CPP_SOURCES += [ + 'BatteryManager.cpp', +] + diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in index 64117d37fbc..33c3c15d298 100644 --- a/dom/bindings/test/Makefile.in +++ b/dom/bindings/test/Makefile.in @@ -30,8 +30,6 @@ include $(topsrcdir)/dom/webidl/WebIDL.mk # But the webidl actually lives in our parent dir test_webidl_files := $(addprefix ../,$(test_webidl_files)) -CPPSRCS := $(subst .webidl,Binding.cpp,$(test_webidl_files)) - LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/src \ -I$(topsrcdir)/js/xpconnect/wrappers \ diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build index f0a612a32de..042cc881608 100644 --- a/dom/bindings/test/moz.build +++ b/dom/bindings/test/moz.build @@ -6,3 +6,7 @@ MODULE = 'dom' +CPP_SOURCES += [ + '$(subst .webidl,Binding.cpp,$(test_webidl_files))', +] + diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index e9e0dc3f92a..3d9645d44bb 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -29,45 +29,17 @@ LIBRARY_NAME = dombluetooth_s LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS += \ - BluetoothService.cpp \ - BluetoothManager.cpp \ - BluetoothAdapter.cpp \ - BluetoothDevice.cpp \ - BluetoothReplyRunnable.cpp \ - BluetoothPropertyContainer.cpp \ - BluetoothUtils.cpp \ - BluetoothChild.cpp \ - BluetoothParent.cpp \ - BluetoothServiceChildProcess.cpp \ - BluetoothUnixSocketConnector.cpp \ - BluetoothHfpManager.cpp \ - BluetoothOppManager.cpp \ - ObexBase.cpp \ - BluetoothUuid.cpp \ - BluetoothSocket.cpp \ - $(NULL) - -ifdef MOZ_B2G_RIL -CPPSRCS += BluetoothTelephonyListener.cpp -endif - ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) VPATH += \ $(srcdir)/linux \ $(srcdir)/gonk \ $(NULL) LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS) -CPPSRCS += \ - BluetoothDBusService.cpp \ - BluetoothGonkService.cpp \ - $(NULL) DEFINES += -DMOZ_BLUETOOTH_GONK else ifdef MOZ_ENABLE_DBUS VPATH += $(srcdir)/linux LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS) -CPPSRCS += BluetoothDBusService.cpp CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) -DHAVE_PTHREADS DEFINES += -DMOZ_BLUETOOTH_DBUS diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index cd03f4bb917..3d7169a9532 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -25,6 +25,41 @@ if CONFIG['MOZ_B2G_BT']: 'nsIDOMNavigatorBluetooth.idl', ] + CPP_SOURCES += [ + 'BluetoothService.cpp', + 'BluetoothManager.cpp', + 'BluetoothAdapter.cpp', + 'BluetoothDevice.cpp', + 'BluetoothReplyRunnable.cpp', + 'BluetoothPropertyContainer.cpp', + 'BluetoothUtils.cpp', + 'BluetoothChild.cpp', + 'BluetoothParent.cpp', + 'BluetoothServiceChildProcess.cpp', + 'BluetoothUnixSocketConnector.cpp', + 'BluetoothHfpManager.cpp', + 'BluetoothOppManager.cpp', + 'ObexBase.cpp', + 'BluetoothUuid.cpp', + 'BluetoothSocket.cpp', + ] + + if CONFIG['MOZ_B2G_RIL']: + CPP_SOURCES += [ + 'BluetoothTelephonyListener.cpp', + ] + + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + CPP_SOURCES += [ + 'BluetoothDBusService.cpp', + 'BluetoothGonkService.cpp', + ] + else: + if CONFIG['MOZ_ENABLE_DBUS']: + CPP_SOURCES += [ + 'BluetoothDBusService.cpp', + ] + EXPORTS.mozilla.dom.bluetooth.ipc += [ 'BluetoothMessageUtils.h', ] diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index 26c20cdf348..0e5e8eb0b7e 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -16,12 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - nsOpenWindowEventDetail.cpp \ - nsAsyncScrollEventDetail.cpp \ - BrowserElementParent.cpp \ - $(NULL) - EXTRA_COMPONENTS = \ BrowserElementParent.js \ BrowserElementParent.manifest \ diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build index ead711e381b..a84959e2c06 100644 --- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -24,3 +24,9 @@ EXPORTS.mozilla += [ 'BrowserElementParent.h', ] +CPP_SOURCES += [ + 'BrowserElementParent.cpp', + 'nsAsyncScrollEventDetail.cpp', + 'nsOpenWindowEventDetail.cpp', +] + diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index 4c6ee7eb4b8..b48832cc535 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -15,43 +15,6 @@ FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk - -CPPSRCS = \ - DOMCameraManager.cpp \ - DOMCameraControl.cpp \ - DOMCameraPreview.cpp \ - DOMCameraCapabilities.cpp \ - CameraControlImpl.cpp \ - CameraRecorderProfiles.cpp \ - CameraPreviewMediaStream.cpp \ - $(NULL) - -ifeq ($(MOZ_B2G_CAMERA),1) -CPPSRCS += \ - GonkCameraManager.cpp \ - GonkCameraControl.cpp \ - GonkCameraHwMgr.cpp \ - GonkNativeWindow.cpp \ - GonkNativeWindowClient.cpp \ - GonkRecorder.cpp \ - GonkCameraSource.cpp \ - AudioParameter.cpp \ - GonkRecorderProfiles.cpp \ - $(NULL) -else ifeq ($(MOZ_OMX_DECODER),1) -CPPSRCS += \ - FallbackCameraManager.cpp \ - FallbackCameraControl.cpp \ - GonkNativeWindow.cpp \ - GonkNativeWindowClient.cpp \ - $(NULL) -else -CPPSRCS += \ - FallbackCameraManager.cpp \ - FallbackCameraControl.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/camera/moz.build b/dom/camera/moz.build index f9a42ee8c5e..342f6d2af64 100644 --- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -29,3 +29,37 @@ EXPORTS += [ 'GonkNativeWindowClient.h', ] +CPP_SOURCES += [ + 'CameraControlImpl.cpp', + 'CameraPreviewMediaStream.cpp', + 'CameraRecorderProfiles.cpp', + 'DOMCameraCapabilities.cpp', + 'DOMCameraControl.cpp', + 'DOMCameraManager.cpp', + 'DOMCameraPreview.cpp', +] + +if CONFIG['MOZ_B2G_CAMERA']: + CPP_SOURCES += [ + 'GonkCameraManager.cpp', + 'GonkCameraControl.cpp', + 'GonkCameraHwMgr.cpp', + 'GonkNativeWindow.cpp', + 'GonkNativeWindowClient.cpp', + 'GonkRecorder.cpp', + 'GonkCameraSource.cpp', + 'AudioParameter.cpp', + 'GonkRecorderProfiles.cpp', + ] +elif CONFIG['MOZ_OMX_DECODER']: + CPP_SOURCES += [ + 'FallbackCameraManager.cpp', + 'FallbackCameraControl.cpp', + 'GonkNativeWindow.cpp', + 'GonkNativeWindowClient.cpp', + ] +else: + CPP_SOURCES += [ + 'FallbackCameraManager.cpp', + 'FallbackCameraControl.cpp', + ] diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in index 1f8b27f359f..e63dece92a6 100644 --- a/dom/cellbroadcast/src/Makefile.in +++ b/dom/cellbroadcast/src/Makefile.in @@ -16,8 +16,4 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - CellBroadcast.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/dom/cellbroadcast/src/moz.build b/dom/cellbroadcast/src/moz.build index 2f3c2dd3f98..e1b5599978f 100644 --- a/dom/cellbroadcast/src/moz.build +++ b/dom/cellbroadcast/src/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.dom += [ 'CellBroadcast.h', ] +CPP_SOURCES += [ + 'CellBroadcast.cpp', +] + diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index 3359deb7510..8b9d6d345fd 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -16,12 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - nsDeviceStorage.cpp \ - DeviceStorageRequestParent.cpp \ - DeviceStorageRequestChild.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build index d2219ccfd13..1794cbc037a 100644 --- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -20,3 +20,9 @@ EXPORTS.mozilla.dom.devicestorage += [ 'DeviceStorageRequestParent.h', ] +CPP_SOURCES += [ + 'DeviceStorageRequestChild.cpp', + 'DeviceStorageRequestParent.cpp', + 'nsDeviceStorage.cpp', +] + diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index 5493da97b1b..b9c542d8618 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -14,12 +14,6 @@ LIBRARY_NAME = domencoding_s LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - EncodingUtils.cpp \ - TextDecoder.cpp \ - TextEncoder.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/locale/src \ $(NULL) diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 8e947a456eb..81fb2eb00d0 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -16,3 +16,9 @@ EXPORTS.mozilla.dom += [ 'TextEncoderBase.h', ] +CPP_SOURCES += [ + 'EncodingUtils.cpp', + 'TextDecoder.cpp', + 'TextEncoder.cpp', +] + diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in index c19cb31940e..e67d175fa93 100644 --- a/dom/file/Makefile.in +++ b/dom/file/Makefile.in @@ -16,25 +16,5 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - AsyncHelper.cpp \ - DOMFileHandle.cpp \ - DOMFileRequest.cpp \ - File.cpp \ - FileHandle.cpp \ - FileHelper.cpp \ - FileRequest.cpp \ - FileService.cpp \ - FileStreamWrappers.cpp \ - LockedFile.cpp \ - MemoryStreams.cpp \ - MetadataHelper.cpp \ - ArchiveEvent.cpp \ - ArchiveZipEvent.cpp \ - ArchiveZipFile.cpp \ - ArchiveReader.cpp \ - ArchiveRequest.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/dom/file/moz.build b/dom/file/moz.build index cd3e4991d19..2a38d905071 100644 --- a/dom/file/moz.build +++ b/dom/file/moz.build @@ -41,3 +41,23 @@ EXPORTS.mozilla.dom.file += [ 'LockedFile.h', ] +CPP_SOURCES += [ + 'ArchiveEvent.cpp', + 'ArchiveReader.cpp', + 'ArchiveRequest.cpp', + 'ArchiveZipEvent.cpp', + 'ArchiveZipFile.cpp', + 'AsyncHelper.cpp', + 'DOMFileHandle.cpp', + 'DOMFileRequest.cpp', + 'File.cpp', + 'FileHandle.cpp', + 'FileHelper.cpp', + 'FileRequest.cpp', + 'FileService.cpp', + 'FileStreamWrappers.cpp', + 'LockedFile.cpp', + 'MemoryStreams.cpp', + 'MetadataHelper.cpp', +] + diff --git a/dom/fm/Makefile.in b/dom/fm/Makefile.in index 6bcf9e25a11..077eb85b143 100644 --- a/dom/fm/Makefile.in +++ b/dom/fm/Makefile.in @@ -15,11 +15,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS += \ - FMRadio.cpp \ - nsFMRadioSettings.cpp \ - $(NULL) - EXTRA_COMPONENTS = \ DOMFMRadioChild.js \ DOMFMRadio.manifest \ diff --git a/dom/fm/moz.build b/dom/fm/moz.build index 27ff15c83f4..aa4b94f38e7 100644 --- a/dom/fm/moz.build +++ b/dom/fm/moz.build @@ -17,3 +17,8 @@ XPIDL_FLAGS += [ MODULE = 'dom' +CPP_SOURCES += [ + 'FMRadio.cpp', + 'nsFMRadioSettings.cpp', +] + diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index 823d053d724..a2fed74976c 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -16,11 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - IccManager.cpp \ - StkCommandEvent.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build index fda7fb34f88..e5e527fd48c 100644 --- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -8,3 +8,8 @@ EXPORTS.mozilla.dom.icc += [ 'StkCommandEvent.h', ] +CPP_SOURCES += [ + 'IccManager.cpp', + 'StkCommandEvent.cpp', +] + diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index 67768928ee1..9f2bec08458 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -14,31 +14,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - AsyncConnectionHelper.cpp \ - CheckPermissionsHelper.cpp \ - Client.cpp \ - DatabaseInfo.cpp \ - FileInfo.cpp \ - FileManager.cpp \ - IDBCursor.cpp \ - IDBDatabase.cpp \ - IDBEvents.cpp \ - IDBFactory.cpp \ - IDBFileHandle.cpp \ - IDBIndex.cpp \ - IDBKeyRange.cpp \ - IDBObjectStore.cpp \ - IDBRequest.cpp \ - IDBTransaction.cpp \ - IDBWrapperCache.cpp \ - IndexedDatabaseManager.cpp \ - Key.cpp \ - KeyPath.cpp \ - OpenDatabaseHelper.cpp \ - TransactionThreadPool.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index f73c9f32584..1560cdf0cc0 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -15,11 +15,6 @@ LIBRARY_NAME = dom_indexeddb_ipc_s LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS += \ - IndexedDBChild.cpp \ - IndexedDBParent.cpp \ - $(NULL) - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/indexedDB \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build index 1804b1be1c7..843fe5b1502 100644 --- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -12,3 +12,8 @@ EXPORTS.mozilla.dom.indexedDB += [ # Need to enable these tests sometime soon. #XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +CPP_SOURCES += [ + 'IndexedDBChild.cpp', + 'IndexedDBParent.cpp', +] diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index d1fb542676c..9b0cbb1db9d 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -53,3 +53,28 @@ EXPORTS.mozilla.dom.indexedDB += [ 'KeyPath.h', ] +CPP_SOURCES += [ + 'AsyncConnectionHelper.cpp', + 'CheckPermissionsHelper.cpp', + 'Client.cpp', + 'DatabaseInfo.cpp', + 'FileInfo.cpp', + 'FileManager.cpp', + 'IDBCursor.cpp', + 'IDBDatabase.cpp', + 'IDBEvents.cpp', + 'IDBFactory.cpp', + 'IDBFileHandle.cpp', + 'IDBIndex.cpp', + 'IDBKeyRange.cpp', + 'IDBObjectStore.cpp', + 'IDBRequest.cpp', + 'IDBTransaction.cpp', + 'IDBWrapperCache.cpp', + 'IndexedDatabaseManager.cpp', + 'Key.cpp', + 'KeyPath.cpp', + 'OpenDatabaseHelper.cpp', + 'TransactionThreadPool.cpp', +] + diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 896848e9a0d..53344aa9f4c 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -15,24 +15,6 @@ FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - AppProcessChecker.cpp \ - Blob.cpp \ - ContentProcess.cpp \ - ContentParent.cpp \ - ContentChild.cpp \ - CrashReporterParent.cpp \ - CrashReporterChild.cpp \ - PermissionMessageUtils.cpp \ - PreallocatedProcessManager.cpp \ - ProcessPriorityManager.cpp \ - StructuredCloneUtils.cpp \ - TabParent.cpp \ - TabChild.cpp \ - TabContext.cpp \ - TabMessageUtils.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index e4f7a13c5f1..27ac4a8a274 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -39,3 +39,21 @@ EXPORTS.mozilla += [ 'ProcessPriorityManager.h', ] +CPP_SOURCES += [ + 'AppProcessChecker.cpp', + 'Blob.cpp', + 'ContentProcess.cpp', + 'ContentParent.cpp', + 'ContentChild.cpp', + 'CrashReporterParent.cpp', + 'CrashReporterChild.cpp', + 'PermissionMessageUtils.cpp', + 'PreallocatedProcessManager.cpp', + 'ProcessPriorityManager.cpp', + 'StructuredCloneUtils.cpp', + 'TabParent.cpp', + 'TabChild.cpp', + 'TabContext.cpp', + 'TabMessageUtils.cpp', +] + diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index b7715990c34..1d02545f6c5 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -22,10 +22,6 @@ EXTRA_COMPONENTS = \ PeerConnection.manifest \ $(NULL) -CPPSRCS = \ - MediaManager.cpp \ - $(NULL) - ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/media/webrtc/trunk/webrtc \ diff --git a/dom/media/bridge/Makefile.in b/dom/media/bridge/Makefile.in index 649b873e172..2ccb699e1d8 100644 --- a/dom/media/bridge/Makefile.in +++ b/dom/media/bridge/Makefile.in @@ -16,10 +16,6 @@ IS_COMPONENT = 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - MediaModule.cpp \ - $(NULL) - LOCAL_INCLUDES += \ -I$(topsrcdir)/media/mtransport \ -I$(topsrcdir)/media/webrtc/signaling/include \ diff --git a/dom/media/bridge/moz.build b/dom/media/bridge/moz.build index 49059e1ce66..39b932c31c7 100644 --- a/dom/media/bridge/moz.build +++ b/dom/media/bridge/moz.build @@ -10,3 +10,7 @@ XPIDL_SOURCES += [ MODULE = 'peerconnection' +CPP_SOURCES += [ + 'MediaModule.cpp', +] + diff --git a/dom/media/moz.build b/dom/media/moz.build index e9ca08f7007..3d44f7de596 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -23,3 +23,7 @@ EXPORTS.mozilla += [ 'MediaManager.h', ] +CPP_SOURCES += [ + 'MediaManager.cpp', +] + diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 4453efcb49a..0679d45563d 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -28,25 +28,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - MobileMessageCursorCallback.cpp \ - MobileMessageThread.cpp \ - SmsManager.cpp \ - MobileMessageManager.cpp \ - SmsService.cpp \ - MobileMessageService.cpp \ - SmsIPCService.cpp \ - SmsServicesFactory.cpp \ - SmsParent.cpp \ - SmsMessage.cpp \ - MmsMessage.cpp \ - Constants.cpp \ - SmsChild.cpp \ - MobileMessageCallback.cpp \ - SmsFilter.cpp \ - SmsSegmentInfo.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ -I$(topsrcdir)/dom/base \ @@ -76,11 +57,6 @@ EXTRA_JS_MODULES = \ ril/WapPushManager.js \ ril/WspPduHelper.jsm \ $(NULL) -else -CPPSRCS += \ - MobileMessageDatabaseService.cpp \ - MmsService.cpp \ - $(NULL) endif include $(topsrcdir)/config/config.mk diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index 0ee3a446418..e2d868ee095 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -19,6 +19,10 @@ if not CONFIG['MOZ_B2G_RIL']: 'MmsService.h', 'MobileMessageDatabaseService.h', ] + CPP_SOURCES += [ + 'MobileMessageDatabaseService.cpp', + 'MmsService.cpp', + ] EXPORTS.mozilla.dom += [ 'MmsMessage.h', @@ -29,3 +33,22 @@ EXPORTS.mozilla.dom += [ 'SmsSegmentInfo.h', ] +CPP_SOURCES += [ + 'Constants.cpp', + 'MmsMessage.cpp', + 'MobileMessageCallback.cpp', + 'MobileMessageCursorCallback.cpp', + 'MobileMessageManager.cpp', + 'MobileMessageService.cpp', + 'MobileMessageThread.cpp', + 'SmsChild.cpp', + 'SmsFilter.cpp', + 'SmsIPCService.cpp', + 'SmsManager.cpp', + 'SmsMessage.cpp', + 'SmsParent.cpp', + 'SmsSegmentInfo.cpp', + 'SmsService.cpp', + 'SmsServicesFactory.cpp', +] + diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index 0fd0bfe6be8..a1be039ea6f 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -34,19 +34,6 @@ endif include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - Connection.cpp \ - Utils.cpp \ - TCPSocketParent.cpp \ - TCPSocketChild.cpp \ - $(NULL) - -ifdef MOZ_B2G_RIL -CPPSRCS += \ - MobileConnection.cpp \ - $(NULL) -endif - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build index e0c7b2db163..19ab40e04ef 100644 --- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -12,3 +12,14 @@ EXPORTS.mozilla.dom.network += [ 'Utils.h', ] +CPP_SOURCES += [ + 'Connection.cpp', + 'TCPSocketChild.cpp', + 'TCPSocketParent.cpp', + 'Utils.cpp', +] + +if CONFIG['MOZ_B2G_RIL']: + CPP_SOURCES += [ + 'MobileConnection.cpp', + ] diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index b43e532987b..2c3a1569b7e 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -17,20 +17,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsPluginModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsNPAPIPlugin.cpp \ - nsNPAPIPluginInstance.cpp \ - nsNPAPIPluginStreamListener.cpp \ - nsPluginStreamListenerPeer.cpp \ - nsPluginHost.cpp \ - nsPluginModule.cpp \ - nsJSNPRuntime.cpp \ - nsPluginTags.cpp \ - PluginPRLibrary.cpp \ - nsPluginInstanceOwner.cpp \ - nsPluginPlayPreviewInfo.cpp \ - $(NULL) - ifeq ($(MOZ_WIDGET_TOOLKIT),android) LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android else @@ -41,31 +27,7 @@ FAIL_ON_WARNINGS := 1 endif ifeq ($(OS_ARCH),WINNT) - CPPSRCS += nsPluginsDirWin.cpp - CPPSRCS += nsPluginNativeWindowWin.cpp - CPPSRCS += nsPluginDirServiceProvider.cpp LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base -else -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) - CPPSRCS += nsPluginsDirOS2.cpp - CPPSRCS += nsPluginNativeWindowOS2.cpp -else -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - CPPSRCS += nsPluginsDirDarwin.cpp - CPPSRCS += nsPluginNativeWindow.cpp -else - CPPSRCS += nsPluginsDirUnix.cpp -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) - CPPSRCS += nsPluginNativeWindowGtk2.cpp -else -ifeq ($(MOZ_WIDGET_TOOLKIT),qt) - CPPSRCS += nsPluginNativeWindowQt.cpp -else - CPPSRCS += nsPluginNativeWindow.cpp -endif -endif -endif -endif endif LOCAL_INCLUDES += \ diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index 597e08b7395..5643eaeaa95 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -19,19 +19,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -CPPSRCS += ANPAudio.cpp \ - ANPEvent.cpp \ - ANPMatrix.cpp \ - ANPSystem.cpp \ - ANPWindow.cpp \ - ANPBitmap.cpp \ - ANPLog.cpp \ - ANPNativeWindow.cpp \ - ANPSurface.cpp \ - ANPVideo.cpp \ - ANPOpenGL.cpp \ - $(NULL) - LOCAL_INCLUDES += \ -I$(topsrcdir)/widget/android \ -I$(topsrcdir)/widget/xpwidgets \ diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build index 197fc0a5e4b..9dc96cdb1a9 100644 --- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -11,3 +11,17 @@ EXPORTS += [ 'android_npapi.h', ] +CPP_SOURCES += [ + 'ANPAudio.cpp', + 'ANPBitmap.cpp', + 'ANPEvent.cpp', + 'ANPLog.cpp', + 'ANPMatrix.cpp', + 'ANPNativeWindow.cpp', + 'ANPOpenGL.cpp', + 'ANPSurface.cpp', + 'ANPSystem.cpp', + 'ANPVideo.cpp', + 'ANPWindow.cpp', +] + diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index 3ec6f741448..7b11cde4a99 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -42,3 +42,49 @@ EXPORTS.mozilla += [ 'PluginPRLibrary.h', ] +CPP_SOURCES += [ + 'PluginPRLibrary.cpp', + 'nsJSNPRuntime.cpp', + 'nsNPAPIPlugin.cpp', + 'nsNPAPIPluginInstance.cpp', + 'nsNPAPIPluginStreamListener.cpp', + 'nsPluginHost.cpp', + 'nsPluginInstanceOwner.cpp', + 'nsPluginModule.cpp', + 'nsPluginPlayPreviewInfo.cpp', + 'nsPluginStreamListenerPeer.cpp', + 'nsPluginTags.cpp', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsPluginsDirWin.cpp', + 'nsPluginNativeWindowWin.cpp', + 'nsPluginDirServiceProvider.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': + CPP_SOURCES += [ + 'nsPluginsDirOS2.cpp', + 'nsPluginNativeWindowOS2.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CPP_SOURCES += [ + 'nsPluginsDirDarwin.cpp', + 'nsPluginNativeWindow.cpp', + ] +else: + CPP_SOURCES += [ + 'nsPluginsDirUnix.cpp', + ] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'nsPluginNativeWindowGtk2.cpp', + ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': + CPP_SOURCES += [ + 'nsPluginNativeWindowQt.cpp', + ] + else: + CPP_SOURCES += [ + 'nsPluginNativeWindow.cpp', + ] diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index 7f679a71a98..26dd05379ee 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -16,46 +16,7 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 -ifeq ($(MOZ_ENABLE_QT),1) -MOCSRCS = \ - moc_NestedLoopTimer.cpp \ - $(NULL) - -QTSRCS = \ - NestedLoopTimer.cpp \ - $(NULL) -endif - -CPPSRCS = \ - $(MOCSRCS) \ - $(QTSRCS) \ - ChildAsyncCall.cpp \ - ChildTimer.cpp \ - PluginMessageUtils.cpp \ - PluginIdentifierChild.cpp \ - PluginIdentifierParent.cpp \ - PluginInstanceChild.cpp \ - PluginInstanceParent.cpp \ - PluginModuleChild.cpp \ - PluginModuleParent.cpp \ - PluginProcessChild.cpp \ - PluginProcessParent.cpp \ - PluginScriptableObjectChild.cpp \ - PluginScriptableObjectParent.cpp \ - BrowserStreamChild.cpp \ - BrowserStreamParent.cpp \ - PluginStreamChild.cpp \ - PluginStreamParent.cpp \ - $(NULL) - ifeq (WINNT,$(OS_ARCH)) -CPPSRCS += \ - COMMessageFilter.cpp \ - PluginSurfaceParent.cpp \ - MiniShmParent.cpp \ - PluginHangUIParent.cpp \ - $(NULL) - DEFINES += \ -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \ $(NULL) diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in index 791497649bb..04bc88a0ad6 100644 --- a/dom/plugins/ipc/hangui/Makefile.in +++ b/dom/plugins/ipc/hangui/Makefile.in @@ -10,11 +10,6 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - MiniShmChild.cpp \ - PluginHangUIChild.cpp \ - $(NULL) - OS_LIBS = $(call EXPAND_LIBNAME,comctl32) RCINCLUDE = HangUIDlg.rc diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build index 76f993ab180..33b6a6eb642 100644 --- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -6,3 +6,7 @@ PROGRAM = 'plugin-hang-ui' +CPP_SOURCES += [ + 'MiniShmChild.cpp', + 'PluginHangUIChild.cpp', +] diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index 115ae7c1172..216b532dc3d 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -47,8 +47,41 @@ if CONFIG['OS_ARCH'] == 'WINNT': EXPORTS.mozilla.plugins += [ 'PluginSurfaceParent.h', ] + CPP_SOURCES += [ + 'COMMessageFilter.cpp', + 'PluginSurfaceParent.cpp', + 'MiniShmParent.cpp', + 'PluginHangUIParent.cpp', + ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS.mozilla.plugins += [ 'PluginInterposeOSX.h', ] + +if CONFIG['MOZ_ENABLE_QT']: + CPP_SOURCES += [ + 'moc_NestedLoopTimer.cpp', + 'NestedLoopTimer.cpp', + ] + +CPP_SOURCES += [ + 'BrowserStreamChild.cpp', + 'BrowserStreamParent.cpp', + 'ChildAsyncCall.cpp', + 'ChildTimer.cpp', + 'PluginIdentifierChild.cpp', + 'PluginIdentifierParent.cpp', + 'PluginInstanceChild.cpp', + 'PluginInstanceParent.cpp', + 'PluginMessageUtils.cpp', + 'PluginModuleChild.cpp', + 'PluginModuleParent.cpp', + 'PluginProcessChild.cpp', + 'PluginProcessParent.cpp', + 'PluginScriptableObjectChild.cpp', + 'PluginScriptableObjectParent.cpp', + 'PluginStreamChild.cpp', + 'PluginStreamParent.cpp', +] + diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index 08a752265ad..749052f3351 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -16,12 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - PowerManager.cpp \ - PowerManagerService.cpp \ - WakeLock.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/power/moz.build b/dom/power/moz.build index 379acd8a7c7..a4d35f36dce 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -21,3 +21,9 @@ EXPORTS.mozilla.dom.power += [ 'Types.h', ] +CPP_SOURCES += [ + 'PowerManager.cpp', + 'PowerManagerService.cpp', + 'WakeLock.cpp', +] + diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index 2a7755e718a..c1cdd879637 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -17,13 +17,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - CheckQuotaHelper.cpp \ - FileStreams.cpp \ - QuotaManager.cpp \ - QuotaObject.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ $(NULL) diff --git a/dom/quota/moz.build b/dom/quota/moz.build index 51c73377862..5576884cd00 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -32,3 +32,10 @@ EXPORTS.mozilla.dom.quota += [ 'Utilities.h', ] +CPP_SOURCES += [ + 'CheckQuotaHelper.cpp', + 'FileStreams.cpp', + 'QuotaManager.cpp', + 'QuotaObject.cpp', +] + diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 3e90c82acf9..e1190e53bad 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -15,11 +15,6 @@ LIBRARY_NAME = jsdomevents_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsJSEventListener.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/dom/src/events/moz.build b/dom/src/events/moz.build index f0a612a32de..0b9332e7169 100644 --- a/dom/src/events/moz.build +++ b/dom/src/events/moz.build @@ -6,3 +6,7 @@ MODULE = 'dom' +CPP_SOURCES += [ + 'nsJSEventListener.cpp', +] + diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 9d96297a2c5..f3c48312152 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - nsGeolocation.cpp \ - nsGeoPosition.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build index 8f4ad075aa7..c70f2a089a9 100644 --- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -11,3 +11,8 @@ EXPORTS += [ 'nsGeoPositionIPCSerialiser.h', ] +CPP_SOURCES += [ + 'nsGeoPosition.cpp', + 'nsGeolocation.cpp', +] + diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index 5ced2b1257c..45b74ad2cd8 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -15,10 +15,6 @@ LIBRARY_NAME = json_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsJSON.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build index c77207336a3..d5564791ddf 100644 --- a/dom/src/json/moz.build +++ b/dom/src/json/moz.build @@ -12,3 +12,7 @@ EXPORTS += [ 'nsJSON.h', ] +CPP_SOURCES += [ + 'nsJSON.cpp', +] + diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index e3f2b9741c6..5c0335b81a4 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -16,8 +16,6 @@ FORCE_STATIC_LIB = 1 MODULE_NAME = javascript__protocol LIBXUL_LIBRARY = 1 -CPPSRCS = nsJSProtocolHandler.cpp - LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(topsrcdir)/dom/base \ diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build index 9fe15d61e5e..19e2cd41a2f 100644 --- a/dom/src/jsurl/moz.build +++ b/dom/src/jsurl/moz.build @@ -12,3 +12,7 @@ EXPORTS += [ 'nsJSProtocolHandler.h', ] +CPP_SOURCES += [ + 'nsJSProtocolHandler.cpp', +] + diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index 46e040a76e0..505d4d86e65 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - Notification.cpp \ - DesktopNotification.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build index 13d5cad79ea..1819dcc0f1e 100644 --- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -11,3 +11,8 @@ EXPORTS.mozilla.dom += [ 'Notification.h', ] +CPP_SOURCES += [ + 'DesktopNotification.cpp', + 'Notification.cpp', +] + diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index 3bff01f4651..f81ea56baa2 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -14,10 +14,6 @@ LIBRARY_NAME = jsdomoffline_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - nsDOMOfflineResourceList.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/dom/src/offline/moz.build b/dom/src/offline/moz.build index f0a612a32de..6621ca89139 100644 --- a/dom/src/offline/moz.build +++ b/dom/src/offline/moz.build @@ -6,3 +6,7 @@ MODULE = 'dom' +CPP_SOURCES += [ + 'nsDOMOfflineResourceList.cpp', +] + diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index 2a98d4482e4..ea29f30e8f7 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -15,15 +15,6 @@ LIBRARY_NAME = jsdomstorage_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - DOMStorage.cpp \ - DOMStorageCache.cpp \ - DOMStorageDBThread.cpp \ - DOMStorageObserver.cpp \ - DOMStorageManager.cpp \ - DOMStorageIPC.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index a1575a78d44..68422084639 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -10,3 +10,12 @@ EXPORTS.mozilla.dom += [ 'DOMStorageIPC.h', ] +CPP_SOURCES += [ + 'DOMStorage.cpp', + 'DOMStorageCache.cpp', + 'DOMStorageDBThread.cpp', + 'DOMStorageIPC.cpp', + 'DOMStorageManager.cpp', + 'DOMStorageObserver.cpp', +] + diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index 0c24f7bbea0..00ecde4333d 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -15,15 +15,6 @@ FAIL_ON_WARNINGS := 1 DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" -CPPSRCS = \ - nsDeviceSensors.cpp \ - OSFileConstants.cpp \ - $(NULL) - -ifdef MOZ_GAMEPAD -CPPSRCS += GamepadService.cpp -endif - # We fire the nsDOMDeviceAcceleration LOCAL_INCLUDES += \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index bd07e8f3043..eb9bd9fbb59 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -20,11 +20,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -CPPSRCS = \ - AndroidLocationProvider.cpp \ - nsHapticFeedback.cpp \ - $(NULL) - LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ -I$(topsrcdir)/content/events/src $(NULL) diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build index f0a612a32de..b8150629540 100644 --- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -6,3 +6,8 @@ MODULE = 'dom' +CPP_SOURCES += [ + 'AndroidLocationProvider.cpp', + 'nsHapticFeedback.cpp', +] + diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index 761a4aa6eee..60b3874ed5e 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -28,10 +28,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - SystemWorkerManager.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/src/geolocation \ @@ -41,26 +37,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/content/events/src \ $(NULL) -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - AudioManager.cpp \ - AutoMounter.cpp \ - AutoMounterSetting.cpp \ - GonkGPSGeolocationProvider.cpp \ - AudioChannelManager.cpp \ - nsVolume.cpp \ - nsVolumeMountLock.cpp \ - nsVolumeService.cpp \ - nsVolumeStat.cpp \ - TimeZoneSettingObserver.cpp \ - Volume.cpp \ - VolumeCommand.cpp \ - VolumeManager.cpp \ - VolumeServiceIOThread.cpp \ - VolumeServiceTest.cpp \ - $(NULL) -endif - EXTRA_COMPONENTS = \ NetworkManager.manifest \ NetworkManager.js \ diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index b1e1398a7f7..4caea5b7649 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -41,6 +41,27 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'nsVolume.h', 'nsVolumeService.h', ] + CPP_SOURCES += [ + 'AudioManager.cpp', + 'AutoMounter.cpp', + 'AutoMounterSetting.cpp', + 'GonkGPSGeolocationProvider.cpp', + 'AudioChannelManager.cpp', + 'nsVolume.cpp', + 'nsVolumeMountLock.cpp', + 'nsVolumeService.cpp', + 'nsVolumeStat.cpp', + 'TimeZoneSettingObserver.cpp', + 'Volume.cpp', + 'VolumeCommand.cpp', + 'VolumeManager.cpp', + 'VolumeServiceIOThread.cpp', + 'VolumeServiceTest.cpp', + ] if CONFIG['ENABLE_TESTS']: XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini'] + +CPP_SOURCES += [ + 'SystemWorkerManager.cpp', +] diff --git a/dom/system/moz.build b/dom/system/moz.build index 288f38e833f..931c9ab73bc 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -34,8 +34,16 @@ if CONFIG['MOZ_GAMEPAD']: EXPORTS.mozilla.dom = [ 'GamepadService.h', ] + CPP_SOURCES += [ + 'GamepadService.cpp', + ] EXPORTS.mozilla += [ 'OSFileConstants.h', ] +CPP_SOURCES += [ + 'OSFileConstants.cpp', + 'nsDeviceSensors.cpp', +] + diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index 9ce8753c2e5..0ecbfcc0dd9 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -22,22 +22,16 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk ifdef MOZ_MAEMO_LIBLOCATION - CPPSRCS += MaemoLocationProvider.cpp LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) \ -I$(topsrcdir)/dom/src/geolocation \ $(NULL) endif ifdef MOZ_PLATFORM_MAEMO -CPPSRCS += nsHapticFeedback.cpp LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS) \ $(NULL) endif ifdef MOZ_ENABLE_QTMOBILITY -MOCSRCS += moc_QTMLocationProvider.cpp -CPPSRCS += $(MOCSRCS) \ - QTMLocationProvider.cpp \ - $(NULL) LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) \ -I$(topsrcdir)/dom/src/geolocation \ $(NULL) diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build index f0a612a32de..297dd5a46f2 100644 --- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -6,3 +6,18 @@ MODULE = 'dom' +if CONFIG['MOZ_MAEMO_LIBLOCATION']: + CPP_SOURCES += [ + 'MaemoLocationProvider.cpp', + ] + +if CONFIG['MOZ_PLATFORM_MAEMO']: + CPP_SOURCES += [ + 'nsHapticFeedback.cpp', + ] + +if CONFIG['MOZ_ENABLE_QTMOBILITY']: + CPP_SOURCES += [ + 'moc_QTMLocationProvider.cpp', + 'QTMLocationProvider.cpp', + ] diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index 116fd1758e9..40eeb21781a 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -22,8 +22,4 @@ LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src include $(topsrcdir)/config/config.mk -CPPSRCS = \ - nsHapticFeedback.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/dom/system/windows/moz.build b/dom/system/windows/moz.build index f0a612a32de..7da139c862b 100644 --- a/dom/system/windows/moz.build +++ b/dom/system/windows/moz.build @@ -6,3 +6,7 @@ MODULE = 'dom' +CPP_SOURCES += [ + 'nsHapticFeedback.cpp', +] + diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index 88c1d320420..c5f13397153 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -16,10 +16,5 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - Telephony.cpp \ - TelephonyCall.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build index ba87b9500e5..c866f4f0f2a 100644 --- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -22,3 +22,8 @@ XPIDL_FLAGS += [ MODULE = 'dom' +CPP_SOURCES += [ + 'Telephony.cpp', + 'TelephonyCall.cpp', +] + diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 073ddaec4b0..07cf3a2e21c 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -16,13 +16,6 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - TimeManager.cpp \ - TimeService.cpp \ - TimeChangeObserver.cpp \ - DateCacheCleaner.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/time/moz.build b/dom/time/moz.build index ea49b9bbf4a..3a9d1092294 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -20,3 +20,10 @@ EXPORTS.mozilla.dom.time += [ 'TimeService.h', ] +CPP_SOURCES += [ + 'DateCacheCleaner.cpp', + 'TimeChangeObserver.cpp', + 'TimeManager.cpp', + 'TimeService.cpp', +] + diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in index fb70e1b1182..dbd90461c92 100644 --- a/dom/voicemail/Makefile.in +++ b/dom/voicemail/Makefile.in @@ -16,9 +16,5 @@ FAIL_ON_WARNINGS := 1 include $(topsrcdir)/dom/dom-config.mk -CPPSRCS = \ - Voicemail.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build index ab110e26c32..5479de46e61 100644 --- a/dom/voicemail/moz.build +++ b/dom/voicemail/moz.build @@ -26,3 +26,7 @@ EXPORTS.mozilla.dom += [ 'Voicemail.h', ] +CPP_SOURCES += [ + 'Voicemail.cpp', +] + diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index 9b85f4dfafd..a930b951e97 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -15,32 +15,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - ChromeWorkerScope.cpp \ - DOMBindingBase.cpp \ - Events.cpp \ - EventListenerManager.cpp \ - EventTarget.cpp \ - Exceptions.cpp \ - File.cpp \ - FileReaderSync.cpp \ - ImageData.cpp \ - Location.cpp \ - Navigator.cpp \ - Principal.cpp \ - RuntimeService.cpp \ - ScriptLoader.cpp \ - URL.cpp \ - TextDecoder.cpp \ - TextEncoder.cpp \ - Worker.cpp \ - WorkerPrivate.cpp \ - WorkerScope.cpp \ - XMLHttpRequestEventTarget.cpp \ - XMLHttpRequestUpload.cpp \ - XMLHttpRequest.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/workers/moz.build b/dom/workers/moz.build index b81da84e632..e0e208703c3 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -28,3 +28,29 @@ EXPORTS.mozilla.dom.workers.bindings += [ 'XMLHttpRequestUpload.h', ] +CPP_SOURCES += [ + 'ChromeWorkerScope.cpp', + 'DOMBindingBase.cpp', + 'EventListenerManager.cpp', + 'EventTarget.cpp', + 'Events.cpp', + 'Exceptions.cpp', + 'File.cpp', + 'FileReaderSync.cpp', + 'ImageData.cpp', + 'Location.cpp', + 'Navigator.cpp', + 'Principal.cpp', + 'RuntimeService.cpp', + 'ScriptLoader.cpp', + 'TextDecoder.cpp', + 'TextEncoder.cpp', + 'URL.cpp', + 'Worker.cpp', + 'WorkerPrivate.cpp', + 'WorkerScope.cpp', + 'XMLHttpRequest.cpp', + 'XMLHttpRequestEventTarget.cpp', + 'XMLHttpRequestUpload.cpp', +] + diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in index 51ca7a21572..42a2ab00171 100644 --- a/editor/composer/src/Makefile.in +++ b/editor/composer/src/Makefile.in @@ -18,17 +18,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsComposeTxtSrvFilter.cpp \ - nsComposerController.cpp \ - nsComposerCommands.cpp \ - nsComposerDocumentCommands.cpp \ - nsComposerRegistration.cpp \ - nsEditingSession.cpp \ - nsComposerCommandsUpdater.cpp \ - nsEditorSpellCheck.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build index 30c2d06042f..15d2fa91acf 100644 --- a/editor/composer/src/moz.build +++ b/editor/composer/src/moz.build @@ -6,3 +6,14 @@ MODULE = 'editor' +CPP_SOURCES += [ + 'nsComposeTxtSrvFilter.cpp', + 'nsComposerCommands.cpp', + 'nsComposerCommandsUpdater.cpp', + 'nsComposerController.cpp', + 'nsComposerDocumentCommands.cpp', + 'nsComposerRegistration.cpp', + 'nsEditingSession.cpp', + 'nsEditorSpellCheck.cpp', +] + diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 61b67f357d3..adb66231a0d 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -18,36 +18,6 @@ FAIL_ON_WARNINGS = 1 # Internal header files, needed by other editor sublibs: INTERNAL_HDR_DIR = ../internal -CPPSRCS = \ - nsEditor.cpp \ - nsEditorCommands.cpp \ - nsEditorController.cpp \ - nsEditorEventListener.cpp \ - nsEditorUtils.cpp \ - nsSelectionState.cpp \ - $(NULL) - -# Transactions: we'd like to split these off, -# but currently they and nsEditor are too intertwined! -CPPSRCS += \ - EditTxn.cpp \ - PlaceholderTxn.cpp \ - ChangeAttributeTxn.cpp \ - ChangeCSSInlineStyleTxn.cpp \ - CreateElementTxn.cpp \ - DeleteNodeTxn.cpp \ - DeleteRangeTxn.cpp \ - DeleteTextTxn.cpp \ - EditAggregateTxn.cpp \ - IMETextTxn.cpp \ - InsertElementTxn.cpp \ - InsertTextTxn.cpp \ - JoinElementTxn.cpp \ - SetDocTitleTxn.cpp \ - SplitElementTxn.cpp \ - nsStyleSheetTxns.cpp \ - $(NULL) - # don't want the shared lib; force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/editor/libeditor/base/moz.build b/editor/libeditor/base/moz.build index 962b074b01b..5f88eeafc1c 100644 --- a/editor/libeditor/base/moz.build +++ b/editor/libeditor/base/moz.build @@ -8,3 +8,28 @@ TEST_DIRS += ['tests'] MODULE = 'editor' +CPP_SOURCES += [ + 'ChangeAttributeTxn.cpp', + 'ChangeCSSInlineStyleTxn.cpp', + 'CreateElementTxn.cpp', + 'DeleteNodeTxn.cpp', + 'DeleteRangeTxn.cpp', + 'DeleteTextTxn.cpp', + 'EditAggregateTxn.cpp', + 'EditTxn.cpp', + 'IMETextTxn.cpp', + 'InsertElementTxn.cpp', + 'InsertTextTxn.cpp', + 'JoinElementTxn.cpp', + 'PlaceholderTxn.cpp', + 'SetDocTitleTxn.cpp', + 'SplitElementTxn.cpp', + 'nsEditor.cpp', + 'nsEditorCommands.cpp', + 'nsEditorController.cpp', + 'nsEditorEventListener.cpp', + 'nsEditorUtils.cpp', + 'nsSelectionState.cpp', + 'nsStyleSheetTxns.cpp', +] + diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index 2545fc64600..49a73eb688c 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -17,30 +17,7 @@ LIBXUL_LIBRARY = 1 # Building the full blown HTML Editor so add its source files and objects: -CPPSRCS = \ - nsEditProperty.cpp \ - nsHTMLAbsPosition.cpp \ - nsHTMLAnonymousUtils.cpp \ - nsHTMLDataTransfer.cpp \ - nsHTMLCSSUtils.cpp \ - nsHTMLEditor.cpp \ - nsHTMLEditorStyle.cpp \ - nsHTMLEditRules.cpp \ - nsHTMLEditUtils.cpp \ - nsHTMLObjectResizer.cpp \ - nsHTMLEditorEventListener.cpp \ - nsHTMLInlineTableEditor.cpp \ - nsHTMLURIRefObject.cpp \ - nsTableEditor.cpp \ - nsWSRunObject.cpp \ - TypeInState.cpp \ - TextEditorTest.cpp \ - $(NULL) - ifdef ENABLE_EDITOR_API_LOG -CPPSRCS += nsEditorTxnLog.cpp \ - $(NULL) - DEFINES += -DENABLE_EDITOR_API_LOG endif diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build index 962b074b01b..f94bd7511ee 100644 --- a/editor/libeditor/html/moz.build +++ b/editor/libeditor/html/moz.build @@ -8,3 +8,27 @@ TEST_DIRS += ['tests'] MODULE = 'editor' +CPP_SOURCES += [ + 'TextEditorTest.cpp', + 'TypeInState.cpp', + 'nsEditProperty.cpp', + 'nsHTMLAbsPosition.cpp', + 'nsHTMLAnonymousUtils.cpp', + 'nsHTMLCSSUtils.cpp', + 'nsHTMLDataTransfer.cpp', + 'nsHTMLEditRules.cpp', + 'nsHTMLEditUtils.cpp', + 'nsHTMLEditor.cpp', + 'nsHTMLEditorEventListener.cpp', + 'nsHTMLEditorStyle.cpp', + 'nsHTMLInlineTableEditor.cpp', + 'nsHTMLObjectResizer.cpp', + 'nsHTMLURIRefObject.cpp', + 'nsTableEditor.cpp', + 'nsWSRunObject.cpp', +] + +if CONFIG['ENABLE_EDITOR_API_LOG']: + CPP_SOURCES += [ + 'nsEditorTxnLog.cpp', + ] diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index cbb08591eac..746a4fa40e7 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -14,16 +14,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = texteditor_s LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsPlaintextDataTransfer.cpp \ - nsPlaintextEditor.cpp \ - nsTextEditUtils.cpp \ - nsTextEditRules.cpp \ - nsInternetCiter.cpp \ - nsTextEditRulesBidi.cpp \ - $(NULL) - # don't want the shared lib; force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build index 962b074b01b..2a005715088 100644 --- a/editor/libeditor/text/moz.build +++ b/editor/libeditor/text/moz.build @@ -8,3 +8,12 @@ TEST_DIRS += ['tests'] MODULE = 'editor' +CPP_SOURCES += [ + 'nsInternetCiter.cpp', + 'nsPlaintextDataTransfer.cpp', + 'nsPlaintextEditor.cpp', + 'nsTextEditRules.cpp', + 'nsTextEditRulesBidi.cpp', + 'nsTextEditUtils.cpp', +] + diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in index 4d0715cfd25..44804d1c8d1 100644 --- a/editor/txmgr/src/Makefile.in +++ b/editor/txmgr/src/Makefile.in @@ -18,13 +18,5 @@ MODULE_NAME = nsTransactionManagerModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsTransactionItem.cpp \ - nsTransactionList.cpp \ - nsTransactionManager.cpp \ - nsTransactionManagerFactory.cpp \ - nsTransactionStack.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/editor/txmgr/src/moz.build b/editor/txmgr/src/moz.build index 719d60c80a7..39e2636ca01 100644 --- a/editor/txmgr/src/moz.build +++ b/editor/txmgr/src/moz.build @@ -6,3 +6,11 @@ MODULE = 'txmgr' +CPP_SOURCES += [ + 'nsTransactionItem.cpp', + 'nsTransactionList.cpp', + 'nsTransactionManager.cpp', + 'nsTransactionManagerFactory.cpp', + 'nsTransactionStack.cpp', +] + diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in index 662ca026b21..c369909059c 100644 --- a/editor/txtsvc/src/Makefile.in +++ b/editor/txtsvc/src/Makefile.in @@ -17,10 +17,5 @@ MODULE_NAME = nsTextServicesModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsFilteredContentIterator.cpp \ - nsTextServicesDocument.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/editor/txtsvc/src/moz.build b/editor/txtsvc/src/moz.build index 09737ef8092..954e63ac0f1 100644 --- a/editor/txtsvc/src/moz.build +++ b/editor/txtsvc/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'txtsvc' +CPP_SOURCES += [ + 'nsFilteredContentIterator.cpp', + 'nsTextServicesDocument.cpp', +] + diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in index 18c4bbe01cc..50aeb595eb6 100644 --- a/embedding/browser/build/Makefile.in +++ b/embedding/browser/build/Makefile.in @@ -17,10 +17,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsWebBrowserModule.cpp \ - $(NULL) - SHARED_LIBRARY_LIBS= \ ../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/embedding/browser/build/moz.build b/embedding/browser/build/moz.build index 97d3edbfbc8..d24a57e3722 100644 --- a/embedding/browser/build/moz.build +++ b/embedding/browser/build/moz.build @@ -6,3 +6,7 @@ MODULE = 'webbrwsr' +CPP_SOURCES += [ + 'nsWebBrowserModule.cpp', +] + diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index ea58a7623da..c27ad867c4d 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -20,15 +20,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../../content/svg/content/src \ $(NULL) -CPPSRCS = \ - nsDocShellTreeOwner.cpp \ - nsWebBrowser.cpp \ - nsCommandHandler.cpp \ - nsWebBrowserContentPolicy.cpp \ - nsContextMenuInfo.cpp \ - nsEmbedStream.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build index 724612ff879..7a56c0ebdf8 100644 --- a/embedding/browser/webBrowser/moz.build +++ b/embedding/browser/webBrowser/moz.build @@ -37,3 +37,12 @@ EXPORTS += [ 'nsCTooltipTextProvider.h', ] +CPP_SOURCES += [ + 'nsCommandHandler.cpp', + 'nsContextMenuInfo.cpp', + 'nsDocShellTreeOwner.cpp', + 'nsEmbedStream.cpp', + 'nsWebBrowser.cpp', + 'nsWebBrowserContentPolicy.cpp', +] + diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in index 7690674cbfd..6b5b8eda2fd 100644 --- a/embedding/components/appstartup/src/Makefile.in +++ b/embedding/components/appstartup/src/Makefile.in @@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = appstartupnotifier_s LIBXUL_LIBRARY = 1 - -CPPSRCS = nsAppStartupNotifier.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build index c8e55961bc3..4fdb5e4ff2b 100644 --- a/embedding/components/appstartup/src/moz.build +++ b/embedding/components/appstartup/src/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'nsIAppStartupNotifier.h', ] +CPP_SOURCES += [ + 'nsAppStartupNotifier.cpp', +] + diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in index 74466654add..2b14d5ab038 100644 --- a/embedding/components/build/Makefile.in +++ b/embedding/components/build/Makefile.in @@ -15,8 +15,6 @@ IS_COMPONENT = 1 MODULE_NAME = embedcomponents LIBXUL_LIBRARY = 1 -CPPSRCS = nsEmbeddingModule.cpp - SHARED_LIBRARY_LIBS = \ ../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \ ../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \ diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build index 8fef8ab8b5a..c2b7a20d032 100644 --- a/embedding/components/build/moz.build +++ b/embedding/components/build/moz.build @@ -6,3 +6,7 @@ MODULE = 'embedcomponents' +CPP_SOURCES += [ + 'nsEmbeddingModule.cpp', +] + diff --git a/embedding/components/commandhandler/src/Makefile.in b/embedding/components/commandhandler/src/Makefile.in index d41163aa467..25dae34e5ad 100644 --- a/embedding/components/commandhandler/src/Makefile.in +++ b/embedding/components/commandhandler/src/Makefile.in @@ -14,15 +14,6 @@ LIBRARY_NAME = commandhandler_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsBaseCommandController.cpp \ - nsCommandGroup.cpp \ - nsCommandManager.cpp \ - nsCommandParams.cpp \ - nsControllerCommandTable.cpp \ - $(NULL) - - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build index 0b984952283..4b79e0f894d 100644 --- a/embedding/components/commandhandler/src/moz.build +++ b/embedding/components/commandhandler/src/moz.build @@ -6,3 +6,11 @@ MODULE = 'commandhandler' +CPP_SOURCES += [ + 'nsBaseCommandController.cpp', + 'nsCommandGroup.cpp', + 'nsCommandManager.cpp', + 'nsCommandParams.cpp', + 'nsControllerCommandTable.cpp', +] + diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in index 239c6f9a98b..7212d2ab401 100644 --- a/embedding/components/find/src/Makefile.in +++ b/embedding/components/find/src/Makefile.in @@ -14,11 +14,6 @@ LIBRARY_NAME = find_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - -CPPSRCS = nsWebBrowserFind.cpp \ - nsFind.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build index 5d25e992869..1384a00f10d 100644 --- a/embedding/components/find/src/moz.build +++ b/embedding/components/find/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'find' +CPP_SOURCES += [ + 'nsFind.cpp', + 'nsWebBrowserFind.cpp', +] + diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index 5c702022b2c..3640abf0c07 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -18,11 +18,6 @@ LIBXUL_LIBRARY = 1 CMMSRCS = nsPrintingPromptServiceX.mm -CPPSRCS = \ - nsPrintProgressParams.cpp \ - nsPrintProgress.cpp \ - $(NULL) - LOCAL_INCLUDES = \ $(NULL) diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build index 8fef8ab8b5a..d5c63866f00 100644 --- a/embedding/components/printingui/src/mac/moz.build +++ b/embedding/components/printingui/src/mac/moz.build @@ -6,3 +6,8 @@ MODULE = 'embedcomponents' +CPP_SOURCES += [ + 'nsPrintProgress.cpp', + 'nsPrintProgressParams.cpp', +] + diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in index 77591d14e33..4e01ff3b727 100644 --- a/embedding/components/printingui/src/os2/Makefile.in +++ b/embedding/components/printingui/src/os2/Makefile.in @@ -14,13 +14,6 @@ LIBRARY_NAME = printingui_s EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsPrintingPromptService.cpp \ - nsPrintProgressParams.cpp \ - nsPrintProgress.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/printingui/src/os2/moz.build b/embedding/components/printingui/src/os2/moz.build index 8fef8ab8b5a..e083b013a64 100644 --- a/embedding/components/printingui/src/os2/moz.build +++ b/embedding/components/printingui/src/os2/moz.build @@ -6,3 +6,9 @@ MODULE = 'embedcomponents' +CPP_SOURCES += [ + 'nsPrintProgress.cpp', + 'nsPrintProgressParams.cpp', + 'nsPrintingPromptService.cpp', +] + diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in index 77591d14e33..4e01ff3b727 100644 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ b/embedding/components/printingui/src/unixshared/Makefile.in @@ -14,13 +14,6 @@ LIBRARY_NAME = printingui_s EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsPrintingPromptService.cpp \ - nsPrintProgressParams.cpp \ - nsPrintProgress.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build index 8fef8ab8b5a..e083b013a64 100644 --- a/embedding/components/printingui/src/unixshared/moz.build +++ b/embedding/components/printingui/src/unixshared/moz.build @@ -6,3 +6,9 @@ MODULE = 'embedcomponents' +CPP_SOURCES += [ + 'nsPrintProgress.cpp', + 'nsPrintProgressParams.cpp', + 'nsPrintingPromptService.cpp', +] + diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in index 0a65678788e..4e01ff3b727 100644 --- a/embedding/components/printingui/src/win/Makefile.in +++ b/embedding/components/printingui/src/win/Makefile.in @@ -14,14 +14,6 @@ LIBRARY_NAME = printingui_s EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsPrintingPromptService.cpp \ - nsPrintProgressParams.cpp \ - nsPrintProgress.cpp \ - nsPrintDialogUtil.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build index 8fef8ab8b5a..aa8eae1c078 100644 --- a/embedding/components/printingui/src/win/moz.build +++ b/embedding/components/printingui/src/win/moz.build @@ -6,3 +6,10 @@ MODULE = 'embedcomponents' +CPP_SOURCES += [ + 'nsPrintDialogUtil.cpp', + 'nsPrintProgress.cpp', + 'nsPrintProgressParams.cpp', + 'nsPrintingPromptService.cpp', +] + diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in index a510a655ce4..3b82e82b1cc 100644 --- a/embedding/components/webbrowserpersist/src/Makefile.in +++ b/embedding/components/webbrowserpersist/src/Makefile.in @@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = webbrowserpersist_s LIBXUL_LIBRARY = 1 - -CPPSRCS = nsWebBrowserPersist.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/webbrowserpersist/src/moz.build b/embedding/components/webbrowserpersist/src/moz.build index 41883c6b1c0..12f7ab5b226 100644 --- a/embedding/components/webbrowserpersist/src/moz.build +++ b/embedding/components/webbrowserpersist/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'webbrowserpersist' +CPP_SOURCES += [ + 'nsWebBrowserPersist.cpp', +] + diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index 5389b50bb62..1f3bb30f1d6 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/embedding/components/windowwatcher/src/Makefile.in @@ -13,16 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = windowwatcher_s LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsWindowWatcher.cpp \ - nsAutoWindowStateHelper.cpp \ - $(NULL) - -ifdef MOZ_XUL -CPPSRCS += nsDialogParamBlock.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build index 8fef8ab8b5a..9fea7521a5c 100644 --- a/embedding/components/windowwatcher/src/moz.build +++ b/embedding/components/windowwatcher/src/moz.build @@ -6,3 +6,12 @@ MODULE = 'embedcomponents' +CPP_SOURCES += [ + 'nsAutoWindowStateHelper.cpp', + 'nsWindowWatcher.cpp', +] + +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'nsDialogParamBlock.cpp', + ] diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in index 5b3976dda95..17cc1c4f607 100644 --- a/embedding/tests/winEmbed/Makefile.in +++ b/embedding/tests/winEmbed/Makefile.in @@ -38,12 +38,6 @@ XPI_NAME = winembed RESFILE = winEmbed.res -CPPSRCS = \ - winEmbed.cpp \ - WebBrowserChrome.cpp \ - WindowCreator.cpp \ - $(NULL) - LIBS = \ $(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build index cf87423e7e3..82be7f714e1 100644 --- a/embedding/tests/winEmbed/moz.build +++ b/embedding/tests/winEmbed/moz.build @@ -8,3 +8,8 @@ MODULE = 'winEmbed' PROGRAM = 'winEmbed' +CPP_SOURCES += [ + 'WebBrowserChrome.cpp', + 'WindowCreator.cpp', + 'winEmbed.cpp', +] diff --git a/extensions/auth/Makefile.in b/extensions/auth/Makefile.in index fbf25fd7a32..8159d0faee9 100644 --- a/extensions/auth/Makefile.in +++ b/extensions/auth/Makefile.in @@ -17,18 +17,8 @@ MODULE_NAME = nsAuthModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsAuthFactory.cpp \ - nsHttpNegotiateAuth.cpp \ - nsAuthGSSAPI.cpp \ - nsAuthSASL.cpp \ - $(NULL) - ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += -DUSE_SSPI -CPPSRCS += nsAuthSSPI.cpp -else -CPPSRCS += nsAuthSambaNTLM.cpp endif include $(topsrcdir)/config/rules.mk diff --git a/extensions/auth/moz.build b/extensions/auth/moz.build index 12756ff0bbb..e3598896363 100644 --- a/extensions/auth/moz.build +++ b/extensions/auth/moz.build @@ -6,3 +6,18 @@ MODULE = 'auth' +CPP_SOURCES += [ + 'nsAuthFactory.cpp', + 'nsAuthGSSAPI.cpp', + 'nsAuthSASL.cpp', + 'nsHttpNegotiateAuth.cpp', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsAuthSSPI.cpp', + ] +else: + CPP_SOURCES += [ + 'nsAuthSambaNTLM.cpp', + ] diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index b416ff5efb0..deea3278284 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -18,15 +18,6 @@ MODULE_NAME = nsCookieModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCookieModule.cpp \ - nsPermission.cpp \ - nsPermissionManager.cpp \ - nsPopupWindowManager.cpp \ - nsCookiePromptService.cpp \ - nsCookiePermission.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/extensions/cookie/moz.build b/extensions/cookie/moz.build index b09286c6d45..fe4f120a29c 100644 --- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -13,3 +13,12 @@ XPIDL_SOURCES += [ MODULE = 'cookie' +CPP_SOURCES += [ + 'nsCookieModule.cpp', + 'nsCookiePermission.cpp', + 'nsCookiePromptService.cpp', + 'nsPermission.cpp', + 'nsPermissionManager.cpp', + 'nsPopupWindowManager.cpp', +] + diff --git a/extensions/gio/Makefile.in b/extensions/gio/Makefile.in index b24381295f1..c32a7566641 100644 --- a/extensions/gio/Makefile.in +++ b/extensions/gio/Makefile.in @@ -17,10 +17,6 @@ MODULE_NAME = nsGIOModule LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsGIOProtocolHandler.cpp \ - $(NULL) - LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) include $(topsrcdir)/config/rules.mk diff --git a/extensions/gio/moz.build b/extensions/gio/moz.build index cc8644705f3..c72ac49b8d8 100644 --- a/extensions/gio/moz.build +++ b/extensions/gio/moz.build @@ -6,3 +6,7 @@ MODULE = 'nkgio' +CPP_SOURCES += [ + 'nsGIOProtocolHandler.cpp', +] + diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in index 674b4a3b049..a9fa4afe2dd 100644 --- a/extensions/gnomevfs/Makefile.in +++ b/extensions/gnomevfs/Makefile.in @@ -15,10 +15,6 @@ SHORT_LIBNAME = nkgnomevfs IS_COMPONENT = 1 -CPPSRCS = \ - nsGnomeVFSProtocolHandler.cpp \ - $(NULL) - LOCAL_INCLUDES = $(MOZ_GNOMEVFS_CFLAGS) EXTRA_DSO_LDOPTS = \ diff --git a/extensions/gnomevfs/moz.build b/extensions/gnomevfs/moz.build index f8bf4f0325a..10cef0538c8 100644 --- a/extensions/gnomevfs/moz.build +++ b/extensions/gnomevfs/moz.build @@ -6,3 +6,7 @@ MODULE = 'nkgnomevfs' +CPP_SOURCES += [ + 'nsGnomeVFSProtocolHandler.cpp', +] + diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in index 6f38a96947a..ae2c1b8d483 100644 --- a/extensions/permissions/Makefile.in +++ b/extensions/permissions/Makefile.in @@ -16,9 +16,4 @@ MODULE_NAME = nsPermissionsModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsModuleFactory.cpp \ - nsContentBlocker.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/extensions/permissions/moz.build b/extensions/permissions/moz.build index c4655c434cf..281571abcb6 100644 --- a/extensions/permissions/moz.build +++ b/extensions/permissions/moz.build @@ -6,3 +6,8 @@ MODULE = 'permissions' +CPP_SOURCES += [ + 'nsContentBlocker.cpp', + 'nsModuleFactory.cpp', +] + diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in index 0bd2d3da37a..9b42df9697e 100644 --- a/extensions/pref/autoconfig/src/Makefile.in +++ b/extensions/pref/autoconfig/src/Makefile.in @@ -18,12 +18,6 @@ LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/config.mk -CPPSRCS = nsReadConfig.cpp \ - nsAutoConfig.cpp \ - nsConfigFactory.cpp \ - nsJSConfigTriggers.cpp \ - $(NULL) - AUTOCFG_JS_EXPORTS = \ $(srcdir)/prefcalls.js \ $(NULL) diff --git a/extensions/pref/autoconfig/src/moz.build b/extensions/pref/autoconfig/src/moz.build index 0ca7771b567..c6711d2c7e5 100644 --- a/extensions/pref/autoconfig/src/moz.build +++ b/extensions/pref/autoconfig/src/moz.build @@ -6,3 +6,10 @@ MODULE = 'autoconfig' +CPP_SOURCES += [ + 'nsAutoConfig.cpp', + 'nsConfigFactory.cpp', + 'nsJSConfigTriggers.cpp', + 'nsReadConfig.cpp', +] + diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in index a43f192621e..3d73fb7b25f 100644 --- a/extensions/spellcheck/hunspell/src/Makefile.in +++ b/extensions/spellcheck/hunspell/src/Makefile.in @@ -14,24 +14,7 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = mozHunspell.cpp \ - mozHunspellDirProvider.cpp \ - $(NULL) - ifndef MOZ_NATIVE_HUNSPELL -CPPSRCS += affentry.cpp \ - affixmgr.cpp \ - csutil.cpp \ - dictmgr.cpp \ - filemgr.cpp \ - hashmgr.cpp \ - hunspell.cpp \ - hunzip.cpp \ - phonet.cpp \ - replist.cpp \ - suggestmgr.cpp \ - $(NULL) - # This variable is referenced in configure.in. Make sure to change that file # too if you need to change this variable. DEFINES = -DHUNSPELL_STATIC diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build index 4969aef507f..aeab75f45ff 100644 --- a/extensions/spellcheck/hunspell/src/moz.build +++ b/extensions/spellcheck/hunspell/src/moz.build @@ -6,3 +6,22 @@ MODULE = 'hunspell' +CPP_SOURCES += [ + 'mozHunspell.cpp', + 'mozHunspellDirProvider.cpp', +] + +if not CONFIG['MOZ_NATIVE_HUNSPELL']: + CPP_SOURCES += [ + 'affentry.cpp', + 'affixmgr.cpp', + 'csutil.cpp', + 'dictmgr.cpp', + 'filemgr.cpp', + 'hashmgr.cpp', + 'hunspell.cpp', + 'hunzip.cpp', + 'phonet.cpp', + 'replist.cpp', + 'suggestmgr.cpp', + ] diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in index 42ce9814b61..b26ce34c3a5 100644 --- a/extensions/spellcheck/src/Makefile.in +++ b/extensions/spellcheck/src/Makefile.in @@ -16,17 +16,6 @@ IS_COMPONENT = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - mozSpellCheckerFactory.cpp \ - mozSpellChecker.cpp \ - mozPersonalDictionary.cpp \ - mozEnglishWordUtils.cpp \ - mozGenericWordUtils.cpp \ - mozSpellI18NManager.cpp \ - mozInlineSpellChecker.cpp \ - mozInlineSpellWordUtil.cpp \ - $(NULL) - SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) include $(topsrcdir)/config/rules.mk diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build index fb02c3b752b..ce5a3c6c37a 100644 --- a/extensions/spellcheck/src/moz.build +++ b/extensions/spellcheck/src/moz.build @@ -6,3 +6,14 @@ MODULE = 'spellchecker' +CPP_SOURCES += [ + 'mozEnglishWordUtils.cpp', + 'mozGenericWordUtils.cpp', + 'mozInlineSpellChecker.cpp', + 'mozInlineSpellWordUtil.cpp', + 'mozPersonalDictionary.cpp', + 'mozSpellChecker.cpp', + 'mozSpellCheckerFactory.cpp', + 'mozSpellI18NManager.cpp', +] + diff --git a/extensions/universalchardet/src/base/Makefile.in b/extensions/universalchardet/src/base/Makefile.in index 572346901aa..bacac93b7b2 100644 --- a/extensions/universalchardet/src/base/Makefile.in +++ b/extensions/universalchardet/src/base/Makefile.in @@ -12,34 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = universalchardet_s -CPPSRCS = \ - CharDistribution.cpp \ - JpCntx.cpp \ - LangBulgarianModel.cpp \ - LangCyrillicModel.cpp \ - LangGreekModel.cpp \ - LangHungarianModel.cpp \ - LangHebrewModel.cpp \ - LangThaiModel.cpp \ - nsHebrewProber.cpp \ - nsCharSetProber.cpp \ - nsBig5Prober.cpp \ - nsEUCJPProber.cpp \ - nsEUCKRProber.cpp \ - nsEUCTWProber.cpp \ - nsEscCharsetProber.cpp \ - nsEscSM.cpp \ - nsGB2312Prober.cpp \ - nsMBCSGroupProber.cpp \ - nsMBCSSM.cpp \ - nsSBCSGroupProber.cpp \ - nsSBCharSetProber.cpp \ - nsSJISProber.cpp \ - nsUTF8Prober.cpp \ - nsLatin1Prober.cpp \ - nsUniversalDetector.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 diff --git a/extensions/universalchardet/src/base/moz.build b/extensions/universalchardet/src/base/moz.build index c15977857b6..57d3f30c569 100644 --- a/extensions/universalchardet/src/base/moz.build +++ b/extensions/universalchardet/src/base/moz.build @@ -6,3 +6,31 @@ MODULE = 'universalchardet_s' +CPP_SOURCES += [ + 'CharDistribution.cpp', + 'JpCntx.cpp', + 'LangBulgarianModel.cpp', + 'LangCyrillicModel.cpp', + 'LangGreekModel.cpp', + 'LangHebrewModel.cpp', + 'LangHungarianModel.cpp', + 'LangThaiModel.cpp', + 'nsBig5Prober.cpp', + 'nsCharSetProber.cpp', + 'nsEUCJPProber.cpp', + 'nsEUCKRProber.cpp', + 'nsEUCTWProber.cpp', + 'nsEscCharsetProber.cpp', + 'nsEscSM.cpp', + 'nsGB2312Prober.cpp', + 'nsHebrewProber.cpp', + 'nsLatin1Prober.cpp', + 'nsMBCSGroupProber.cpp', + 'nsMBCSSM.cpp', + 'nsSBCSGroupProber.cpp', + 'nsSBCharSetProber.cpp', + 'nsSJISProber.cpp', + 'nsUTF8Prober.cpp', + 'nsUniversalDetector.cpp', +] + diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in index 9a47600ff74..0074a48c80b 100644 --- a/extensions/universalchardet/src/xpcom/Makefile.in +++ b/extensions/universalchardet/src/xpcom/Makefile.in @@ -16,11 +16,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsUniversalCharDetModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsUniversalCharDetModule.cpp \ - nsUdetXPCOMWrapper.cpp \ - $(NULL) - LOCAL_INCLUDES = -I$(srcdir)/../base SHARED_LIBRARY_LIBS = \ diff --git a/extensions/universalchardet/src/xpcom/moz.build b/extensions/universalchardet/src/xpcom/moz.build index 65d19b1f033..bd56359a56a 100644 --- a/extensions/universalchardet/src/xpcom/moz.build +++ b/extensions/universalchardet/src/xpcom/moz.build @@ -6,3 +6,8 @@ MODULE = 'universalchardet' +CPP_SOURCES += [ + 'nsUdetXPCOMWrapper.cpp', + 'nsUniversalCharDetModule.cpp', +] + diff --git a/extensions/widgetutils/src/Makefile.in b/extensions/widgetutils/src/Makefile.in index 2a090d63840..b10aae0bc6e 100644 --- a/extensions/widgetutils/src/Makefile.in +++ b/extensions/widgetutils/src/Makefile.in @@ -16,8 +16,6 @@ SHORT_LIBNAME = widgetutils FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 -CPPSRCS = nsWidgetUtils.cpp - EXTRA_DSO_LDOPTS = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ diff --git a/extensions/widgetutils/src/moz.build b/extensions/widgetutils/src/moz.build index e5a9fbd8dd8..6031e2e28aa 100644 --- a/extensions/widgetutils/src/moz.build +++ b/extensions/widgetutils/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'widgetutils' +CPP_SOURCES += [ + 'nsWidgetUtils.cpp', +] + diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in index 6001b89217b..25b821ac268 100644 --- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -15,25 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS = \ - Factory.cpp \ - Rect.cpp \ - Matrix.cpp \ - DrawTargetCairo.cpp \ - SourceSurfaceCairo.cpp \ - PathCairo.cpp \ - DrawTargetRecording.cpp \ - PathRecording.cpp \ - RecordedEvent.cpp \ - DrawEventRecorder.cpp \ - Blur.cpp \ - Scale.cpp \ - ScaledFontBase.cpp \ - DrawTargetDual.cpp \ - ImageScaling.cpp \ - SourceSurfaceRawData.cpp \ - $(NULL) - GTEST_CPPSRCS = \ GTestMain.cpp \ TestBase.cpp \ @@ -43,12 +24,6 @@ GTEST_CPPSRCS = \ $(NULL) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - SourceSurfaceCG.cpp \ - DrawTargetCG.cpp \ - PathCG.cpp \ - $(NULL) - CMMSRCS = \ QuartzSupport.mm \ $(NULL) @@ -56,27 +31,7 @@ endif DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL -ifdef MOZ_ENABLE_SKIA -CPPSRCS += \ - SourceSurfaceSkia.cpp \ - DrawTargetSkia.cpp \ - PathSkia.cpp \ - convolver.cpp \ - image_operations.cpp \ - $(NULL) -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - ScaledFontMac.cpp \ - $(NULL) - -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gonk qt)) -CPPSRCS += \ - ScaledFontFreetype.cpp \ - $(NULL) DEFINES += -DMOZ_ENABLE_FREETYPE endif @@ -90,28 +45,14 @@ endif ifneq (,$(INTEL_ARCHITECTURE)) # VC2005 doesn't support _mm_castsi128_ps, so SSE2 is turned off ifneq (1400,$(_MSC_VER)) -CPPSRCS += \ - ImageScalingSSE2.cpp \ - BlurSSE2.cpp \ - $(NULL) DEFINES += -DUSE_SSE2 endif endif ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += \ - DrawTargetD2D.cpp \ - SourceSurfaceD2D.cpp \ - SourceSurfaceD2DTarget.cpp \ - PathD2D.cpp \ - ScaledFontDWrite.cpp \ - $(NULL) DEFINES += -DWIN32 -DINITGUID ifdef MOZ_ENABLE_SKIA -CPPSRCS += \ - ScaledFontWin.cpp \ - $(NULL) DEFINES += -DSKIA_IMPLEMENTATION=1 -DGR_IMPLEMENTATION=1 endif endif @@ -124,16 +65,6 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk # changes the symbol names of exported C++ functions that use LOGFONT. DEFINES := $(filter-out -DUNICODE -D_UNICODE,$(DEFINES)) -#ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -#CPPSRCS += \ -# DrawTargetCG.cpp \ -# SourceSurfaceCG.cpp \ -# $(NULL) -# -## Always link with OpenGL/AGL -#EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit -framework QuartzCore -#endif - # The file uses SSE2 intrinsics, so it needs special compile flags on some # compilers. ifneq (,$(INTEL_ARCHITECTURE)) diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index 3f331a7eb1d..bdeb8bfe3b7 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -30,3 +30,64 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'MacIOSurface.h', 'QuartzSupport.h', ] + CPP_SOURCES += [ + 'SourceSurfaceCG.cpp', + 'DrawTargetCG.cpp', + 'PathCG.cpp', + 'ScaledFontMac.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'DrawTargetD2D.cpp', + 'SourceSurfaceD2D.cpp', + 'SourceSurfaceD2DTarget.cpp', + 'PathD2D.cpp', + 'ScaledFontDWrite.cpp', + ] + if CONFIG['MOZ_ENABLE_SKIA']: + CPP_SOURCES += [ + 'ScaledFontWin.cpp', + ] + +if CONFIG['MOZ_ENABLE_SKIA']: + CPP_SOURCES += [ + 'SourceSurfaceSkia.cpp', + 'DrawTargetSkia.cpp', + 'PathSkia.cpp', + 'convolver.cpp', + 'image_operations.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gonk', 'qt'): + CPP_SOURCES += [ + 'ScaledFontFreetype.cpp', + ] + +# Are we targeting x86 or x64? If so, build SSE2 files. +if CONFIG['INTEL_ARCHITECTURE']: + # VC2005 doesn't support _mm_castsi128_ps, so SSE2 is turned off + if CONFIG['_MSC_VER'] != '1400': + CPP_SOURCES += [ + 'ImageScalingSSE2.cpp', + 'BlurSSE2.cpp', + ] + +CPP_SOURCES += [ + 'Blur.cpp', + 'DrawEventRecorder.cpp', + 'DrawTargetCairo.cpp', + 'DrawTargetDual.cpp', + 'DrawTargetRecording.cpp', + 'Factory.cpp', + 'ImageScaling.cpp', + 'Matrix.cpp', + 'PathCairo.cpp', + 'PathRecording.cpp', + 'RecordedEvent.cpp', + 'Rect.cpp', + 'Scale.cpp', + 'ScaledFontBase.cpp', + 'SourceSurfaceCairo.cpp', + 'SourceSurfaceRawData.cpp', +] + diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index 5782e18d9a5..12ea39c0def 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -23,19 +23,6 @@ DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1 # Target: 'preprocessor' # src/compiler/preprocessor: VPATH += $(srcdir)/src/compiler/preprocessor -CPPSRCS += \ - DiagnosticsBase.cpp \ - DirectiveHandlerBase.cpp \ - DirectiveParser.cpp \ - ExpressionParser.cpp \ - Input.cpp \ - Lexer.cpp \ - Macro.cpp \ - MacroExpander.cpp \ - Preprocessor.cpp \ - Token.cpp \ - Tokenizer.cpp \ - $(NULL) # Target: 'translator_common' # Requires: 'preprocessor' @@ -47,85 +34,13 @@ LOCAL_INCLUDES += \ DEFINES += -DCOMPILER_IMPLEMENTATION VPATH += $(srcdir)/src/compiler -# src/compiler: -CPPSRCS += \ - BuiltInFunctionEmulator.cpp \ - Compiler.cpp \ - compiler_debug.cpp \ - DetectRecursion.cpp \ - Diagnostics.cpp \ - DirectiveHandler.cpp \ - ForLoopUnroll.cpp \ - glslang_lex.cpp \ - glslang_tab.cpp \ - InfoSink.cpp \ - Initialize.cpp \ - InitializeDll.cpp \ - InitializeParseContext.cpp \ - Intermediate.cpp \ - intermOut.cpp \ - IntermTraverse.cpp \ - MapLongVariableNames.cpp \ - parseConst.cpp \ - ParseHelper.cpp \ - PoolAlloc.cpp \ - QualifierAlive.cpp \ - RemoveTree.cpp \ - spooky.cpp \ - SymbolTable.cpp \ - util.cpp \ - ValidateLimitations.cpp \ - VariableInfo.cpp \ - VariablePacker.cpp \ - $(NULL) - VPATH += $(srcdir)/src/compiler/depgraph -# src/compiler/depgraph: -CPPSRCS += \ - DependencyGraph.cpp \ - DependencyGraphBuilder.cpp \ - DependencyGraphOutput.cpp \ - DependencyGraphTraverse.cpp \ - $(NULL) - VPATH += $(srcdir)/src/compiler/timing -# src/compiler/timing: -CPPSRCS += \ - RestrictFragmentShaderTiming.cpp \ - RestrictVertexShaderTiming.cpp \ - $(NULL) - VPATH += $(srcdir)/src/third_party/compiler -# src/third_party/compiler: -CPPSRCS += \ - ArrayBoundsClamper.cpp \ - $(NULL) - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += ossource_win.cpp -else -CPPSRCS += ossource_posix.cpp -endif - # Target: 'translator_glsl' # Requires: 'translator_common' # src/compiler: -CPPSRCS += \ - CodeGenGLSL.cpp \ - OutputESSL.cpp \ - OutputGLSLBase.cpp \ - OutputGLSL.cpp \ - ShaderLang.cpp \ - TranslatorESSL.cpp \ - TranslatorGLSL.cpp \ - VersionGLSL.cpp \ - $(NULL) - - -# End gpy translation. Remainder of targets are in src/libEGL/Makefile.in and -# src/libGLESv2/Makefile.in - ifdef MOZ_ANGLE_RENDERER libs:: diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build index 7774053f547..23321a66e15 100644 --- a/gfx/angle/moz.build +++ b/gfx/angle/moz.build @@ -15,3 +15,97 @@ EXPORTS.angle += [ 'include/KHR/khrplatform.h', ] +# WARNING: CPP_SOURCES seems very dependent on ordering. Grouping all of these +# CPP_SOURCES lines into one list may break webgl tests. + +# Target: 'preprocessor' +# src/compiler/preprocessor: +CPP_SOURCES += [ + 'DiagnosticsBase.cpp', + 'DirectiveHandlerBase.cpp', + 'DirectiveParser.cpp', + 'ExpressionParser.cpp', + 'Input.cpp', + 'Lexer.cpp', + 'Macro.cpp', + 'MacroExpander.cpp', + 'Preprocessor.cpp', + 'Token.cpp', + 'Tokenizer.cpp', +] + +# src/compiler: +CPP_SOURCES += [ + 'BuiltInFunctionEmulator.cpp', + 'Compiler.cpp', + 'compiler_debug.cpp', + 'DetectRecursion.cpp', + 'Diagnostics.cpp', + 'DirectiveHandler.cpp', + 'ForLoopUnroll.cpp', + 'glslang_lex.cpp', + 'glslang_tab.cpp', + 'InfoSink.cpp', + 'Initialize.cpp', + 'InitializeDll.cpp', + 'InitializeParseContext.cpp', + 'Intermediate.cpp', + 'intermOut.cpp', + 'IntermTraverse.cpp', + 'MapLongVariableNames.cpp', + 'parseConst.cpp', + 'ParseHelper.cpp', + 'PoolAlloc.cpp', + 'QualifierAlive.cpp', + 'RemoveTree.cpp', + 'spooky.cpp', + 'SymbolTable.cpp', + 'util.cpp', + 'ValidateLimitations.cpp', + 'VariableInfo.cpp', + 'VariablePacker.cpp', +] + +# src/compiler/depgraph: +CPP_SOURCES += [ + 'DependencyGraph.cpp', + 'DependencyGraphBuilder.cpp', + 'DependencyGraphOutput.cpp', + 'DependencyGraphTraverse.cpp', +] + +# src/compiler/timing: +CPP_SOURCES += [ + 'RestrictFragmentShaderTiming.cpp', + 'RestrictVertexShaderTiming.cpp', +] + +# src/third_party/compiler: +CPP_SOURCES += [ + 'ArrayBoundsClamper.cpp', +] + + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'ossource_win.cpp', + ] +else: + CPP_SOURCES += [ + 'ossource_posix.cpp', + ] + +# Target: 'translator_glsl' +# Requires: 'translator_common' +# src/compiler: +CPP_SOURCES += [ + 'CodeGenGLSL.cpp', + 'OutputESSL.cpp', + 'OutputGLSLBase.cpp', + 'OutputGLSL.cpp', + 'ShaderLang.cpp', + 'TranslatorESSL.cpp', + 'TranslatorGLSL.cpp', + 'VersionGLSL.cpp', +] + diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in index 2cb57fda618..5239ffa0666 100644 --- a/gfx/angle/src/libEGL/Makefile.in +++ b/gfx/angle/src/libEGL/Makefile.in @@ -52,21 +52,8 @@ LOCAL_INCLUDES = \ VPATH += $(srcdir)/../common # src/common: -CPPSRCS += \ - debug.cpp \ - RefCountObject.cpp \ - $(NULL) - VPATH += $(srcdir)/../libEGL # src/libEGL: -CPPSRCS += \ - Config.cpp \ - Display.cpp \ - libEGL.cpp \ - main.cpp \ - Surface.cpp \ - $(NULL) - DEFFILE = $(srcdir)/libEGL.def RCFILE = $(srcdir)/libEGL.rc diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build index a45561a3359..62e37168ac0 100644 --- a/gfx/angle/src/libEGL/moz.build +++ b/gfx/angle/src/libEGL/moz.build @@ -6,3 +6,13 @@ MODULE = 'libegl' +CPP_SOURCES += [ + 'Config.cpp', + 'Display.cpp', + 'RefCountObject.cpp', + 'Surface.cpp', + 'debug.cpp', + 'libEGL.cpp', + 'main.cpp', +] + diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in index b0a6b8ba66a..96558b8e58f 100644 --- a/gfx/angle/src/libGLESv2/Makefile.in +++ b/gfx/angle/src/libGLESv2/Makefile.in @@ -47,19 +47,6 @@ DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1 # Target: 'preprocessor' # src/compiler/preprocessor: VPATH += $(srcdir)/../compiler/preprocessor -CPPSRCS += \ - DiagnosticsBase.cpp \ - DirectiveHandlerBase.cpp \ - DirectiveParser.cpp \ - ExpressionParser.cpp \ - Input.cpp \ - Lexer.cpp \ - Macro.cpp \ - MacroExpander.cpp \ - Preprocessor.cpp \ - Token.cpp \ - Tokenizer.cpp \ - $(NULL) # Target: 'translator_common' # Requires: 'preprocessor' @@ -71,65 +58,9 @@ LOCAL_INCLUDES += \ DEFINES += -DCOMPILER_IMPLEMENTATION VPATH += $(srcdir)/../compiler -# src/compiler: -CPPSRCS += \ - BuiltInFunctionEmulator.cpp \ - Compiler.cpp \ - compiler_debug.cpp \ - DetectRecursion.cpp \ - Diagnostics.cpp \ - DirectiveHandler.cpp \ - ForLoopUnroll.cpp \ - glslang_lex.cpp \ - glslang_tab.cpp \ - InfoSink.cpp \ - Initialize.cpp \ - InitializeDll.cpp \ - InitializeParseContext.cpp \ - Intermediate.cpp \ - intermOut.cpp \ - IntermTraverse.cpp \ - MapLongVariableNames.cpp \ - parseConst.cpp \ - ParseHelper.cpp \ - PoolAlloc.cpp \ - QualifierAlive.cpp \ - RemoveTree.cpp \ - spooky.cpp \ - SymbolTable.cpp \ - util.cpp \ - ValidateLimitations.cpp \ - VariableInfo.cpp \ - VariablePacker.cpp \ - $(NULL) - VPATH += $(srcdir)/../compiler/depgraph -# src/compiler/depgraph: -CPPSRCS += \ - DependencyGraph.cpp \ - DependencyGraphBuilder.cpp \ - DependencyGraphOutput.cpp \ - DependencyGraphTraverse.cpp \ - $(NULL) - VPATH += $(srcdir)/../compiler/timing -# src/compiler/timing: -CPPSRCS += \ - RestrictFragmentShaderTiming.cpp \ - RestrictVertexShaderTiming.cpp \ - $(NULL) - VPATH += $(srcdir)/../third_party/compiler -# src/third_party/compiler: -CPPSRCS += \ - ArrayBoundsClamper.cpp \ - $(NULL) - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += ossource_win.cpp -else -CPPSRCS += ossource_posix.cpp -endif # Above should match the relevant targets from angle/Makefile.in. @@ -138,53 +69,12 @@ endif # Target: 'translator_hlsl' # Requires: 'translator_common' -# src/compiler: -CPPSRCS += \ - ShaderLang.cpp \ - DetectDiscontinuity.cpp \ - CodeGenHLSL.cpp \ - OutputHLSL.cpp \ - TranslatorHLSL.cpp \ - UnfoldShortCircuit.cpp \ - SearchSymbol.cpp \ - $(NULL) - # Target: 'libGLESv2' # Requires: 'translator_hlsl' LOCAL_INCLUDES += -I"$(MOZ_DIRECTX_SDK_PATH)/include" VPATH += $(srcdir)/../common # src/common: -CPPSRCS += \ - debug.cpp \ - RefCountObject.cpp \ - $(NULL) - -# src/libGLESv2: -CPPSRCS += \ - IndexDataManager.cpp \ - VertexDataManager.cpp \ - Blit.cpp \ - Buffer.cpp \ - Context.cpp \ - D3DConstantTable.cpp \ - Fence.cpp \ - Float16ToFloat32.cpp \ - Framebuffer.cpp \ - HandleAllocator.cpp \ - libGLESv2.cpp \ - main.cpp \ - Program.cpp \ - ProgramBinary.cpp \ - Query.cpp \ - Renderbuffer.cpp \ - ResourceManager.cpp \ - Shader.cpp \ - Texture.cpp \ - TextureSSE2.cpp \ - utilities.cpp \ - $(NULL) - DEFFILE = $(srcdir)/libGLESv2.def RCFILE = $(srcdir)/libGLESv2.rc diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build index 7ed47c13e11..bf392bfe622 100644 --- a/gfx/angle/src/libGLESv2/moz.build +++ b/gfx/angle/src/libGLESv2/moz.build @@ -6,3 +6,90 @@ MODULE = 'libglesv2' +CPP_SOURCES += [ + 'ArrayBoundsClamper.cpp', + 'Blit.cpp', + 'Buffer.cpp', + 'BuiltInFunctionEmulator.cpp', + 'CodeGenHLSL.cpp', + 'Compiler.cpp', + 'Context.cpp', + 'D3DConstantTable.cpp', + 'DependencyGraph.cpp', + 'DependencyGraphBuilder.cpp', + 'DependencyGraphOutput.cpp', + 'DependencyGraphTraverse.cpp', + 'DetectDiscontinuity.cpp', + 'DetectRecursion.cpp', + 'Diagnostics.cpp', + 'DiagnosticsBase.cpp', + 'DirectiveHandler.cpp', + 'DirectiveHandlerBase.cpp', + 'DirectiveParser.cpp', + 'ExpressionParser.cpp', + 'Fence.cpp', + 'Float16ToFloat32.cpp', + 'ForLoopUnroll.cpp', + 'Framebuffer.cpp', + 'HandleAllocator.cpp', + 'IndexDataManager.cpp', + 'InfoSink.cpp', + 'Initialize.cpp', + 'InitializeDll.cpp', + 'InitializeParseContext.cpp', + 'Input.cpp', + 'IntermTraverse.cpp', + 'Intermediate.cpp', + 'Lexer.cpp', + 'Macro.cpp', + 'MacroExpander.cpp', + 'MapLongVariableNames.cpp', + 'OutputHLSL.cpp', + 'ParseHelper.cpp', + 'PoolAlloc.cpp', + 'Preprocessor.cpp', + 'Program.cpp', + 'ProgramBinary.cpp', + 'QualifierAlive.cpp', + 'Query.cpp', + 'RefCountObject.cpp', + 'RemoveTree.cpp', + 'Renderbuffer.cpp', + 'ResourceManager.cpp', + 'RestrictFragmentShaderTiming.cpp', + 'RestrictVertexShaderTiming.cpp', + 'SearchSymbol.cpp', + 'Shader.cpp', + 'ShaderLang.cpp', + 'SymbolTable.cpp', + 'Texture.cpp', + 'TextureSSE2.cpp', + 'Token.cpp', + 'Tokenizer.cpp', + 'TranslatorHLSL.cpp', + 'UnfoldShortCircuit.cpp', + 'ValidateLimitations.cpp', + 'VariableInfo.cpp', + 'VariablePacker.cpp', + 'VertexDataManager.cpp', + 'compiler_debug.cpp', + 'debug.cpp', + 'glslang_lex.cpp', + 'glslang_tab.cpp', + 'intermOut.cpp', + 'libGLESv2.cpp', + 'main.cpp', + 'parseConst.cpp', + 'spooky.cpp', + 'util.cpp', + 'utilities.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'ossource_win.cpp' + ] +else: + CPP_SOURCES += [ + 'ossource_posix.cpp' + ] diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 0b70722f248..56882c9a85f 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -118,12 +118,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) DEFINES += -DDISABLE_SOME_FLOATING_POINT CSRCS += cairo-win32-surface.c -ifdef MOZ_ENABLE_DWRITE_FONT -CPPSRCS += cairo-dwrite-font.cpp -endif -ifdef MOZ_ENABLE_D2D_SURFACE -CPPSRCS += cairo-d2d-surface.cpp -endif CSRCS += cairo-win32-font.c ifdef NS_PRINTING @@ -148,10 +142,6 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) CSRCS += cairo-quartz-surface.c cairo-quartz-image-surface.c cairo-quartz-font.c endif -ifeq ($(MOZ_WIDGET_TOOLKIT),beos) -CPPSRCS += cairo-beos-surface.cpp -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) CSRCS += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) $(PS_CSRCS) endif @@ -161,7 +151,6 @@ CSRCS += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) endif ifeq ($(MOZ_WIDGET_TOOLKIT),qt) -CPPSRCS += cairo-qt-surface.cpp CSRCS += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) OS_INCLUDES += $(MOZ_QT_CFLAGS) endif diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index 9be74d3b53f..42421c3889b 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -23,6 +23,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'cairo-pdf.h', 'cairo-win32.h', ] + if CONFIG['MOZ_ENABLE_DWRITE_FONT']: + CPP_SOURCES += [ + 'cairo-dwrite-font.cpp', + ] + if CONFIG['MOZ_ENABLE_D2D_SURFACE']: + CPP_SOURCES += [ + 'cairo-d2d-surface.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': EXPORTS.cairo += [ 'cairo-os2.h', @@ -38,6 +46,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos': EXPORTS.cairo += [ 'cairo-beos.h', ] + CPP_SOURCES += [ + 'cairo-beos-surface.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': EXPORTS.cairo += [ 'cairo-pdf.h', @@ -52,6 +63,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': 'cairo-pdf.h', 'cairo-qt.h', ] + CPP_SOURCES += [ + 'cairo-qt-surface.cpp', + ] if CONFIG['BUILD_CAIRO_SVG']: EXPORTS.cairo += [ diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index acc6c588eba..5b66796782a 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -23,20 +23,8 @@ DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) endif endif -CPPSRCS = \ - GLContext.cpp \ - GLContextTypes.cpp \ - GLContextUtils.cpp \ - GLLibraryLoader.cpp \ - GLScreenBuffer.cpp \ - GLTextureImage.cpp \ - SharedSurface.cpp \ - SharedSurfaceEGL.cpp \ - SharedSurfaceGL.cpp \ - SurfaceFactory.cpp \ - SurfaceStream.cpp \ - $(NULL) - +# NOTE: Please keep GL_PROVIDER in sync with moz.build until all variables +# are moved over. GL_PROVIDER = Null ifeq ($(MOZ_WIDGET_TOOLKIT),windows) @@ -83,31 +71,12 @@ endif # Mac is a special snowflake ifeq ($(GL_PROVIDER),CGL) CMMSRCS += GLContextProvider$(GL_PROVIDER).mm -else -CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp -endif - -ifeq ($(GL_PROVIDER),EGL) -CPPSRCS += GLLibraryEGL.cpp -endif - -# Win32 is a special snowflake, for ANGLE -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += \ - GLContextProviderEGL.cpp \ - GLLibraryEGL.cpp \ - SharedSurfaceANGLE.cpp \ - $(NULL) endif ifdef MOZ_ANDROID_OMTC DEFINES += -DMOZ_ANDROID_OMTC endif -ifdef MOZ_ENABLE_SKIA_GPU -CPPSRCS += GLContextSkia.cpp -endif - include $(topsrcdir)/config/rules.mk DEFINES := $(filter-out -DUNICODE,$(DEFINES)) diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index 223986ae481..e8993809c3a 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -6,6 +6,35 @@ MODULE = 'gl' +# NOTE: Please keep gl_provider in sync with Makefile.in until all variables +# are moved over. +gl_provider = 'Null' + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + gl_provider = 'WGL' +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + gl_provider = 'CGL' +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + if CONFIG['fdef MOZ_PLATFORM_MAEMO']: + gl_provider = 'EGL' + else: + if CONFIG['MOZ_EGL_XRENDER_COMPOSITE']: + gl_provider = 'EGL' + else: + gl_provider = 'GLX' +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': + if CONFIG['fdef MOZ_PLATFORM_MAEMO']: + gl_provider = 'EGL' + else: + gl_provider = 'GLX' +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + gl_provider = 'EGL' +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + gl_provider = 'EGL' + +if CONFIG['MOZ_GL_PROVIDER']: + gl_provider = CONFIG['MOZ_GL_PROVIDER'] + EXPORTS += [ 'ForceDiscreteGPUHelperCGL.h', 'GLContext.h', @@ -28,10 +57,48 @@ EXPORTS += [ if CONFIG['MOZ_X11']: EXPORTS += ['GLXLibrary.h'] + +# Win32 is a special snowflake, for ANGLE if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ 'SharedSurfaceANGLE.h', 'WGLLibrary.h', ] + CPP_SOURCES += [ + 'GLContextProviderEGL.cpp', + 'GLLibraryEGL.cpp', + 'SharedSurfaceANGLE.cpp', + ] if CONFIG['MOZ_ENABLE_SKIA_GPU']: EXPORTS += ['GLContextSkia.h'] + CPP_SOURCES += [ + 'GLContextSkia.cpp', + ] + +if gl_provider == 'CGL': + # TODO: CMMSRCS + pass +else: + CPP_SOURCES += [ + 'GLContextProvider%s.cpp' % gl_provider, + ] + +if gl_provider == 'EGL': + CPP_SOURCES += [ + 'GLLibraryEGL.cpp', + ] + +CPP_SOURCES += [ + 'GLContext.cpp', + 'GLContextTypes.cpp', + 'GLContextUtils.cpp', + 'GLLibraryLoader.cpp', + 'GLScreenBuffer.cpp', + 'GLTextureImage.cpp', + 'SharedSurface.cpp', + 'SharedSurfaceEGL.cpp', + 'SharedSurfaceGL.cpp', + 'SurfaceFactory.cpp', + 'SurfaceStream.cpp', +] + diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in index 179824d83bb..105c43b397f 100644 --- a/gfx/graphite2/src/Makefile.in +++ b/gfx/graphite2/src/Makefile.in @@ -33,8 +33,6 @@ endif # MSVC doesn't like the paths in _SOURCES, so strip off the prefix # and leave bare filenames -CPPSRCS = $(subst $($(_NS)_BASE)/src/,,$(_SOURCES)) - FORCE_STATIC_LIB = 1 FORCE_USE_PIC = 1 diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index bd0e4f726cc..d102a5fd94f 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -14,3 +14,46 @@ EXPORTS.graphite2 += [ '../include/graphite2/Types.h', ] +if CONFIG['GNU_CC']: + CPP_SOURCES += [ + 'direct_machine.cpp' + ] +else: + CPP_SOURCES += [ + 'call_machine.cpp' + ] + +# This should contain all of the _SOURCES from files.mk, except *_machine.cpp +CPP_SOURCES += [ + 'gr_char_info.cpp', + 'gr_face.cpp', + 'gr_features.cpp', + 'gr_font.cpp', + 'gr_logging.cpp', + 'gr_segment.cpp', + 'gr_slot.cpp', + 'json.cpp', + 'Bidi.cpp', + 'CachedFace.cpp', + 'CmapCache.cpp', + 'Code.cpp', + 'Face.cpp', + 'FeatureMap.cpp', + 'FileFace.cpp', + 'Font.cpp', + 'GlyphCache.cpp', + 'GlyphFace.cpp', + 'Justifier.cpp', + 'NameTable.cpp', + 'Pass.cpp', + 'SegCache.cpp', + 'SegCacheEntry.cpp', + 'SegCacheStore.cpp', + 'Segment.cpp', + 'Silf.cpp', + 'Slot.cpp', + 'Sparse.cpp', + 'TtfUtil.cpp', + 'UtfCodec.cpp', +] + diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in index ab255c64c9a..f204065fe37 100644 --- a/gfx/harfbuzz/src/Makefile.in +++ b/gfx/harfbuzz/src/Makefile.in @@ -38,33 +38,6 @@ ifneq ($(OS_ARCH),WINNT) LIBXUL_LIBRARY = 1 endif -CPPSRCS = \ - hb-blob.cc \ - hb-buffer.cc \ - hb-common.cc \ - hb-fallback-shape.cc \ - hb-font.cc \ - hb-ot-layout.cc \ - hb-ot-map.cc \ - hb-ot-shape-complex-arabic.cc \ - hb-ot-shape-complex-default.cc \ - hb-ot-shape-complex-indic.cc \ - hb-ot-shape-complex-indic-table.cc \ - hb-ot-shape-complex-myanmar.cc \ - hb-ot-shape-complex-sea.cc \ - hb-ot-shape-complex-thai.cc \ - hb-ot-shape-fallback.cc \ - hb-ot-shape-normalize.cc \ - hb-ot-shape.cc \ - hb-ot-tag.cc \ - hb-set.cc \ - hb-shape.cc \ - hb-shape-plan.cc \ - hb-shaper.cc \ - hb-unicode.cc \ - hb-warning.cc \ - $(NULL) - LOCAL_INCLUDES += -I$(srcdir) FORCE_STATIC_LIB = 1 diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build index 9e4c9cbd30a..d9cf4ee1b8a 100644 --- a/gfx/harfbuzz/src/moz.build +++ b/gfx/harfbuzz/src/moz.build @@ -22,3 +22,30 @@ EXPORTS.harfbuzz += [ 'hb.h', ] +CPP_SOURCES += [ + 'hb-blob.cc', + 'hb-buffer.cc', + 'hb-common.cc', + 'hb-fallback-shape.cc', + 'hb-font.cc', + 'hb-ot-layout.cc', + 'hb-ot-map.cc', + 'hb-ot-shape-complex-arabic.cc', + 'hb-ot-shape-complex-default.cc', + 'hb-ot-shape-complex-indic-table.cc', + 'hb-ot-shape-complex-indic.cc', + 'hb-ot-shape-complex-myanmar.cc', + 'hb-ot-shape-complex-sea.cc', + 'hb-ot-shape-complex-thai.cc', + 'hb-ot-shape-fallback.cc', + 'hb-ot-shape-normalize.cc', + 'hb-ot-shape.cc', + 'hb-ot-tag.cc', + 'hb-set.cc', + 'hb-shape-plan.cc', + 'hb-shape.cc', + 'hb-shaper.cc', + 'hb-unicode.cc', + 'hb-warning.cc', +] + diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index 6290a2eee4a..aab4a99e996 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -15,15 +15,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS = SharedDIB.cpp - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += \ - SharedDIBWin.cpp \ - SharedDIBSurface.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index 1fd53dc4c21..2d5ed2ac448 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -15,4 +15,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'SharedDIBSurface.h', 'SharedDIBWin.h', ] + CPP_SOURCES += [ + 'SharedDIBWin.cpp', + 'SharedDIBSurface.cpp', + ] + +CPP_SOURCES += [ + 'SharedDIB.cpp', +] diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 70e3b5b684c..e0f5fc1bf08 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -30,150 +30,14 @@ ifdef MOZ_DEBUG DEFINES += -DD3D_DEBUG_INFO endif -CPPSRCS = \ - BasicImages.cpp \ - BasicLayerManager.cpp \ - BasicCanvasLayer.cpp \ - BasicColorLayer.cpp \ - BasicCompositor.cpp \ - BasicContainerLayer.cpp \ - BasicImageLayer.cpp \ - BasicLayersImpl.cpp \ - BasicThebesLayer.cpp \ - ClientCanvasLayer.cpp \ - ClientColorLayer.cpp \ - ClientContainerLayer.cpp \ - ClientImageLayer.cpp \ - ClientLayerManager.cpp \ - ClientThebesLayer.cpp \ - ClientTiledThebesLayer.cpp \ - CompositableHost.cpp \ - CompositableTransactionParent.cpp \ - CopyableCanvasLayer.cpp \ - ImageContainer.cpp \ - Layers.cpp \ - LayersLogging.cpp \ - RenderTrace.cpp \ - ReadbackProcessor.cpp \ - ThebesLayerBuffer.cpp \ - CanvasLayerOGL.cpp \ - ColorLayerOGL.cpp \ - ContainerLayerOGL.cpp \ - ImageLayerOGL.cpp \ - LayerManagerOGL.cpp \ - ThebesLayerOGL.cpp \ - LayerManagerOGLProgram.cpp \ - CanvasLayerComposite.cpp \ - ColorLayerComposite.cpp \ - ContainerLayerComposite.cpp \ - ImageLayerComposite.cpp \ - LayerManagerComposite.cpp \ - ThebesLayerComposite.cpp \ - LayerSorter.cpp \ - LayerTreeInvalidation.cpp \ - ImageLayers.cpp \ - TexturePoolOGL.cpp \ - $(NULL) - GTEST_CPPSRCS = \ TestTiledLayerBuffer.cpp \ $(NULL) -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += \ - D3D9SurfaceImage.cpp \ - $(NULL) -ifdef MOZ_ENABLE_D3D9_LAYER -CPPSRCS += \ - LayerManagerD3D9.cpp \ - ThebesLayerD3D9.cpp \ - ContainerLayerD3D9.cpp \ - ImageLayerD3D9.cpp \ - ColorLayerD3D9.cpp \ - CanvasLayerD3D9.cpp \ - DeviceManagerD3D9.cpp \ - Nv3DVUtils.cpp \ - $(NULL) -endif -ifdef MOZ_ENABLE_D3D10_LAYER -CPPSRCS += \ - CanvasLayerD3D10.cpp \ - ColorLayerD3D10.cpp \ - CompositorD3D11.cpp \ - ContainerLayerD3D10.cpp \ - ImageLayerD3D10.cpp \ - LayerManagerD3D10.cpp \ - ReadbackManagerD3D10.cpp \ - ShadowLayerUtilsD3D10.cpp \ - TextureD3D11.cpp \ - ThebesLayerD3D10.cpp \ - $(NULL) -endif -endif - -CPPSRCS += \ - AsyncCompositionManager.cpp \ - AsyncPanZoomController.cpp \ - Axis.cpp \ - CanvasClient.cpp \ - CompositableClient.cpp \ - Compositor.cpp \ - CompositorOGL.cpp \ - CompositorCocoaWidgetHelper.cpp \ - CompositorChild.cpp \ - CompositorParent.cpp \ - ContentClient.cpp \ - ContentHost.cpp \ - Effects.cpp \ - GestureEventListener.cpp \ - ImageBridgeChild.cpp \ - ImageBridgeParent.cpp \ - ShadowLayers.cpp \ - ShadowLayerChild.cpp \ - ShadowLayerParent.cpp \ - LayerTransactionChild.cpp \ - LayerTransactionParent.cpp \ - SharedPlanarYCbCrImage.cpp \ - SharedRGBImage.cpp \ - TaskThrottler.cpp \ - ImageClient.cpp \ - ImageHost.cpp \ - ISurfaceAllocator.cpp \ - TextureClient.cpp \ - TextureClientOGL.cpp \ - TextureHost.cpp \ - TextureHostOGL.cpp \ - TiledContentClient.cpp \ - TiledContentHost.cpp \ - YCbCrImageDataSerializer.cpp \ - $(NULL) - -ifdef MOZ_X11 #{ -CPPSRCS += ShadowLayerUtilsX11.cpp -endif #} - ifdef MOZ_ENABLE_D3D10_LAYER DEFINES += -DMOZ_ENABLE_D3D10_LAYER endif -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -CPPSRCS += \ - ShadowLayerUtilsMac.cpp \ - GLManager.cpp \ - $(NULL) -endif - -# NB: Gralloc is available on other platforms that use the android GL -# libraries, but only Gonk is able to use it reliably because Gecko -# has full system permissions there. -ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS += \ - ShadowLayerUtilsGralloc.cpp \ - GrallocImages.cpp \ - GonkIOSurfaceImage.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index f374c9e9676..4d4d7e0100a 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -44,11 +44,24 @@ EXPORTS += [ ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'D3D9SurfaceImage.cpp', + ] if CONFIG['MOZ_ENABLE_D3D9_LAYER']: EXPORTS += [ 'DeviceManagerD3D9.h', 'LayerManagerD3D9.h', ] + CPP_SOURCES += [ + 'LayerManagerD3D9.cpp', + 'ThebesLayerD3D9.cpp', + 'ContainerLayerD3D9.cpp', + 'ImageLayerD3D9.cpp', + 'ColorLayerD3D9.cpp', + 'CanvasLayerD3D9.cpp', + 'DeviceManagerD3D9.cpp', + 'Nv3DVUtils.cpp', + ] if CONFIG['MOZ_ENABLE_D3D10_LAYER']: EXPORTS += [ 'LayerManagerD3D10.h', @@ -59,6 +72,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'ShadowLayerUtilsD3D10.h', 'TextureD3D11.h', ] + CPP_SOURCES += [ + 'CanvasLayerD3D10.cpp', + 'ColorLayerD3D10.cpp', + 'CompositorD3D11.cpp', + 'ContainerLayerD3D10.cpp', + 'ImageLayerD3D10.cpp', + 'LayerManagerD3D10.cpp', + 'ReadbackManagerD3D10.cpp', + 'ShadowLayerUtilsD3D10.cpp', + 'TextureD3D11.cpp', + 'ThebesLayerD3D10.cpp', + ] EXPORTS.gfxipc += [ 'ShadowLayerUtils.h', @@ -118,13 +143,108 @@ if CONFIG['MOZ_X11']: EXPORTS.mozilla.layers += [ 'ShadowLayerUtilsX11.h' ] + CPP_SOURCES += [ + 'ShadowLayerUtilsX11.cpp' + ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS.mozilla.layers += [ 'GLManager.h' ] + CPP_SOURCES += [ + 'ShadowLayerUtilsMac.cpp', + 'GLManager.cpp', + ] +# NB: Gralloc is available on other platforms that use the android GL +# libraries, but only Gonk is able to use it reliably because Gecko +# has full system permissions there. if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': EXPORTS.mozilla.layers += [ 'ShadowLayerUtilsGralloc.h' ] + CPP_SOURCES += [ + 'ShadowLayerUtilsGralloc.cpp', + 'GrallocImages.cpp', + 'GonkIOSurfaceImage.cpp', + ] + +CPP_SOURCES += [ + 'AsyncCompositionManager.cpp', + 'AsyncPanZoomController.cpp', + 'Axis.cpp', + 'BasicCanvasLayer.cpp', + 'BasicColorLayer.cpp', + 'BasicCompositor.cpp', + 'BasicContainerLayer.cpp', + 'BasicImageLayer.cpp', + 'BasicImages.cpp', + 'BasicLayerManager.cpp', + 'BasicLayersImpl.cpp', + 'BasicThebesLayer.cpp', + 'CanvasClient.cpp', + 'CanvasLayerComposite.cpp', + 'CanvasLayerOGL.cpp', + 'ClientCanvasLayer.cpp', + 'ClientColorLayer.cpp', + 'ClientContainerLayer.cpp', + 'ClientImageLayer.cpp', + 'ClientLayerManager.cpp', + 'ClientThebesLayer.cpp', + 'ClientTiledThebesLayer.cpp', + 'ColorLayerComposite.cpp', + 'ColorLayerOGL.cpp', + 'CompositableClient.cpp', + 'CompositableHost.cpp', + 'CompositableTransactionParent.cpp', + 'Compositor.cpp', + 'CompositorChild.cpp', + 'CompositorCocoaWidgetHelper.cpp', + 'CompositorOGL.cpp', + 'CompositorParent.cpp', + 'ContainerLayerComposite.cpp', + 'ContainerLayerOGL.cpp', + 'ContentClient.cpp', + 'ContentHost.cpp', + 'CopyableCanvasLayer.cpp', + 'Effects.cpp', + 'GestureEventListener.cpp', + 'ISurfaceAllocator.cpp', + 'ImageBridgeChild.cpp', + 'ImageBridgeParent.cpp', + 'ImageClient.cpp', + 'ImageContainer.cpp', + 'ImageHost.cpp', + 'ImageLayerComposite.cpp', + 'ImageLayerOGL.cpp', + 'ImageLayers.cpp', + 'LayerManagerComposite.cpp', + 'LayerManagerOGL.cpp', + 'LayerManagerOGLProgram.cpp', + 'LayerSorter.cpp', + 'LayerTransactionChild.cpp', + 'LayerTransactionParent.cpp', + 'LayerTreeInvalidation.cpp', + 'Layers.cpp', + 'LayersLogging.cpp', + 'ReadbackProcessor.cpp', + 'RenderTrace.cpp', + 'ShadowLayerChild.cpp', + 'ShadowLayerParent.cpp', + 'ShadowLayers.cpp', + 'SharedPlanarYCbCrImage.cpp', + 'SharedRGBImage.cpp', + 'TaskThrottler.cpp', + 'TextureClient.cpp', + 'TextureClientOGL.cpp', + 'TextureHost.cpp', + 'TextureHostOGL.cpp', + 'TexturePoolOGL.cpp', + 'ThebesLayerBuffer.cpp', + 'ThebesLayerComposite.cpp', + 'ThebesLayerOGL.cpp', + 'TiledContentClient.cpp', + 'TiledContentHost.cpp', + 'YCbCrImageDataSerializer.cpp', +] + diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in index bb79f937600..f6d9c0bbee4 100644 --- a/gfx/ots/src/Makefile.in +++ b/gfx/ots/src/Makefile.in @@ -45,40 +45,6 @@ endif CSRCS = \ $(NULL) -CPPSRCS = \ - cff.cc \ - cff_type2_charstring.cc \ - cmap.cc \ - cvt.cc \ - fpgm.cc \ - gasp.cc \ - glyf.cc \ - hdmx.cc \ - head.cc \ - hhea.cc \ - hmtx.cc \ - kern.cc \ - layout.cc \ - loca.cc \ - ltsh.cc \ - maxp.cc \ - metrics.cc \ - name.cc \ - os2.cc \ - ots.cc \ - post.cc \ - prep.cc \ - vdmx.cc \ - vhea.cc \ - vmtx.cc \ - vorg.cc \ - gdef.cc \ - gpos.cc \ - gsub.cc \ - graphite.cc \ - svg.cc \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DPACKAGE_VERSION="\"moz\"" diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index 6e6749078b9..fa939da29ea 100644 --- a/gfx/ots/src/moz.build +++ b/gfx/ots/src/moz.build @@ -11,3 +11,37 @@ EXPORTS += [ '../include/ots-memory-stream.h', ] +CPP_SOURCES += [ + 'cff.cc', + 'cff_type2_charstring.cc', + 'cmap.cc', + 'cvt.cc', + 'fpgm.cc', + 'gasp.cc', + 'gdef.cc', + 'glyf.cc', + 'gpos.cc', + 'graphite.cc', + 'gsub.cc', + 'hdmx.cc', + 'head.cc', + 'hhea.cc', + 'hmtx.cc', + 'kern.cc', + 'layout.cc', + 'loca.cc', + 'ltsh.cc', + 'maxp.cc', + 'metrics.cc', + 'name.cc', + 'os2.cc', + 'ots.cc', + 'post.cc', + 'prep.cc', + 'svg.cc', + 'vdmx.cc', + 'vhea.cc', + 'vmtx.cc', + 'vorg.cc', +] + diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in index 453ace6c290..d6bc25d2178 100644 --- a/gfx/skia/Makefile.in +++ b/gfx/skia/Makefile.in @@ -55,304 +55,16 @@ VPATH += \ $(srcdir)/src/sfnt \ $(NULL) -GPU_CPPSRCS = \ - GrAAConvexPathRenderer.cpp \ - GrAAHairLinePathRenderer.cpp \ - GrAARectRenderer.cpp \ - GrAddPathRenderers_default.cpp \ - GrAllocPool.cpp \ - GrAtlas.cpp \ - GrBufferAllocPool.cpp \ - GrCacheID.cpp \ - GrClipData.cpp \ - GrClipMaskCache.cpp \ - GrClipMaskManager.cpp \ - GrContext.cpp \ - GrCustomStage.cpp \ - GrDefaultPathRenderer.cpp \ - GrDrawTarget.cpp \ - GrGeometryBuffer.cpp \ - GrGpu.cpp \ - GrGpuFactory.cpp \ - GrInOrderDrawBuffer.cpp \ - GrMatrix.cpp \ - GrMemory.cpp \ - GrMemoryPool.cpp \ - GrPath.cpp \ - GrPathRendererChain.cpp \ - GrPathRenderer.cpp \ - GrPathUtils.cpp \ - GrRectanizer.cpp \ - GrRenderTarget.cpp \ - GrResourceCache.cpp \ - GrResource.cpp \ - GrSoftwarePathRenderer.cpp \ - GrStencilAndCoverPathRenderer.cpp \ - GrStencilBuffer.cpp \ - GrStencil.cpp \ - GrSurface.cpp \ - GrSWMaskHelper.cpp \ - GrTextContext.cpp \ - GrTextStrike.cpp \ - GrTextureAccess.cpp \ - GrTexture.cpp \ - SkGpuCanvas.cpp \ - SkGpuDevice.cpp \ - SkGr.cpp \ - SkGrFontScaler.cpp \ - SkGrPixelRef.cpp \ - SkGrTexturePixelRef.cpp \ - GrColorTableEffect.cpp \ - GrConfigConversionEffect.cpp \ - GrConvolutionEffect.cpp \ - GrSingleTextureEffect.cpp \ - GrTextureDomainEffect.cpp \ - GrTextureStripAtlas.cpp \ - $(NULL) - -GPU_GL_CPPSRCS = \ - GrGLCaps.cpp \ - GrGLContextInfo.cpp \ - GrGLCreateNativeInterface_none.cpp \ - GrGLCreateNullInterface.cpp \ - GrGLDefaultInterface_native.cpp \ - GrGLIndexBuffer.cpp \ - GrGLInterface.cpp \ - GrGLPath.cpp \ - GrGLProgram.cpp \ - GrGLProgramStage.cpp \ - GrGLRenderTarget.cpp \ - GrGLShaderBuilder.cpp \ - GrGLSL.cpp \ - GrGLStencilBuffer.cpp \ - GrGLTexture.cpp \ - GrGLUniformManager.cpp \ - GrGLUtil.cpp \ - GrGLVertexBuffer.cpp \ - GrGpuGL.cpp \ - GrGpuGL_program.cpp \ - SkGLContext.cpp \ - SkNullGLContext.cpp \ - $(NULL) - -CPPSRCS = \ - Sk64.cpp \ - SkAAClip.cpp \ - SkAdvancedTypefaceMetrics.cpp \ - SkAlphaRuns.cpp \ - SkAnnotation.cpp \ - SkBBoxRecord.cpp \ - SkBBoxHierarchyRecord.cpp \ - SkBase64.cpp \ - SkBitSet.cpp \ - SkBitmap.cpp \ - SkBitmapCache.cpp \ - SkBitmapHeap.cpp \ - SkBitmapProcShader.cpp \ - SkBitmapProcState.cpp \ - SkBitmapProcState_matrixProcs.cpp \ - SkBitmapSampler.cpp \ - SkBitmap_scroll.cpp \ - SkBlitMask_D32.cpp \ - SkBlitRow_D16.cpp \ - SkBlitRow_D32.cpp \ - SkBlitRow_D4444.cpp \ - SkBlitter.cpp \ - SkBlitter_4444.cpp \ - SkBlitter_A1.cpp \ - SkBlitter_A8.cpp \ - SkBlitter_ARGB32.cpp \ - SkBlitter_RGB16.cpp \ - SkBlitter_Sprite.cpp \ - SkBlurDrawLooper.cpp \ - SkBlurMaskFilter.cpp \ - SkBlurMask.cpp \ - SkBuffer.cpp \ - SkCanvas.cpp \ - SkChunkAlloc.cpp \ - SkClipStack.cpp \ - SkColor.cpp \ - SkColorFilter.cpp \ - SkColorFilters.cpp \ - SkColorMatrix.cpp \ - SkColorTable.cpp \ - SkClampRange.cpp \ - SkComposeShader.cpp \ - SkConcaveToTriangles.cpp \ - SkConfig8888.cpp \ - SkCordic.cpp \ - SkCubicClipper.cpp \ - SkDashPathEffect.cpp \ - SkData.cpp \ - SkDataPixelRef.cpp \ - SkDebug.cpp \ - SkDeferredCanvas.cpp \ - SkDeque.cpp \ - SkDevice.cpp \ - SkDeviceProfile.cpp \ - SkDither.cpp \ - SkDraw.cpp \ - SkEdge.cpp \ - SkEdgeBuilder.cpp \ - SkEdgeClipper.cpp \ - SkFilterProc.cpp \ - SkFlattenable.cpp \ - SkFlattenableBuffers.cpp \ - SkFloat.cpp \ - SkFloatBits.cpp \ - SkFontDescriptor.cpp \ - SkFontHost.cpp \ - SkGeometry.cpp \ - SkGlyphCache.cpp \ - SkGradientShader.cpp \ - SkGradientTileProc.cpp \ - SkGraphics.cpp \ - SkGPipeRead.cpp \ - SkGPipeWrite.cpp \ - SkImage.cpp \ - SkImage_Codec.cpp \ - SkImage_Picture.cpp \ - SkImage_Raster.cpp \ - SkImageDecoder.cpp \ - SkImageDecoder_Factory.cpp \ - SkImageFilter.cpp \ - SkImagePriv.cpp \ - SkLayerDrawLooper.cpp \ - SkLayerRasterizer.cpp \ - SkLinearGradient.cpp \ - SkLineClipper.cpp \ - SkMallocPixelRef.cpp \ - SkMask.cpp \ - SkMaskFilter.cpp \ - SkMaskGamma.cpp \ - SkMath.cpp \ - SkMatrix.cpp \ - SkMemory_malloc.cpp \ - SkMetaData.cpp \ - SkOrderedReadBuffer.cpp \ - SkOrderedWriteBuffer.cpp \ - SkOSFile_stdio.cpp \ - SkOTUtils.cpp \ - SkPackBits.cpp \ - SkPaint.cpp \ - SkPath.cpp \ - SkPathEffect.cpp \ - SkPathHeap.cpp \ - SkPathMeasure.cpp \ - SkPicture.cpp \ - SkPictureFlat.cpp \ - SkPicturePlayback.cpp \ - SkPictureRecord.cpp \ - SkPictureStateTree.cpp \ - SkPixelRef.cpp \ - SkPoint.cpp \ - SkProcSpriteBlitter.cpp \ - SkPtrRecorder.cpp \ - SkQuadClipper.cpp \ - SkRTree.cpp \ - SkRadialGradient.cpp \ - SkRasterClip.cpp \ - SkRasterizer.cpp \ - SkRect.cpp \ - SkRefDict.cpp \ - SkRegion.cpp \ - SkRegion_path.cpp \ - SkRegion_rects.cpp \ - SkScalar.cpp \ - SkScalerContext.cpp \ - SkScan.cpp \ - SkScan_AntiPath.cpp \ - SkScan_Antihair.cpp \ - SkScan_Hairline.cpp \ - SkScan_Path.cpp \ - SkShader.cpp \ - SkSpriteBlitter_ARGB32.cpp \ - SkSpriteBlitter_RGB16.cpp \ - SkStream.cpp \ - SkString.cpp \ - SkStroke.cpp \ - SkStrokerPriv.cpp \ - SkSurface.cpp \ - SkSurface_Raster.cpp \ - SkSurface_Picture.cpp \ - SkSweepGradient.cpp \ - SkTLS.cpp \ - SkTSearch.cpp \ - SkTwoPointConicalGradient.cpp \ - SkTwoPointRadialGradient.cpp \ - SkTypeface.cpp \ - SkTypefaceCache.cpp \ - SkUnPreMultiply.cpp \ - SkUtils.cpp \ - SkWriter32.cpp \ - SkXfermode.cpp \ - $(NULL) - -ifdef MOZ_ENABLE_SKIA_GPU -CPPSRCS += \ - $(GPU_CPPSRCS) \ - $(GPU_GL_CPPSRCS) \ - $(NULL) -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - SkFontHost_mac_coretext.cpp \ - SkStream_mac.cpp \ - SkTime_Unix.cpp \ - $(NULL) -endif - ifeq (android,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - SkDebug_android.cpp \ - SkFontHost_android_old.cpp \ - SkFontHost_FreeType.cpp \ - SkFontHost_FreeType_common.cpp \ - SkFontHost_tables.cpp \ - SkMMapStream.cpp \ - SkTime_Unix.cpp \ - SkThread_pthread.cpp \ - $(NULL) - OS_CXXFLAGS += $(CAIRO_FT_CFLAGS) DEFINES += -DSK_USE_POSIX_THREADS=1 -else -CPPSRCS += \ - SkDebug_stdio.cpp \ - SkThread_none.cpp \ - $(NULL) endif ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - SkFontHost_FreeType.cpp \ - SkFontHost_FreeType_common.cpp \ - SkFontHost_linux.cpp \ - SkFontHost_tables.cpp \ - SkTime_Unix.cpp \ - SkMMapStream.cpp \ - SkOSFile.cpp \ - $(NULL) - OS_CXXFLAGS += $(MOZ_PANGO_CFLAGS) endif ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - SkFontHost_FreeType.cpp \ - SkFontHost_FreeType_common.cpp \ - SkFontHost_tables.cpp \ - SkMMapStream.cpp \ - SkOSFile.cpp \ - $(NULL) -ifeq (Linux,$(OS_TARGET)) -CPPSRCS += \ - SkFontHost_linux.cpp \ - SkFontHost_tables.cpp \ - SkTime_Unix.cpp \ - $(NULL) -endif OS_CXXFLAGS += $(MOZ_PANGO_CFLAGS) endif @@ -361,41 +73,16 @@ DEFINES += -DSK_USE_POSIX_THREADS=1 endif ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - SkFontHost_win.cpp \ - SkFontHost_tables.cpp \ - SkFontHost_sandbox_none.cpp \ - SkTime_win.cpp \ - $(NULL) DEFINES += -DSKIA_IMPLEMENTATION=1 -DGR_IMPLEMENTATION=1 endif ifneq (,$(INTEL_ARCHITECTURE)) -CPPSRCS += \ - SkBitmapProcState_opts_SSE2.cpp \ - SkBlitRect_opts_SSE2.cpp \ - SkBlitRow_opts_SSE2.cpp \ - SkUtils_opts_SSE2.cpp \ - opts_check_SSE2.cpp \ - $(NULL) ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 DEFINES += -DSK_BUILD_SSSE3 -CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp endif else ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) -CPPSRCS += \ - SkBitmapProcState_opts_arm.cpp \ - SkBlitRow_opts_arm.cpp \ - opts_check_arm.cpp \ - $(NULL) SSRCS += memset.arm.S -else -CPPSRCS += \ - SkBitmapProcState_opts_none.cpp \ - SkBlitRow_opts_none.cpp \ - SkUtils_opts_none.cpp \ - $(NULL) endif endif diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index d50201d65a5..a4145c5286c 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -151,8 +151,320 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS.skia += [ 'include/ports/SkTypeface_mac.h', ] + CPP_SOURCES += [ + 'SkFontHost_mac_coretext.cpp', + 'SkStream_mac.cpp', + 'SkTime_Unix.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS.skia += [ 'include/config/sk_stdint.h', 'include/ports/SkTypeface_win.h', ] + CPP_SOURCES += [ + 'SkFontHost_win.cpp', + 'SkFontHost_tables.cpp', + 'SkFontHost_sandbox_none.cpp', + 'SkTime_win.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'SkFontHost_FreeType.cpp', + 'SkFontHost_FreeType_common.cpp', + 'SkFontHost_linux.cpp', + 'SkFontHost_tables.cpp', + 'SkTime_Unix.cpp', + 'SkMMapStream.cpp', + 'SkOSFile.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': + CPP_SOURCES += [ + 'SkFontHost_FreeType.cpp', + 'SkFontHost_FreeType_common.cpp', + 'SkFontHost_tables.cpp', + 'SkMMapStream.cpp', + 'SkOSFile.cpp', + ] + if CONFIG['OS_TARGET'] == 'Linux': + CPP_SOURCES += [ + 'SkFontHost_linux.cpp', + 'SkFontHost_tables.cpp', + 'SkTime_Unix.cpp', + ] + + +# Separate 'if' from above, since the else below applies to all != 'android' +# toolkits. +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + CPP_SOURCES += [ + 'SkDebug_android.cpp', + 'SkFontHost_android_old.cpp', + 'SkFontHost_FreeType.cpp', + 'SkFontHost_FreeType_common.cpp', + 'SkFontHost_tables.cpp', + 'SkMMapStream.cpp', + 'SkTime_Unix.cpp', + 'SkThread_pthread.cpp', + ] +else: + CPP_SOURCES += [ + 'SkDebug_stdio.cpp', + 'SkThread_none.cpp', + ] + +if CONFIG['INTEL_ARCHITECTURE']: + CPP_SOURCES += [ + 'SkBitmapProcState_opts_SSE2.cpp', + 'SkBlitRect_opts_SSE2.cpp', + 'SkBlitRow_opts_SSE2.cpp', + 'SkUtils_opts_SSE2.cpp', + 'opts_check_SSE2.cpp', + ] + if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: + CPP_SOURCES += [ + 'SkBitmapProcState_opts_SSSE3.cpp', + ] +elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: + CPP_SOURCES += [ + 'SkBitmapProcState_opts_arm.cpp', + 'SkBlitRow_opts_arm.cpp', + 'opts_check_arm.cpp', + ] +else: + CPP_SOURCES += [ + 'SkBitmapProcState_opts_none.cpp', + 'SkBlitRow_opts_none.cpp', + 'SkUtils_opts_none.cpp', + ] + +if CONFIG['MOZ_ENABLE_SKIA_GPU']: + CPP_SOURCES += [ + 'GrAAConvexPathRenderer.cpp', + 'GrAAHairLinePathRenderer.cpp', + 'GrAARectRenderer.cpp', + 'GrAddPathRenderers_default.cpp', + 'GrAllocPool.cpp', + 'GrAtlas.cpp', + 'GrBufferAllocPool.cpp', + 'GrCacheID.cpp', + 'GrClipData.cpp', + 'GrClipMaskCache.cpp', + 'GrClipMaskManager.cpp', + 'GrContext.cpp', + 'GrCustomStage.cpp', + 'GrDefaultPathRenderer.cpp', + 'GrDrawTarget.cpp', + 'GrGeometryBuffer.cpp', + 'GrGpu.cpp', + 'GrGpuFactory.cpp', + 'GrInOrderDrawBuffer.cpp', + 'GrMatrix.cpp', + 'GrMemory.cpp', + 'GrMemoryPool.cpp', + 'GrPath.cpp', + 'GrPathRendererChain.cpp', + 'GrPathRenderer.cpp', + 'GrPathUtils.cpp', + 'GrRectanizer.cpp', + 'GrRenderTarget.cpp', + 'GrResourceCache.cpp', + 'GrResource.cpp', + 'GrSoftwarePathRenderer.cpp', + 'GrStencilAndCoverPathRenderer.cpp', + 'GrStencilBuffer.cpp', + 'GrStencil.cpp', + 'GrSurface.cpp', + 'GrSWMaskHelper.cpp', + 'GrTextContext.cpp', + 'GrTextStrike.cpp', + 'GrTextureAccess.cpp', + 'GrTexture.cpp', + 'SkGpuCanvas.cpp', + 'SkGpuDevice.cpp', + 'SkGr.cpp', + 'SkGrFontScaler.cpp', + 'SkGrPixelRef.cpp', + 'SkGrTexturePixelRef.cpp', + 'GrColorTableEffect.cpp', + 'GrConfigConversionEffect.cpp', + 'GrConvolutionEffect.cpp', + 'GrSingleTextureEffect.cpp', + 'GrTextureDomainEffect.cpp', + 'GrTextureStripAtlas.cpp', + 'GrGLCaps.cpp', + 'GrGLContextInfo.cpp', + 'GrGLCreateNativeInterface_none.cpp', + 'GrGLCreateNullInterface.cpp', + 'GrGLDefaultInterface_native.cpp', + 'GrGLIndexBuffer.cpp', + 'GrGLInterface.cpp', + 'GrGLPath.cpp', + 'GrGLProgram.cpp', + 'GrGLProgramStage.cpp', + 'GrGLRenderTarget.cpp', + 'GrGLShaderBuilder.cpp', + 'GrGLSL.cpp', + 'GrGLStencilBuffer.cpp', + 'GrGLTexture.cpp', + 'GrGLUniformManager.cpp', + 'GrGLUtil.cpp', + 'GrGLVertexBuffer.cpp', + 'GrGpuGL.cpp', + 'GrGpuGL_program.cpp', + 'SkGLContext.cpp', + 'SkNullGLContext.cpp', + ] + +CPP_SOURCES += [ + 'Sk64.cpp', + 'SkAAClip.cpp', + 'SkAdvancedTypefaceMetrics.cpp', + 'SkAlphaRuns.cpp', + 'SkAnnotation.cpp', + 'SkBBoxHierarchyRecord.cpp', + 'SkBBoxRecord.cpp', + 'SkBase64.cpp', + 'SkBitSet.cpp', + 'SkBitmap.cpp', + 'SkBitmapCache.cpp', + 'SkBitmapHeap.cpp', + 'SkBitmapProcShader.cpp', + 'SkBitmapProcState.cpp', + 'SkBitmapProcState_matrixProcs.cpp', + 'SkBitmapSampler.cpp', + 'SkBitmap_scroll.cpp', + 'SkBlitMask_D32.cpp', + 'SkBlitRow_D16.cpp', + 'SkBlitRow_D32.cpp', + 'SkBlitRow_D4444.cpp', + 'SkBlitter.cpp', + 'SkBlitter_4444.cpp', + 'SkBlitter_A1.cpp', + 'SkBlitter_A8.cpp', + 'SkBlitter_ARGB32.cpp', + 'SkBlitter_RGB16.cpp', + 'SkBlitter_Sprite.cpp', + 'SkBlurDrawLooper.cpp', + 'SkBlurMask.cpp', + 'SkBlurMaskFilter.cpp', + 'SkBuffer.cpp', + 'SkCanvas.cpp', + 'SkChunkAlloc.cpp', + 'SkClampRange.cpp', + 'SkClipStack.cpp', + 'SkColor.cpp', + 'SkColorFilter.cpp', + 'SkColorFilters.cpp', + 'SkColorMatrix.cpp', + 'SkColorTable.cpp', + 'SkComposeShader.cpp', + 'SkConcaveToTriangles.cpp', + 'SkConfig8888.cpp', + 'SkCordic.cpp', + 'SkCubicClipper.cpp', + 'SkDashPathEffect.cpp', + 'SkData.cpp', + 'SkDataPixelRef.cpp', + 'SkDebug.cpp', + 'SkDeferredCanvas.cpp', + 'SkDeque.cpp', + 'SkDevice.cpp', + 'SkDeviceProfile.cpp', + 'SkDither.cpp', + 'SkDraw.cpp', + 'SkEdge.cpp', + 'SkEdgeBuilder.cpp', + 'SkEdgeClipper.cpp', + 'SkFilterProc.cpp', + 'SkFlattenable.cpp', + 'SkFlattenableBuffers.cpp', + 'SkFloat.cpp', + 'SkFloatBits.cpp', + 'SkFontDescriptor.cpp', + 'SkFontHost.cpp', + 'SkGPipeRead.cpp', + 'SkGPipeWrite.cpp', + 'SkGeometry.cpp', + 'SkGlyphCache.cpp', + 'SkGradientShader.cpp', + 'SkGradientTileProc.cpp', + 'SkGraphics.cpp', + 'SkImage.cpp', + 'SkImageDecoder.cpp', + 'SkImageDecoder_Factory.cpp', + 'SkImageFilter.cpp', + 'SkImagePriv.cpp', + 'SkImage_Codec.cpp', + 'SkImage_Picture.cpp', + 'SkImage_Raster.cpp', + 'SkLayerDrawLooper.cpp', + 'SkLayerRasterizer.cpp', + 'SkLineClipper.cpp', + 'SkLinearGradient.cpp', + 'SkMallocPixelRef.cpp', + 'SkMask.cpp', + 'SkMaskFilter.cpp', + 'SkMaskGamma.cpp', + 'SkMath.cpp', + 'SkMatrix.cpp', + 'SkMemory_malloc.cpp', + 'SkMetaData.cpp', + 'SkOSFile_stdio.cpp', + 'SkOTUtils.cpp', + 'SkOrderedReadBuffer.cpp', + 'SkOrderedWriteBuffer.cpp', + 'SkPackBits.cpp', + 'SkPaint.cpp', + 'SkPath.cpp', + 'SkPathEffect.cpp', + 'SkPathHeap.cpp', + 'SkPathMeasure.cpp', + 'SkPicture.cpp', + 'SkPictureFlat.cpp', + 'SkPicturePlayback.cpp', + 'SkPictureRecord.cpp', + 'SkPictureStateTree.cpp', + 'SkPixelRef.cpp', + 'SkPoint.cpp', + 'SkProcSpriteBlitter.cpp', + 'SkPtrRecorder.cpp', + 'SkQuadClipper.cpp', + 'SkRTree.cpp', + 'SkRadialGradient.cpp', + 'SkRasterClip.cpp', + 'SkRasterizer.cpp', + 'SkRect.cpp', + 'SkRefDict.cpp', + 'SkRegion.cpp', + 'SkRegion_path.cpp', + 'SkRegion_rects.cpp', + 'SkScalar.cpp', + 'SkScalerContext.cpp', + 'SkScan.cpp', + 'SkScan_AntiPath.cpp', + 'SkScan_Antihair.cpp', + 'SkScan_Hairline.cpp', + 'SkScan_Path.cpp', + 'SkShader.cpp', + 'SkSpriteBlitter_ARGB32.cpp', + 'SkSpriteBlitter_RGB16.cpp', + 'SkStream.cpp', + 'SkString.cpp', + 'SkStroke.cpp', + 'SkStrokerPriv.cpp', + 'SkSurface.cpp', + 'SkSurface_Picture.cpp', + 'SkSurface_Raster.cpp', + 'SkSweepGradient.cpp', + 'SkTLS.cpp', + 'SkTSearch.cpp', + 'SkTwoPointConicalGradient.cpp', + 'SkTwoPointRadialGradient.cpp', + 'SkTypeface.cpp', + 'SkTypefaceCache.cpp', + 'SkUnPreMultiply.cpp', + 'SkUtils.cpp', + 'SkWriter32.cpp', + 'SkXfermode.cpp', +] + diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index 231af3ab692..79f964d515e 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -18,25 +18,6 @@ LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsColor.cpp \ - nsFont.cpp \ - nsRect.cpp \ - nsRegion.cpp \ - nsTransform2D.cpp \ - nsScriptableRegion.cpp \ - gfxCrashReporterUtils.cpp \ - nsDeviceContext.cpp \ - nsThebesGfxFactory.cpp \ - nsRenderingContext.cpp \ - nsFontMetrics.cpp \ - nsThebesFontEnumerator.cpp \ - $(NULL) - -ifdef MOZ_X11 -CPPSRCS += X11Util.cpp -endif - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) diff --git a/gfx/src/moz.build b/gfx/src/moz.build index 206621a4331..c265a1955e5 100644 --- a/gfx/src/moz.build +++ b/gfx/src/moz.build @@ -36,3 +36,22 @@ EXPORTS += [ if CONFIG['MOZ_X11']: EXPORTS.mozilla += ['X11Util.h'] + CPP_SOURCES += [ + 'X11Util.cpp', + ] + +CPP_SOURCES += [ + 'gfxCrashReporterUtils.cpp', + 'nsColor.cpp', + 'nsDeviceContext.cpp', + 'nsFont.cpp', + 'nsFontMetrics.cpp', + 'nsRect.cpp', + 'nsRegion.cpp', + 'nsRenderingContext.cpp', + 'nsScriptableRegion.cpp', + 'nsThebesFontEnumerator.cpp', + 'nsThebesGfxFactory.cpp', + 'nsTransform2D.cpp', +] + diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index 12128905053..6533e5645c1 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -24,48 +24,10 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/content/xml/document/src \ $(NULL) -CPPSRCS = \ - gfx3DMatrix.cpp \ - gfxASurface.cpp \ - gfxAlphaRecovery.cpp \ - gfxBlur.cpp \ - gfxCachedTempSurface.cpp \ - gfxContext.cpp \ - gfxDrawable.cpp \ - gfxImageSurface.cpp \ - gfxFont.cpp \ - gfxFontFeatures.cpp \ - gfxFontMissingGlyphs.cpp \ - gfxFontTest.cpp \ - gfxFontUtils.cpp \ - gfxMatrix.cpp \ - gfxPath.cpp \ - gfxPattern.cpp \ - gfxPlatform.cpp \ - gfxPlatformFontList.cpp \ - gfxRect.cpp \ - gfxSkipChars.cpp \ - gfxTeeSurface.cpp \ - gfxUserFontSet.cpp \ - gfxUtils.cpp \ - gfxScriptItemizer.cpp \ - gfxGraphiteShaper.cpp \ - gfxHarfBuzzShaper.cpp \ - gfxBaseSharedMemorySurface.cpp \ - gfxReusableSurfaceWrapper.cpp \ - nsSurfaceTexture.cpp \ - gfxSVGGlyphs.cpp \ - $(NULL) - ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gonk qt)) DEFINES += -DMOZ_ENABLE_FREETYPE endif -# Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp. -ifneq (,$(INTEL_ARCHITECTURE)) -CPPSRCS += gfxAlphaRecoverySSE2.cpp -endif - SHARED_LIBRARY_LIBS += \ ../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \ $(NULL) @@ -73,30 +35,6 @@ SHARED_LIBRARY_LIBS += \ ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += gfxWindowsPlatform.cpp \ - gfxWindowsSurface.cpp \ - gfxWindowsNativeDrawing.cpp \ - nsUnicodeRange.cpp \ - $(NULL) - -ifdef MOZ_ENABLE_DWRITE_FONT -CPPSRCS += gfxDWriteFonts.cpp \ - gfxDWriteShaper.cpp \ - gfxDWriteTextAnalysis.cpp \ - gfxDWriteCommon.cpp \ - gfxD2DSurface.cpp \ - gfxDWriteFontList.cpp \ - $(NULL) -endif - -CPPSRCS += gfxGDIFont.cpp \ - gfxGDIFontList.cpp \ - gfxGDIShaper.cpp \ - gfxUniscribeShaper.cpp \ - $(NULL) - -CPPSRCS += gfxPDFSurface.cpp - ifdef MOZ_ENABLE_D3D9_LAYER DEFINES += -DMOZ_ENABLE_D3D9_LAYER endif @@ -109,96 +47,18 @@ ACDEFINES += -UWIN32_LEAN_AND_MEAN endif ifeq ($(MOZ_WIDGET_TOOLKIT),android) -CPPSRCS += \ - gfxAndroidPlatform.cpp \ - gfxFT2Fonts.cpp \ - gfxFT2FontBase.cpp \ - gfxFT2Utils.cpp \ - gfxFT2FontList.cpp \ - gfxPDFSurface.cpp \ - nsUnicodeRange.cpp \ - $(NULL) # This is set for "normal Android", that is, when Gecko is running on # top of the android java runtime. DEFINES += -DMOZ_USING_ANDROID_JAVA_WIDGETS endif -ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS += \ - gfxAndroidPlatform.cpp \ - gfxFT2Fonts.cpp \ - gfxFT2FontBase.cpp \ - gfxFT2Utils.cpp \ - gfxFT2FontList.cpp \ - gfxPDFSurface.cpp \ - nsUnicodeRange.cpp \ - $(NULL) -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) -CPPSRCS += gfxOS2Fonts.cpp \ - gfxOS2Platform.cpp \ - gfxOS2Surface.cpp \ - nsUnicodeRange.cpp \ - gfxFontconfigUtils.cpp \ - $(NULL) -CPPSRCS += gfxPDFSurface.cpp -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) - -ifdef MOZ_PANGO -CPPSRCS += gfxPangoFonts.cpp -else -CPPSRCS += gfxFT2Fonts.cpp -endif - -ifdef MOZ_X11 -CPPSRCS += gfxXlibSurface.cpp gfxXlibNativeRenderer.cpp -endif - -CPPSRCS += gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp -CPPSRCS += gfxPDFSurface.cpp gfxPSSurface.cpp -CPPSRCS += gfxFontconfigUtils.cpp -CPPSRCS += gfxFT2FontBase.cpp -CPPSRCS += gfxFT2Utils.cpp -CPPSRCS += nsUnicodeRange.cpp - -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),qt) -CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp -ifdef MOZ_X11 -CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp -endif -ifdef MOZ_PANGO -CPPSRCS += gfxPangoFonts.cpp -else -CPPSRCS += gfxFT2Fonts.cpp -endif -CPPSRCS += gfxFT2FontBase.cpp -CPPSRCS += gfxFT2Utils.cpp -CPPSRCS += gfxFontconfigUtils.cpp -CPPSRCS += nsUnicodeRange.cpp -CPPSRCS += gfxPDFSurface.cpp endif ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -CPPSRCS += \ - gfxQuartzSurface.cpp \ - gfxQuartzImageSurface.cpp \ - gfxPlatformMac.cpp \ - gfxMacFont.cpp \ - gfxCoreTextShaper.cpp \ - $(NULL) -#CPPSRCS += gfxPDFSurface.cpp -CPPSRCS += nsUnicodeRange.cpp -CPPSRCS += gfxQuartzNativeDrawing.cpp - CMMSRCS = \ gfxMacPlatformFontList.mm \ $(NULL) - endif DEFINES += \ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 55c68847b21..50a3763208c 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -55,6 +55,15 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': 'gfxFT2Fonts.h', 'gfxPDFSurface.h', ] + CPP_SOURCES += [ + 'gfxAndroidPlatform.cpp', + 'gfxFT2Fonts.cpp', + 'gfxFT2FontBase.cpp', + 'gfxFT2Utils.cpp', + 'gfxFT2FontList.cpp', + 'gfxPDFSurface.cpp', + 'nsUnicodeRange.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': EXPORTS += [ 'gfxAndroidPlatform.h', @@ -62,6 +71,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'gfxFT2Fonts.h', 'gfxPDFSurface.h', ] + CPP_SOURCES += [ + 'gfxAndroidPlatform.cpp', + 'gfxFT2Fonts.cpp', + 'gfxFT2FontBase.cpp', + 'gfxFT2Utils.cpp', + 'gfxFT2FontList.cpp', + 'gfxPDFSurface.cpp', + 'nsUnicodeRange.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS += [ 'gfxPlatformMac.h', @@ -69,6 +87,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'gfxQuartzNativeDrawing.h', 'gfxQuartzSurface.h', ] + CPP_SOURCES += [ + 'gfxQuartzSurface.cpp', + 'gfxQuartzImageSurface.cpp', + 'gfxPlatformMac.cpp', + 'gfxMacFont.cpp', + 'gfxCoreTextShaper.cpp', + 'nsUnicodeRange.cpp', + 'gfxQuartzNativeDrawing.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': EXPORTS += [ 'gfxFT2FontBase.h', @@ -78,16 +105,37 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': 'gfxPlatformGtk.h', ] + CPP_SOURCES += [ + 'gfxPlatformGtk.cpp', + 'gfxGdkNativeRenderer.cpp', + 'gfxPDFSurface.cpp', + 'gfxPSSurface.cpp', + 'gfxFontconfigUtils.cpp', + 'gfxFT2FontBase.cpp', + 'gfxFT2Utils.cpp', + 'nsUnicodeRange.cpp', + ] + if CONFIG['MOZ_X11']: EXPORTS += [ 'gfxXlibNativeRenderer.h', 'gfxXlibSurface.h', ] + CPP_SOURCES += [ + 'gfxXlibSurface.cpp', + 'gfxXlibNativeRenderer.cpp', + ] if CONFIG['MOZ_PANGO']: EXPORTS += ['gfxPangoFonts.h'] + CPP_SOURCES += [ + 'gfxPangoFonts.cpp', + ] else: EXPORTS += ['gfxFT2Fonts.h'] + CPP_SOURCES += [ + 'gfxPangoFonts.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': EXPORTS += [ 'gfxOS2Fonts.h', @@ -95,6 +143,14 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': 'gfxOS2Surface.h', 'gfxPDFSurface.h', ] + CPP_SOURCES += [ + 'gfxOS2Fonts.cpp', + 'gfxOS2Platform.cpp', + 'gfxOS2Surface.cpp', + 'nsUnicodeRange.cpp', + 'gfxFontconfigUtils.cpp', + 'gfxPDFSurface.cpp' + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': EXPORTS += [ 'gfxFT2FontBase.h', @@ -103,16 +159,35 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': 'gfxQtNativeRenderer.h', 'gfxQtPlatform.h', ] + CPP_SOURCES += [ + 'gfxQtPlatform.cpp', + 'gfxQPainterSurface.cpp', + 'gfxFT2FontBase.cpp', + 'gfxFT2Utils.cpp', + 'gfxFontconfigUtils.cpp', + 'nsUnicodeRange.cpp', + 'gfxPDFSurface.cpp', + ] if CONFIG['MOZ_X11']: EXPORTS += [ 'gfxXlibSurface.h', ] + CPP_SOURCES += [ + 'gfxXlibSurface.cpp', + 'gfxQtNativeRenderer.cpp', + ] if CONFIG['MOZ_PANGO']: EXPORTS += ['gfxPangoFonts.h'] + CPP_SOURCES += [ + 'gfxPangoFonts.cpp', + ] else: EXPORTS += ['gfxFT2Fonts.h'] + CPP_SOURCES += [ + 'gfxFT2Fonts.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += [ 'gfxD2DSurface.h', @@ -125,3 +200,63 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'gfxWindowsPlatform.h', 'gfxWindowsSurface.h', ] + CPP_SOURCES += [ + 'gfxWindowsPlatform.cpp', + 'gfxWindowsSurface.cpp', + 'gfxWindowsNativeDrawing.cpp', + 'nsUnicodeRange.cpp', + 'gfxGDIFont.cpp', + 'gfxGDIFontList.cpp', + 'gfxGDIShaper.cpp', + 'gfxUniscribeShaper.cpp', + 'gfxPDFSurface.cpp', + ] + if CONFIG['MOZ_ENABLE_DWRITE_FONT']: + CPP_SOURCES += [ + 'gfxDWriteFonts.cpp', + 'gfxDWriteShaper.cpp', + 'gfxDWriteTextAnalysis.cpp', + 'gfxDWriteCommon.cpp', + 'gfxD2DSurface.cpp', + 'gfxDWriteFontList.cpp', + ] + +# Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp. +if CONFIG['INTEL_ARCHITECTURE']: + CPP_SOURCES += [ + 'gfxAlphaRecoverySSE2.cpp', + ] + +CPP_SOURCES += [ + 'gfx3DMatrix.cpp', + 'gfxASurface.cpp', + 'gfxAlphaRecovery.cpp', + 'gfxBaseSharedMemorySurface.cpp', + 'gfxBlur.cpp', + 'gfxCachedTempSurface.cpp', + 'gfxContext.cpp', + 'gfxDrawable.cpp', + 'gfxFont.cpp', + 'gfxFontFeatures.cpp', + 'gfxFontMissingGlyphs.cpp', + 'gfxFontTest.cpp', + 'gfxFontUtils.cpp', + 'gfxGraphiteShaper.cpp', + 'gfxHarfBuzzShaper.cpp', + 'gfxImageSurface.cpp', + 'gfxMatrix.cpp', + 'gfxPath.cpp', + 'gfxPattern.cpp', + 'gfxPlatform.cpp', + 'gfxPlatformFontList.cpp', + 'gfxRect.cpp', + 'gfxReusableSurfaceWrapper.cpp', + 'gfxSVGGlyphs.cpp', + 'gfxScriptItemizer.cpp', + 'gfxSkipChars.cpp', + 'gfxTeeSurface.cpp', + 'gfxUserFontSet.cpp', + 'gfxUtils.cpp', + 'nsSurfaceTexture.cpp', +] + diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in index 7f7dc023fc3..7fea4ebb9f4 100644 --- a/gfx/ycbcr/Makefile.in +++ b/gfx/ycbcr/Makefile.in @@ -11,55 +11,8 @@ EXPORT_LIBRARY = 1 DEFINES += -D_IMPL_NS_GFX -CPPSRCS = yuv_convert.cpp \ - yuv_row_c.cpp \ - yuv_row_table.cpp \ - ycbcr_to_rgb565.cpp \ - $(NULL) - -# Are we targeting x86 or x64? If so, build yuv_convert_mmx.cpp and -# yuv_convert_sse2.cpp. -ifneq (,$(INTEL_ARCHITECTURE)) -CPPSRCS += yuv_convert_sse2.cpp - -# MSVC doesn't support MMX when targeting AMD64. -ifdef _MSC_VER -ifneq ($(OS_TEST),x86_64) -CPPSRCS += yuv_convert_mmx.cpp -endif -else -CPPSRCS += yuv_convert_mmx.cpp -endif -endif - -ifdef _MSC_VER -ifeq ($(OS_TEST),x86_64) -ifeq (1400,$(_MSC_VER)) -# VC8 doesn't support some SSE2 built-in functions -CPPSRCS += yuv_row_win.cpp \ - $(NULL) -else -CPPSRCS += yuv_row_win64.cpp \ - $(NULL) -endif -else -CPPSRCS += yuv_row_win.cpp \ - $(NULL) -endif -else -ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH))) -CPPSRCS += yuv_row_posix.cpp \ - $(NULL) -else -CPPSRCS += yuv_row_other.cpp \ - $(NULL) -endif # posix -endif # windows - ifeq (arm,$(findstring arm,$(OS_TEST))) ifdef HAVE_ARM_NEON -CPPSRCS += yuv_convert_arm.cpp \ - $(NULL) ASFILES = yuv_row_arm.$(ASM_SUFFIX) \ $(NULL) endif diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build index 521af421a0c..ddf84bf7df0 100644 --- a/gfx/ycbcr/moz.build +++ b/gfx/ycbcr/moz.build @@ -13,3 +13,55 @@ EXPORTS += [ 'yuv_row.h', ] +CPP_SOURCES += [ + 'ycbcr_to_rgb565.cpp', + 'yuv_convert.cpp', + 'yuv_row_c.cpp', + 'yuv_row_table.cpp', +] + +if CONFIG['INTEL_ARCHITECTURE']: + CPP_SOURCES += [ + 'yuv_convert_sse2.cpp', + ] + + # MSVC doesn't support MMX when targeting AMD64. + if CONFIG['_MSC_VER']: + if CONFIG['OS_TEST'] != 'x86_64': + CPP_SOURCES += [ + 'yuv_convert_mmx.cpp', + ] + else: + CPP_SOURCES += [ + 'yuv_convert_mmx.cpp', + ] + +if CONFIG['_MSC_VER']: + if CONFIG['OS_TEST'] == 'x86_64': + if CONFIG['_MSC_VER'] == '1400': + # VC8 doesn't support some SSE2 built-in functions + CPP_SOURCES += [ + 'yuv_row_win.cpp', + ] + else: + CPP_SOURCES += [ + 'yuv_row_win64.cpp', + ] + else: + CPP_SOURCES += [ + 'yuv_row_win.cpp', + ] +elif CONFIG['OS_ARCH'] in ('Linux', 'SunOS', 'Darwin', 'DragonFly', + 'FreeBSD', 'NetBSD', 'OpenBSD'): + CPP_SOURCES += [ + 'yuv_row_posix.cpp', + ] +else: + CPP_SOURCES += [ + 'yuv_row_other.cpp', + ] + +if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']: + CPP_SOURCES += [ + 'yuv_convert_arm.cpp', + ] diff --git a/hal/Makefile.in b/hal/Makefile.in index d5e3282233f..7d3b8d44399 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -25,125 +25,17 @@ LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - Hal.cpp \ - SandboxHal.cpp \ - WindowIdentifier.cpp \ - HalWakeLock.cpp \ - $(NULL) - -ifeq (stub,$(MOZ_GAMEPAD_BACKEND)) -CPPSRCS += FallbackGamepad.cpp -endif -ifeq (cocoa,$(MOZ_GAMEPAD_BACKEND)) -CPPSRCS += CocoaGamepad.cpp -endif -ifeq (windows,$(MOZ_GAMEPAD_BACKEND)) -CPPSRCS += WindowsGamepad.cpp -endif -ifeq (linux,$(MOZ_GAMEPAD_BACKEND)) -CPPSRCS += LinuxGamepad.cpp -endif - -ifeq (android,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - AndroidHal.cpp \ - AndroidSensor.cpp \ - FallbackPower.cpp \ - FallbackAlarm.cpp \ - $(NULL) -else ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - GonkHal.cpp \ - LinuxPower.cpp \ - GonkSensor.cpp \ - UeventPoller.cpp \ - GonkSwitch.cpp \ - GonkFMRadio.cpp \ - GonkDiskSpaceWatcher.cpp \ - $(NULL) -else ifeq (Linux,$(OS_TARGET)) -CPPSRCS += \ - LinuxPower.cpp \ - FallbackScreenConfiguration.cpp \ - FallbackSensor.cpp \ - FallbackVibration.cpp \ - FallbackAlarm.cpp \ - $(NULL) -ifdef MOZ_ENABLE_DBUS -CPPSRCS += UPowerClient.cpp -else -CPPSRCS += FallbackBattery.cpp -endif -else ifeq (WINNT,$(OS_TARGET)) -CPPSRCS += \ - WindowsBattery.cpp \ - WindowsSensor.cpp \ - FallbackVibration.cpp \ - FallbackScreenConfiguration.cpp \ - FallbackPower.cpp \ - FallbackAlarm.cpp \ - $(NULL) -else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - CocoaBattery.cpp \ - FallbackVibration.cpp \ - FallbackPower.cpp \ - FallbackScreenConfiguration.cpp \ - FallbackAlarm.cpp \ - $(NULL) +ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) CMMSRCS += \ CocoaSensor.mm \ smslib.mm \ $(NULL) -else ifneq (,$(filter OpenBSD NetBSD FreeBSD DragonFly,$(OS_TARGET))) -CPPSRCS += \ - FallbackSensor.cpp \ - FallbackVibration.cpp \ - FallbackPower.cpp \ - FallbackScreenConfiguration.cpp \ - FallbackAlarm.cpp \ - $(NULL) -ifdef MOZ_ENABLE_DBUS -CPPSRCS += UPowerClient.cpp -else -CPPSRCS += FallbackBattery.cpp -endif -else -CPPSRCS += \ - FallbackBattery.cpp \ - FallbackSensor.cpp \ - FallbackVibration.cpp \ - FallbackPower.cpp \ - FallbackScreenConfiguration.cpp \ - FallbackAlarm.cpp \ - $(NULL) endif ifdef MOZ_GAMEPAD LOCAL_INCLUDES = -I$(topsrcdir)/dom/base endif -# Fallbacks for backends implemented on Gonk only. -ifneq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{ -CPPSRCS += \ - FallbackLights.cpp \ - FallbackTime.cpp \ - FallbackWakeLocks.cpp \ - FallbackSwitch.cpp \ - FallbackScreenPower.cpp \ - FallbackProcessPriority.cpp \ - FallbackFMRadio.cpp \ - FallbackFactoryReset.cpp \ - FallbackDiskSpaceWatcher.cpp \ - $(NULL) -endif #} - -# Fallbacks for backends implemented on Android only. -ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += FallbackNetwork.cpp -endif - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/hal/moz.build b/hal/moz.build index 100e25b1815..4c47584ec55 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -19,3 +19,122 @@ EXPORTS.mozilla += [ 'HalWakeLock.h', ] +CPP_SOURCES += [ + 'Hal.cpp', + 'HalWakeLock.cpp', + 'SandboxHal.cpp', + 'WindowIdentifier.cpp', +] + +if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub': + CPP_SOURCES += [ + 'FallbackGamepad.cpp' + ] +elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa': + CPP_SOURCES += [ + 'CocoaGamepad.cpp' + ] +elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows': + CPP_SOURCES += [ + 'WindowsGamepad.cpp' + ] +elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux': + CPP_SOURCES += [ + 'LinuxGamepad.cpp' + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + CPP_SOURCES += [ + 'AndroidHal.cpp', + 'AndroidSensor.cpp', + 'FallbackPower.cpp', + 'FallbackAlarm.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + CPP_SOURCES += [ + 'GonkHal.cpp', + 'LinuxPower.cpp', + 'GonkSensor.cpp', + 'UeventPoller.cpp', + 'GonkSwitch.cpp', + 'GonkFMRadio.cpp', + 'GonkDiskSpaceWatcher.cpp', + ] +elif CONFIG['OS_TARGET'] == 'Linux': + CPP_SOURCES += [ + 'LinuxPower.cpp', + 'FallbackScreenConfiguration.cpp', + 'FallbackSensor.cpp', + 'FallbackVibration.cpp', + 'FallbackAlarm.cpp', + ] + if CONFIG['MOZ_ENABLE_DBUS']: + CPP_SOURCES += [ + 'UPowerClient.cpp' + ] + else: + CPP_SOURCES += [ + 'FallbackBattery.cpp' + ] +elif CONFIG['OS_TARGET'] == 'WINNT': + CPP_SOURCES += [ + 'WindowsBattery.cpp', + 'WindowsSensor.cpp', + 'FallbackVibration.cpp', + 'FallbackScreenConfiguration.cpp', + 'FallbackPower.cpp', + 'FallbackAlarm.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CPP_SOURCES += [ + 'CocoaBattery.cpp', + 'FallbackVibration.cpp', + 'FallbackPower.cpp', + 'FallbackScreenConfiguration.cpp', + 'FallbackAlarm.cpp', + ] +elif CONFIG['OS_TARGET'] in ('OpenBSD', 'NetBSD', 'FreeBSD', 'DragonFly'): + CPP_SOURCES += [ + 'FallbackSensor.cpp', + 'FallbackVibration.cpp', + 'FallbackPower.cpp', + 'FallbackScreenConfiguration.cpp', + 'FallbackAlarm.cpp', + ] + if CONFIG['MOZ_ENABLE_DBUS']: + CPP_SOURCES += [ + 'UPowerClient.cpp' + ] + else: + CPP_SOURCES += [ + 'FallbackBattery.cpp' + ] +else: + CPP_SOURCES += [ + 'FallbackBattery.cpp', + 'FallbackSensor.cpp', + 'FallbackVibration.cpp', + 'FallbackPower.cpp', + 'FallbackScreenConfiguration.cpp', + 'FallbackAlarm.cpp', + ] + +# Fallbacks for backends implemented on Gonk only. +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'FallbackLights.cpp', + 'FallbackTime.cpp', + 'FallbackWakeLocks.cpp', + 'FallbackSwitch.cpp', + 'FallbackScreenPower.cpp', + 'FallbackProcessPriority.cpp', + 'FallbackFMRadio.cpp', + 'FallbackFactoryReset.cpp', + 'FallbackDiskSpaceWatcher.cpp', + ] + +# Fallbacks for backends implemented on Android only. +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': + CPP_SOURCES += [ + 'FallbackNetwork.cpp' + ] diff --git a/image/build/Makefile.in b/image/build/Makefile.in index 3c54513f0a3..b75692907cd 100644 --- a/image/build/Makefile.in +++ b/image/build/Makefile.in @@ -17,10 +17,6 @@ MODULE_NAME = nsImageLib2Module LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsImageModule.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I. \ -I$(srcdir)/../src \ diff --git a/image/build/moz.build b/image/build/moz.build index 13cedf11b6e..b4d8795ef7e 100644 --- a/image/build/moz.build +++ b/image/build/moz.build @@ -6,3 +6,7 @@ MODULE = 'imglib2' +CPP_SOURCES += [ + 'nsImageModule.cpp', +] + diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in index 2bc372a85cc..422ae254afb 100644 --- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -16,15 +16,6 @@ MODULE_NAME = nsDecodersModule LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - -CPPSRCS = nsPNGDecoder.cpp nsJPEGDecoder.cpp nsGIFDecoder2.cpp \ - nsBMPDecoder.cpp nsICODecoder.cpp nsIconDecoder.cpp \ - $(NULL) - -ifdef MOZ_WBMP -CPPSRCS += nsWBMPDecoder.cpp -endif - CSRCS = iccjpeg.c \ $(NULL) diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in index 9a5ab4223b3..02a822867ba 100644 --- a/image/decoders/icon/Makefile.in +++ b/image/decoders/icon/Makefile.in @@ -41,12 +41,6 @@ ifeq ($(OS_TARGET),Android) PLATFORM = android endif -CPPSRCS = \ - nsIconURI.cpp \ - nsIconModule.cpp \ - nsIconProtocolHandler.cpp \ - $(NULL) - SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX) LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM) diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in index 6eddc9b7d3f..f46d73036a8 100644 --- a/image/decoders/icon/android/Makefile.in +++ b/image/decoders/icon/android/Makefile.in @@ -13,8 +13,6 @@ LIBRARY_NAME = imgiconandroid_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = nsIconChannel.cpp - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build index fa2d5daa3d2..dd14f43309f 100644 --- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgicon' +CPP_SOURCES += [ + 'nsIconChannel.cpp', +] + diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in index c850823346c..cfe0f7488a0 100644 --- a/image/decoders/icon/gtk/Makefile.in +++ b/image/decoders/icon/gtk/Makefile.in @@ -14,8 +14,6 @@ LIBRARY_NAME = imgicongtk_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = nsIconChannel.cpp - ifdef MOZ_ENABLE_GNOMEUI LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS) else diff --git a/image/decoders/icon/gtk/moz.build b/image/decoders/icon/gtk/moz.build index fa2d5daa3d2..dd14f43309f 100644 --- a/image/decoders/icon/gtk/moz.build +++ b/image/decoders/icon/gtk/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgicon' +CPP_SOURCES += [ + 'nsIconChannel.cpp', +] + diff --git a/image/decoders/icon/moz.build b/image/decoders/icon/moz.build index 486a4fcc504..76f7ffb2d8c 100644 --- a/image/decoders/icon/moz.build +++ b/image/decoders/icon/moz.build @@ -10,3 +10,9 @@ XPIDL_SOURCES += [ MODULE = 'imgicon' +CPP_SOURCES += [ + 'nsIconModule.cpp', + 'nsIconProtocolHandler.cpp', + 'nsIconURI.cpp', +] + diff --git a/image/decoders/icon/os2/Makefile.in b/image/decoders/icon/os2/Makefile.in index 6c5947d2001..98fa432e8e3 100644 --- a/image/decoders/icon/os2/Makefile.in +++ b/image/decoders/icon/os2/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = imgiconos2_s LIBXUL_LIBRARY = 1 - -CPPSRCS = nsIconChannel.cpp - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/image/decoders/icon/os2/moz.build b/image/decoders/icon/os2/moz.build index fa2d5daa3d2..dd14f43309f 100644 --- a/image/decoders/icon/os2/moz.build +++ b/image/decoders/icon/os2/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgicon' +CPP_SOURCES += [ + 'nsIconChannel.cpp', +] + diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in index 53316d58de6..9868c78f94e 100644 --- a/image/decoders/icon/qt/Makefile.in +++ b/image/decoders/icon/qt/Makefile.in @@ -13,8 +13,6 @@ LIBRARY_NAME = imgiconqt_s LIBXUL_LIBRARY = 1 -CPPSRCS = nsIconChannel.cpp - LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/image/decoders/icon/qt/moz.build b/image/decoders/icon/qt/moz.build index 2731e53c456..efbd2f3da73 100644 --- a/image/decoders/icon/qt/moz.build +++ b/image/decoders/icon/qt/moz.build @@ -8,3 +8,7 @@ DIRS += ['public'] MODULE = 'imgicon' +CPP_SOURCES += [ + 'nsIconChannel.cpp', +] + diff --git a/image/decoders/icon/win/Makefile.in b/image/decoders/icon/win/Makefile.in index a9b66ace7aa..0ffc988cff5 100644 --- a/image/decoders/icon/win/Makefile.in +++ b/image/decoders/icon/win/Makefile.in @@ -14,9 +14,6 @@ LIBRARY_NAME = imgiconwin_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - -CPPSRCS = nsIconChannel.cpp - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/image/decoders/icon/win/moz.build b/image/decoders/icon/win/moz.build index fa2d5daa3d2..dd14f43309f 100644 --- a/image/decoders/icon/win/moz.build +++ b/image/decoders/icon/win/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgicon' +CPP_SOURCES += [ + 'nsIconChannel.cpp', +] + diff --git a/image/decoders/moz.build b/image/decoders/moz.build index 94fde6afd0d..ff225c66279 100644 --- a/image/decoders/moz.build +++ b/image/decoders/moz.build @@ -25,3 +25,16 @@ elif toolkit == 'android': MODULE = 'imgdecoders' +CPP_SOURCES += [ + 'nsBMPDecoder.cpp', + 'nsGIFDecoder2.cpp', + 'nsICODecoder.cpp', + 'nsIconDecoder.cpp', + 'nsJPEGDecoder.cpp', + 'nsPNGDecoder.cpp', +] + +if CONFIG['MOZ_WBMP']: + CPP_SOURCES += [ + 'nsWBMPDecoder.cpp', + ] diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in index a55d4e4f222..addd4675328 100644 --- a/image/encoders/bmp/Makefile.in +++ b/image/encoders/bmp/Makefile.in @@ -17,8 +17,6 @@ FAIL_ON_WARNINGS = 1 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ -CPPSRCS = nsBMPEncoder.cpp - include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build index edf57d5653e..21cf13cca82 100644 --- a/image/encoders/bmp/moz.build +++ b/image/encoders/bmp/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgbmpe' +CPP_SOURCES += [ + 'nsBMPEncoder.cpp', +] + diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in index 2f9cff56a7a..0cfb33c9d5d 100644 --- a/image/encoders/ico/Makefile.in +++ b/image/encoders/ico/Makefile.in @@ -20,8 +20,6 @@ LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/ LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/ -CPPSRCS = nsICOEncoder.cpp - include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build index 2bbb7b9f44e..5e0abdd6af2 100644 --- a/image/encoders/ico/moz.build +++ b/image/encoders/ico/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgicoe' +CPP_SOURCES += [ + 'nsICOEncoder.cpp', +] + diff --git a/image/encoders/jpeg/Makefile.in b/image/encoders/jpeg/Makefile.in index 12098c2ed0f..de4228b31b4 100644 --- a/image/encoders/jpeg/Makefile.in +++ b/image/encoders/jpeg/Makefile.in @@ -15,8 +15,6 @@ MODULE_NAME = imgEncoderJPEGModule LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = nsJPEGEncoder.cpp - include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/jpeg/moz.build b/image/encoders/jpeg/moz.build index d29698b022a..6705bebc43d 100644 --- a/image/encoders/jpeg/moz.build +++ b/image/encoders/jpeg/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgjpege' +CPP_SOURCES += [ + 'nsJPEGEncoder.cpp', +] + diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in index 8819a75e2f1..85cdcfdda60 100644 --- a/image/encoders/png/Makefile.in +++ b/image/encoders/png/Makefile.in @@ -21,8 +21,6 @@ DEFINES += -DMOZ_PNG_WRITE \ LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ -CPPSRCS = nsPNGEncoder.cpp - include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/png/moz.build b/image/encoders/png/moz.build index c6fe3b56e8f..f6e595a4292 100644 --- a/image/encoders/png/moz.build +++ b/image/encoders/png/moz.build @@ -6,3 +6,7 @@ MODULE = 'imgpnge' +CPP_SOURCES += [ + 'nsPNGEncoder.cpp', +] + diff --git a/image/src/Makefile.in b/image/src/Makefile.in index 0d8f6c89a14..6f5c175db4f 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -16,29 +16,6 @@ MODULE_NAME = nsImageLib2Module LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - -CPPSRCS = \ - Image.cpp \ - ImageFactory.cpp \ - ImageMetadata.cpp \ - ImageOps.cpp \ - ImageWrapper.cpp \ - ClippedImage.cpp \ - Decoder.cpp \ - DiscardTracker.cpp \ - FrozenImage.cpp \ - RasterImage.cpp \ - ScriptedNotificationObserver.cpp \ - SVGDocumentWrapper.cpp \ - VectorImage.cpp \ - imgFrame.cpp \ - imgLoader.cpp \ - imgRequest.cpp \ - imgRequestProxy.cpp \ - imgTools.cpp \ - imgStatusTracker.cpp \ - $(NULL) - # We need to instantiate the decoders LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders diff --git a/image/src/moz.build b/image/src/moz.build index 38db8f492ae..2e966d62ca5 100644 --- a/image/src/moz.build +++ b/image/src/moz.build @@ -13,3 +13,25 @@ EXPORTS += [ 'imgRequestProxy.h', ] +CPP_SOURCES += [ + 'ClippedImage.cpp', + 'Decoder.cpp', + 'DiscardTracker.cpp', + 'FrozenImage.cpp', + 'Image.cpp', + 'ImageFactory.cpp', + 'ImageMetadata.cpp', + 'ImageOps.cpp', + 'ImageWrapper.cpp', + 'RasterImage.cpp', + 'SVGDocumentWrapper.cpp', + 'ScriptedNotificationObserver.cpp', + 'VectorImage.cpp', + 'imgFrame.cpp', + 'imgLoader.cpp', + 'imgRequest.cpp', + 'imgRequestProxy.cpp', + 'imgStatusTracker.cpp', + 'imgTools.cpp', +] + diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index aba7903f7cd..41f4335533e 100644 --- a/intl/build/Makefile.in +++ b/intl/build/Makefile.in @@ -15,11 +15,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsI18nModule LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsI18nModule.cpp \ - $(NULL) - # see also intl/locale/src/Makefile.in ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT))) LOCALE_DIR = $(MOZ_WIDGET_TOOLKIT) diff --git a/intl/build/moz.build b/intl/build/moz.build index 6e2471c1f5c..b1c471c3f93 100644 --- a/intl/build/moz.build +++ b/intl/build/moz.build @@ -6,3 +6,7 @@ MODULE = 'i18n' +CPP_SOURCES += [ + 'nsI18nModule.cpp', +] + diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in index 6e29494c847..d49cc08cb4a 100644 --- a/intl/chardet/src/Makefile.in +++ b/intl/chardet/src/Makefile.in @@ -17,9 +17,4 @@ MODULE_NAME = nsChardetModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCyrillicDetector.cpp \ - nsChardetModule.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/intl/chardet/src/moz.build b/intl/chardet/src/moz.build index eef1b390e46..b55831698a4 100644 --- a/intl/chardet/src/moz.build +++ b/intl/chardet/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'chardet' +CPP_SOURCES += [ + 'nsChardetModule.cpp', + 'nsCyrillicDetector.cpp', +] + diff --git a/intl/hyphenation/src/Makefile.in b/intl/hyphenation/src/Makefile.in index e08427f3762..41f189c6a34 100644 --- a/intl/hyphenation/src/Makefile.in +++ b/intl/hyphenation/src/Makefile.in @@ -16,9 +16,4 @@ LIBXUL_LIBRARY = 1 CSRCS = hyphen.c \ $(NULL) -CPPSRCS = nsHyphenator.cpp \ - nsHyphenationManager.cpp \ - hnjstdio.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/intl/hyphenation/src/moz.build b/intl/hyphenation/src/moz.build index e6c45d6e1e4..5625310b52b 100644 --- a/intl/hyphenation/src/moz.build +++ b/intl/hyphenation/src/moz.build @@ -6,3 +6,9 @@ MODULE = 'hyphenation' +CPP_SOURCES += [ + 'hnjstdio.cpp', + 'nsHyphenationManager.cpp', + 'nsHyphenator.cpp', +] + diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index 217d98cf876..a005885b101 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -18,16 +18,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT), qt) OS_INCLUDES += $(MOZ_QT_CFLAGS) endif -CPPSRCS = \ - nsCollation.cpp \ - nsScriptableDateFormat.cpp \ - nsLanguageAtomService.cpp \ - nsLocale.cpp \ - nsLocaleService.cpp \ - nsCharsetAlias.cpp \ - nsUConvPropertySearch.cpp \ - $(NULL) - EXPORT_RESOURCE = \ $(srcdir)/langGroups.properties \ $(srcdir)/language.properties \ diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in index c68fec6a4f4..2a5ea2054d2 100644 --- a/intl/locale/src/mac/Makefile.in +++ b/intl/locale/src/mac/Makefile.in @@ -14,12 +14,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCollationMacUC.cpp \ - nsDateTimeFormatMac.cpp \ - nsMacCharset.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/mac/moz.build b/intl/locale/src/mac/moz.build index 52481c1f169..589b9db5fde 100644 --- a/intl/locale/src/mac/moz.build +++ b/intl/locale/src/mac/moz.build @@ -6,3 +6,9 @@ MODULE = 'locale' +CPP_SOURCES += [ + 'nsCollationMacUC.cpp', + 'nsDateTimeFormatMac.cpp', + 'nsMacCharset.cpp', +] + diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build index c42d65df077..a76e51d67b8 100644 --- a/intl/locale/src/moz.build +++ b/intl/locale/src/moz.build @@ -19,3 +19,13 @@ EXPORTS += [ 'nsCollation.h', ] +CPP_SOURCES += [ + 'nsCharsetAlias.cpp', + 'nsCollation.cpp', + 'nsLanguageAtomService.cpp', + 'nsLocale.cpp', + 'nsLocaleService.cpp', + 'nsScriptableDateFormat.cpp', + 'nsUConvPropertySearch.cpp', +] + diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in index 237cbf54ec0..46f9e93befa 100644 --- a/intl/locale/src/os2/Makefile.in +++ b/intl/locale/src/os2/Makefile.in @@ -16,14 +16,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsOS2Locale.cpp \ - nsCollationOS2.cpp \ - nsDateTimeFormatOS2.cpp \ - nsOS2Charset.cpp \ - $(NULL) - - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/os2/moz.build b/intl/locale/src/os2/moz.build index 52481c1f169..8f8e1a327b6 100644 --- a/intl/locale/src/os2/moz.build +++ b/intl/locale/src/os2/moz.build @@ -6,3 +6,10 @@ MODULE = 'locale' +CPP_SOURCES += [ + 'nsCollationOS2.cpp', + 'nsDateTimeFormatOS2.cpp', + 'nsOS2Charset.cpp', + 'nsOS2Locale.cpp', +] + diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in index 824d04a9749..84cb3a8a152 100644 --- a/intl/locale/src/unix/Makefile.in +++ b/intl/locale/src/unix/Makefile.in @@ -14,19 +14,6 @@ LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB= 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsCollationUnix.cpp \ - nsDateTimeFormatUnix.cpp \ - nsPosixLocale.cpp \ - $(NULL) - -ifeq (Android,$(OS_TARGET)) -CPPSRCS += nsAndroidCharset.cpp -else -CPPSRCS += nsUNIXCharset.cpp -endif - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/unix/moz.build b/intl/locale/src/unix/moz.build index 52481c1f169..cde00b81121 100644 --- a/intl/locale/src/unix/moz.build +++ b/intl/locale/src/unix/moz.build @@ -6,3 +6,17 @@ MODULE = 'locale' +CPP_SOURCES += [ + 'nsCollationUnix.cpp', + 'nsDateTimeFormatUnix.cpp', + 'nsPosixLocale.cpp', +] + +if CONFIG['OS_TARGET'] == 'Android': + CPP_SOURCES += [ + 'nsAndroidCharset.cpp', + ] +else: + CPP_SOURCES += [ + 'nsUNIXCharset.cpp', + ] diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in index 18142531ed8..73ad696f048 100644 --- a/intl/locale/src/windows/Makefile.in +++ b/intl/locale/src/windows/Makefile.in @@ -15,13 +15,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCollationWin.cpp \ - nsDateTimeFormatWin.cpp \ - nsWin32Locale.cpp \ - nsWinCharset.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/windows/moz.build b/intl/locale/src/windows/moz.build index 52481c1f169..58b11809513 100644 --- a/intl/locale/src/windows/moz.build +++ b/intl/locale/src/windows/moz.build @@ -6,3 +6,10 @@ MODULE = 'locale' +CPP_SOURCES += [ + 'nsCollationWin.cpp', + 'nsDateTimeFormatWin.cpp', + 'nsWin32Locale.cpp', + 'nsWinCharset.cpp', +] + diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index f59e69c7900..df58ab3519c 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -16,31 +16,12 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsJISx4051LineBreaker.cpp \ - nsSampleWordBreaker.cpp \ - nsSemanticUnitScanner.cpp \ - $(NULL) - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -CPPSRCS += \ - nsPangoBreaker.cpp \ - $(NULL) else ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += \ - nsUniscribeBreaker.cpp \ - $(NULL) else ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa) -CPPSRCS += \ - nsCarbonBreaker.cpp \ - $(NULL) else -CPPSRCS += \ - nsRuleBreaker.cpp \ - $(NULL) - CSRCS = rulebrk.c endif endif diff --git a/intl/lwbrk/src/moz.build b/intl/lwbrk/src/moz.build index 4914e87390a..f540f96f125 100644 --- a/intl/lwbrk/src/moz.build +++ b/intl/lwbrk/src/moz.build @@ -6,3 +6,25 @@ MODULE = 'lwbrk' +CPP_SOURCES += [ + 'nsJISx4051LineBreaker.cpp', + 'nsSampleWordBreaker.cpp', + 'nsSemanticUnitScanner.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'nsPangoBreaker.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'nsUniscribeBreaker.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CPP_SOURCES += [ + 'nsCarbonBreaker.cpp', + ] +else: + CPP_SOURCES += [ + 'nsRuleBreaker.cpp', + ] diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in index 2e474fc6e09..64e5be163cb 100644 --- a/intl/strres/src/Makefile.in +++ b/intl/strres/src/Makefile.in @@ -16,10 +16,4 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsStringBundle.cpp \ - nsStringBundleTextOverride.cpp \ - $(NULL) - - include $(topsrcdir)/config/rules.mk diff --git a/intl/strres/src/moz.build b/intl/strres/src/moz.build index 758dcf6deba..639ea6d0758 100644 --- a/intl/strres/src/moz.build +++ b/intl/strres/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'intl' +CPP_SOURCES += [ + 'nsStringBundle.cpp', + 'nsStringBundleTextOverride.cpp', +] + diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index cf171273a78..4c8352d03bb 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -17,30 +17,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsUConvModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsUConvModule.cpp \ - nsConverterInputStream.cpp \ - nsConverterOutputStream.cpp \ - nsTextToSubURI.cpp \ - nsCharsetConverterManager.cpp \ - nsUTF8ConverterService.cpp \ - nsUTF8ToUnicode.cpp \ - nsUnicodeToUTF8.cpp \ - nsScriptableUConv.cpp \ - nsISO88591ToUnicode.cpp \ - nsCP1252ToUnicode.cpp \ - nsMacRomanToUnicode.cpp \ - nsUnicodeToISO88591.cpp \ - nsUnicodeToCP1252.cpp \ - nsUnicodeToMacRoman.cpp \ - $(NULL) - -# Are we targeting x86-32 or x86-64? If so, we want to include the SSE2 -# version of nsUTF8ToUnicodeSSE2.cpp. -ifneq (,$(INTEL_ARCHITECTURE)) -CPPSRCS += nsUTF8ToUnicodeSSE2.cpp -endif - LOCAL_INCLUDES = -I$(srcdir)/../util \ -I$(srcdir)/../ucvlatin \ -I$(srcdir)/../ucvibm \ diff --git a/intl/uconv/src/moz.build b/intl/uconv/src/moz.build index 5c414eb753e..04e56cf7f8e 100644 --- a/intl/uconv/src/moz.build +++ b/intl/uconv/src/moz.build @@ -6,3 +6,25 @@ MODULE = 'uconv' +CPP_SOURCES += [ + 'nsCP1252ToUnicode.cpp', + 'nsCharsetConverterManager.cpp', + 'nsConverterInputStream.cpp', + 'nsConverterOutputStream.cpp', + 'nsISO88591ToUnicode.cpp', + 'nsMacRomanToUnicode.cpp', + 'nsScriptableUConv.cpp', + 'nsTextToSubURI.cpp', + 'nsUConvModule.cpp', + 'nsUTF8ConverterService.cpp', + 'nsUTF8ToUnicode.cpp', + 'nsUnicodeToCP1252.cpp', + 'nsUnicodeToISO88591.cpp', + 'nsUnicodeToMacRoman.cpp', + 'nsUnicodeToUTF8.cpp', +] + +if CONFIG['INTEL_ARCHITECTURE']: + CPP_SOURCES += [ + 'nsUTF8ToUnicodeSSE2.cpp', + ] diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index d36008ef85d..8f044f6d325 100644 --- a/intl/uconv/ucvcn/Makefile.in +++ b/intl/uconv/ucvcn/Makefile.in @@ -15,17 +15,6 @@ FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsUnicodeToGB2312V2.cpp \ - nsGBKToUnicode.cpp \ - nsUnicodeToGBK.cpp \ - nsISO2022CNToUnicode.cpp \ - nsUnicodeToISO2022CN.cpp \ - nsHZToUnicode.cpp \ - nsUnicodeToHZ.cpp \ - nsGBKConvUtil.cpp \ - $(NULL) - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvcn/moz.build b/intl/uconv/ucvcn/moz.build index fbf1d702d4f..6251807321a 100644 --- a/intl/uconv/ucvcn/moz.build +++ b/intl/uconv/ucvcn/moz.build @@ -10,3 +10,14 @@ EXPORTS += [ 'nsUCvCnCID.h', ] +CPP_SOURCES += [ + 'nsGBKConvUtil.cpp', + 'nsGBKToUnicode.cpp', + 'nsHZToUnicode.cpp', + 'nsISO2022CNToUnicode.cpp', + 'nsUnicodeToGB2312V2.cpp', + 'nsUnicodeToGBK.cpp', + 'nsUnicodeToHZ.cpp', + 'nsUnicodeToISO2022CN.cpp', +] + diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index 1ca28ef5fdf..8ae760e0e31 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -14,33 +14,6 @@ LIBRARY_NAME = ucvibm_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsCP850ToUnicode.cpp \ - nsCP852ToUnicode.cpp \ - nsCP855ToUnicode.cpp \ - nsCP857ToUnicode.cpp \ - nsCP862ToUnicode.cpp \ - nsCP864ToUnicode.cpp \ - nsUnicodeToCP850.cpp \ - nsUnicodeToCP852.cpp \ - nsUnicodeToCP855.cpp \ - nsUnicodeToCP857.cpp \ - nsUnicodeToCP862.cpp \ - nsUnicodeToCP864.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),OS2) -CPPSRCS += \ - nsCP869ToUnicode.cpp \ - nsUnicodeToCP869.cpp \ - nsCP1125ToUnicode.cpp \ - nsUnicodeToCP1125.cpp \ - nsCP1131ToUnicode.cpp \ - nsUnicodeToCP1131.cpp \ - $(NULL) -endif - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvibm/moz.build b/intl/uconv/ucvibm/moz.build index 69e88aaa84a..ce7a2007c73 100644 --- a/intl/uconv/ucvibm/moz.build +++ b/intl/uconv/ucvibm/moz.build @@ -10,3 +10,27 @@ EXPORTS += [ 'nsUCvIBMCID.h', ] +CPP_SOURCES += [ + 'nsCP850ToUnicode.cpp', + 'nsCP852ToUnicode.cpp', + 'nsCP855ToUnicode.cpp', + 'nsCP857ToUnicode.cpp', + 'nsCP862ToUnicode.cpp', + 'nsCP864ToUnicode.cpp', + 'nsUnicodeToCP850.cpp', + 'nsUnicodeToCP852.cpp', + 'nsUnicodeToCP855.cpp', + 'nsUnicodeToCP857.cpp', + 'nsUnicodeToCP862.cpp', + 'nsUnicodeToCP864.cpp', +] + +if CONFIG['OS_ARCH'] == 'OS2': + CPP_SOURCES += [ + 'nsCP869ToUnicode.cpp', + 'nsUnicodeToCP869.cpp', + 'nsCP1125ToUnicode.cpp', + 'nsUnicodeToCP1125.cpp', + 'nsCP1131ToUnicode.cpp', + 'nsUnicodeToCP1131.cpp', + ] diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in index 1a5d854e930..dd02945cd25 100644 --- a/intl/uconv/ucvja/Makefile.in +++ b/intl/uconv/ucvja/Makefile.in @@ -15,16 +15,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsJapaneseToUnicode.cpp \ - nsUnicodeToSJIS.cpp \ - nsUnicodeToEUCJP.cpp \ - nsUnicodeToISO2022JP.cpp \ - nsUnicodeToJISx0201.cpp \ - $(NULL) - -#SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvja/moz.build b/intl/uconv/ucvja/moz.build index c59f6e21746..25bf4535bb3 100644 --- a/intl/uconv/ucvja/moz.build +++ b/intl/uconv/ucvja/moz.build @@ -11,3 +11,11 @@ EXPORTS += [ 'nsUCVJACID.h', ] +CPP_SOURCES += [ + 'nsJapaneseToUnicode.cpp', + 'nsUnicodeToEUCJP.cpp', + 'nsUnicodeToISO2022JP.cpp', + 'nsUnicodeToJISx0201.cpp', + 'nsUnicodeToSJIS.cpp', +] + diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index bcfd06e0d9a..245b0055fb4 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -15,14 +15,6 @@ FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsISO2022KRToUnicode.cpp \ - nsCP949ToUnicode.cpp \ - nsUnicodeToCP949.cpp \ - nsUnicodeToJohab.cpp \ - nsJohabToUnicode.cpp \ - $(NULL) - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvko/moz.build b/intl/uconv/ucvko/moz.build index 218da099098..d91da64e2c9 100644 --- a/intl/uconv/ucvko/moz.build +++ b/intl/uconv/ucvko/moz.build @@ -10,3 +10,11 @@ EXPORTS += [ 'nsUCvKOCID.h', ] +CPP_SOURCES += [ + 'nsCP949ToUnicode.cpp', + 'nsISO2022KRToUnicode.cpp', + 'nsJohabToUnicode.cpp', + 'nsUnicodeToCP949.cpp', + 'nsUnicodeToJohab.cpp', +] + diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index 6737c3e2c7b..2395ef8ed90 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -15,123 +15,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsAsciiToUnicode.cpp \ - nsISO88592ToUnicode.cpp \ - nsISO88593ToUnicode.cpp \ - nsISO88594ToUnicode.cpp \ - nsISO88595ToUnicode.cpp \ - nsISO88596ToUnicode.cpp \ - nsISO88596EToUnicode.cpp \ - nsISO88596IToUnicode.cpp \ - nsISO88597ToUnicode.cpp \ - nsISO88598ToUnicode.cpp \ - nsISO88598EToUnicode.cpp \ - nsISO88598IToUnicode.cpp \ - nsISO88599ToUnicode.cpp \ - nsISO885910ToUnicode.cpp \ - nsISO885911ToUnicode.cpp \ - nsISO885913ToUnicode.cpp \ - nsISO885914ToUnicode.cpp \ - nsISO885915ToUnicode.cpp \ - nsISO885916ToUnicode.cpp \ - nsISOIR111ToUnicode.cpp \ - nsCP1250ToUnicode.cpp \ - nsCP1251ToUnicode.cpp \ - nsCP1253ToUnicode.cpp \ - nsCP1254ToUnicode.cpp \ - nsCP1255ToUnicode.cpp \ - nsCP1256ToUnicode.cpp \ - nsCP1257ToUnicode.cpp \ - nsCP1258ToUnicode.cpp \ - nsCP866ToUnicode.cpp \ - nsCP874ToUnicode.cpp \ - nsTIS620ToUnicode.cpp \ - nsKOI8UToUnicode.cpp \ - nsKOI8RToUnicode.cpp \ - nsMacCEToUnicode.cpp \ - nsMacGreekToUnicode.cpp \ - nsMacTurkishToUnicode.cpp \ - nsMacCroatianToUnicode.cpp \ - nsMacRomanianToUnicode.cpp \ - nsMacCyrillicToUnicode.cpp \ - nsMacIcelandicToUnicode.cpp \ - nsMacHebrewToUnicode.cpp \ - nsMacArabicToUnicode.cpp \ - nsMacDevanagariToUnicode.cpp \ - nsMacFarsiToUnicode.cpp \ - nsMacGujaratiToUnicode.cpp \ - nsMacGurmukhiToUnicode.cpp \ - nsARMSCII8ToUnicode.cpp \ - nsTCVN5712ToUnicode.cpp \ - nsVISCIIToUnicode.cpp \ - nsVPSToUnicode.cpp \ - nsUTF7ToUnicode.cpp \ - nsMUTF7ToUnicode.cpp \ - nsUTF16ToUnicode.cpp \ - nsT61ToUnicode.cpp \ - nsUserDefinedToUnicode.cpp \ - nsUnicodeToAscii.cpp \ - nsUnicodeToISO88592.cpp \ - nsUnicodeToISO88593.cpp \ - nsUnicodeToISO88594.cpp \ - nsUnicodeToISO88595.cpp \ - nsUnicodeToISO88596.cpp \ - nsUnicodeToISO88596E.cpp \ - nsUnicodeToISO88596I.cpp \ - nsUnicodeToISO88597.cpp \ - nsUnicodeToISO88598.cpp \ - nsUnicodeToISO88598E.cpp \ - nsUnicodeToISO88598I.cpp \ - nsUnicodeToISO88599.cpp \ - nsUnicodeToISO885910.cpp \ - nsUnicodeToISO885911.cpp \ - nsUnicodeToISO885913.cpp \ - nsUnicodeToISO885914.cpp \ - nsUnicodeToISO885915.cpp \ - nsUnicodeToISO885916.cpp \ - nsUnicodeToISOIR111.cpp \ - nsUnicodeToCP1250.cpp \ - nsUnicodeToCP1251.cpp \ - nsUnicodeToCP1253.cpp \ - nsUnicodeToCP1254.cpp \ - nsUnicodeToCP1255.cpp \ - nsUnicodeToCP1256.cpp \ - nsUnicodeToCP1257.cpp \ - nsUnicodeToCP1258.cpp \ - nsUnicodeToCP874.cpp \ - nsUnicodeToTIS620.cpp \ - nsUnicodeToCP866.cpp \ - nsUnicodeToKOI8R.cpp \ - nsUnicodeToKOI8U.cpp \ - nsUnicodeToMacCE.cpp \ - nsUnicodeToMacGreek.cpp \ - nsUnicodeToMacTurkish.cpp \ - nsUnicodeToMacCroatian.cpp \ - nsUnicodeToMacRomanian.cpp \ - nsUnicodeToMacCyrillic.cpp \ - nsUnicodeToMacIcelandic.cpp \ - nsUnicodeToMacHebrew.cpp \ - nsUnicodeToMacArabic.cpp \ - nsUnicodeToMacDevanagari.cpp \ - nsUnicodeToMacFarsi.cpp \ - nsUnicodeToMacGujarati.cpp \ - nsUnicodeToMacGurmukhi.cpp \ - nsUnicodeToARMSCII8.cpp \ - nsUnicodeToTCVN5712.cpp \ - nsUnicodeToVISCII.cpp \ - nsUnicodeToVPS.cpp \ - nsUnicodeToUTF7.cpp \ - nsUnicodeToMUTF7.cpp \ - nsUnicodeToUTF16.cpp \ - nsUnicodeToT61.cpp \ - nsUnicodeToUserDefined.cpp \ - nsUnicodeToSymbol.cpp \ - nsUnicodeToZapfDingbat.cpp \ - nsUnicodeToAdobeEuro.cpp \ - nsUnicodeToTSCII.cpp \ - $(NULL) - LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvlatin/moz.build b/intl/uconv/ucvlatin/moz.build index ec99ee05485..38aeee6964c 100644 --- a/intl/uconv/ucvlatin/moz.build +++ b/intl/uconv/ucvlatin/moz.build @@ -10,3 +10,120 @@ EXPORTS += [ 'nsUCvLatinCID.h', ] +CPP_SOURCES += [ + 'nsARMSCII8ToUnicode.cpp', + 'nsAsciiToUnicode.cpp', + 'nsCP1250ToUnicode.cpp', + 'nsCP1251ToUnicode.cpp', + 'nsCP1253ToUnicode.cpp', + 'nsCP1254ToUnicode.cpp', + 'nsCP1255ToUnicode.cpp', + 'nsCP1256ToUnicode.cpp', + 'nsCP1257ToUnicode.cpp', + 'nsCP1258ToUnicode.cpp', + 'nsCP866ToUnicode.cpp', + 'nsCP874ToUnicode.cpp', + 'nsISO885910ToUnicode.cpp', + 'nsISO885911ToUnicode.cpp', + 'nsISO885913ToUnicode.cpp', + 'nsISO885914ToUnicode.cpp', + 'nsISO885915ToUnicode.cpp', + 'nsISO885916ToUnicode.cpp', + 'nsISO88592ToUnicode.cpp', + 'nsISO88593ToUnicode.cpp', + 'nsISO88594ToUnicode.cpp', + 'nsISO88595ToUnicode.cpp', + 'nsISO88596EToUnicode.cpp', + 'nsISO88596IToUnicode.cpp', + 'nsISO88596ToUnicode.cpp', + 'nsISO88597ToUnicode.cpp', + 'nsISO88598EToUnicode.cpp', + 'nsISO88598IToUnicode.cpp', + 'nsISO88598ToUnicode.cpp', + 'nsISO88599ToUnicode.cpp', + 'nsISOIR111ToUnicode.cpp', + 'nsKOI8RToUnicode.cpp', + 'nsKOI8UToUnicode.cpp', + 'nsMUTF7ToUnicode.cpp', + 'nsMacArabicToUnicode.cpp', + 'nsMacCEToUnicode.cpp', + 'nsMacCroatianToUnicode.cpp', + 'nsMacCyrillicToUnicode.cpp', + 'nsMacDevanagariToUnicode.cpp', + 'nsMacFarsiToUnicode.cpp', + 'nsMacGreekToUnicode.cpp', + 'nsMacGujaratiToUnicode.cpp', + 'nsMacGurmukhiToUnicode.cpp', + 'nsMacHebrewToUnicode.cpp', + 'nsMacIcelandicToUnicode.cpp', + 'nsMacRomanianToUnicode.cpp', + 'nsMacTurkishToUnicode.cpp', + 'nsT61ToUnicode.cpp', + 'nsTCVN5712ToUnicode.cpp', + 'nsTIS620ToUnicode.cpp', + 'nsUTF16ToUnicode.cpp', + 'nsUTF7ToUnicode.cpp', + 'nsUnicodeToARMSCII8.cpp', + 'nsUnicodeToAdobeEuro.cpp', + 'nsUnicodeToAscii.cpp', + 'nsUnicodeToCP1250.cpp', + 'nsUnicodeToCP1251.cpp', + 'nsUnicodeToCP1253.cpp', + 'nsUnicodeToCP1254.cpp', + 'nsUnicodeToCP1255.cpp', + 'nsUnicodeToCP1256.cpp', + 'nsUnicodeToCP1257.cpp', + 'nsUnicodeToCP1258.cpp', + 'nsUnicodeToCP866.cpp', + 'nsUnicodeToCP874.cpp', + 'nsUnicodeToISO885910.cpp', + 'nsUnicodeToISO885911.cpp', + 'nsUnicodeToISO885913.cpp', + 'nsUnicodeToISO885914.cpp', + 'nsUnicodeToISO885915.cpp', + 'nsUnicodeToISO885916.cpp', + 'nsUnicodeToISO88592.cpp', + 'nsUnicodeToISO88593.cpp', + 'nsUnicodeToISO88594.cpp', + 'nsUnicodeToISO88595.cpp', + 'nsUnicodeToISO88596.cpp', + 'nsUnicodeToISO88596E.cpp', + 'nsUnicodeToISO88596I.cpp', + 'nsUnicodeToISO88597.cpp', + 'nsUnicodeToISO88598.cpp', + 'nsUnicodeToISO88598E.cpp', + 'nsUnicodeToISO88598I.cpp', + 'nsUnicodeToISO88599.cpp', + 'nsUnicodeToISOIR111.cpp', + 'nsUnicodeToKOI8R.cpp', + 'nsUnicodeToKOI8U.cpp', + 'nsUnicodeToMUTF7.cpp', + 'nsUnicodeToMacArabic.cpp', + 'nsUnicodeToMacCE.cpp', + 'nsUnicodeToMacCroatian.cpp', + 'nsUnicodeToMacCyrillic.cpp', + 'nsUnicodeToMacDevanagari.cpp', + 'nsUnicodeToMacFarsi.cpp', + 'nsUnicodeToMacGreek.cpp', + 'nsUnicodeToMacGujarati.cpp', + 'nsUnicodeToMacGurmukhi.cpp', + 'nsUnicodeToMacHebrew.cpp', + 'nsUnicodeToMacIcelandic.cpp', + 'nsUnicodeToMacRomanian.cpp', + 'nsUnicodeToMacTurkish.cpp', + 'nsUnicodeToSymbol.cpp', + 'nsUnicodeToT61.cpp', + 'nsUnicodeToTCVN5712.cpp', + 'nsUnicodeToTIS620.cpp', + 'nsUnicodeToTSCII.cpp', + 'nsUnicodeToUTF16.cpp', + 'nsUnicodeToUTF7.cpp', + 'nsUnicodeToUserDefined.cpp', + 'nsUnicodeToVISCII.cpp', + 'nsUnicodeToVPS.cpp', + 'nsUnicodeToZapfDingbat.cpp', + 'nsUserDefinedToUnicode.cpp', + 'nsVISCIIToUnicode.cpp', + 'nsVPSToUnicode.cpp', +] + diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index 5e67edf52ca..ee2d0a7d202 100644 --- a/intl/uconv/ucvtw/Makefile.in +++ b/intl/uconv/ucvtw/Makefile.in @@ -15,14 +15,6 @@ FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsBIG5ToUnicode.cpp \ - nsUnicodeToBIG5.cpp \ - nsBIG5HKSCSToUnicode.cpp \ - nsUnicodeToBIG5HKSCS.cpp \ - nsUnicodeToHKSCS.cpp \ - $(NULL) - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvtw/moz.build b/intl/uconv/ucvtw/moz.build index d9888d03419..18110501b36 100644 --- a/intl/uconv/ucvtw/moz.build +++ b/intl/uconv/ucvtw/moz.build @@ -10,3 +10,11 @@ EXPORTS += [ 'nsUCvTWCID.h', ] +CPP_SOURCES += [ + 'nsBIG5HKSCSToUnicode.cpp', + 'nsBIG5ToUnicode.cpp', + 'nsUnicodeToBIG5.cpp', + 'nsUnicodeToBIG5HKSCS.cpp', + 'nsUnicodeToHKSCS.cpp', +] + diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index 76f48662fb6..237e323a305 100644 --- a/intl/uconv/ucvtw2/Makefile.in +++ b/intl/uconv/ucvtw2/Makefile.in @@ -15,13 +15,6 @@ FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsEUCTWToUnicode.cpp \ - nsUnicodeToEUCTW.cpp \ - $(NULL) - -#SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvtw2/moz.build b/intl/uconv/ucvtw2/moz.build index a9fd123d525..54176a292e5 100644 --- a/intl/uconv/ucvtw2/moz.build +++ b/intl/uconv/ucvtw2/moz.build @@ -10,3 +10,8 @@ EXPORTS += [ 'nsUCvTW2CID.h', ] +CPP_SOURCES += [ + 'nsEUCTWToUnicode.cpp', + 'nsUnicodeToEUCTW.cpp', +] + diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index aeec6e19a67..818a54bafe5 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -24,12 +24,5 @@ CSRCS = \ umap.c \ $(NULL) -CPPSRCS = \ - nsUCSupport.cpp \ - nsUCConstructors.cpp \ - nsUnicodeDecodeHelper.cpp \ - nsUnicodeEncodeHelper.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/util/moz.build b/intl/uconv/util/moz.build index 5c414eb753e..eba2505a92a 100644 --- a/intl/uconv/util/moz.build +++ b/intl/uconv/util/moz.build @@ -6,3 +6,10 @@ MODULE = 'uconv' +CPP_SOURCES += [ + 'nsUCConstructors.cpp', + 'nsUCSupport.cpp', + 'nsUnicodeDecodeHelper.cpp', + 'nsUnicodeEncodeHelper.cpp', +] + diff --git a/intl/unicharutil/src/Makefile.in b/intl/unicharutil/src/Makefile.in index 5d19371429b..c4e7caf3fda 100644 --- a/intl/unicharutil/src/Makefile.in +++ b/intl/unicharutil/src/Makefile.in @@ -14,12 +14,4 @@ LIBRARY_NAME = ucharucomp_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCaseConversionImp2.cpp \ - nsCategoryImp.cpp \ - nsEntityConverter.cpp \ - nsSaveAsCharset.cpp \ - nsUnicodeNormalizer.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/intl/unicharutil/src/moz.build b/intl/unicharutil/src/moz.build index 53c86e91227..32d5084b4ca 100644 --- a/intl/unicharutil/src/moz.build +++ b/intl/unicharutil/src/moz.build @@ -6,3 +6,11 @@ MODULE = 'unicharutil' +CPP_SOURCES += [ + 'nsCaseConversionImp2.cpp', + 'nsCategoryImp.cpp', + 'nsEntityConverter.cpp', + 'nsSaveAsCharset.cpp', + 'nsUnicodeNormalizer.cpp', +] + diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in index 4de86da572d..693fc3843e5 100644 --- a/intl/unicharutil/tests/Makefile.in +++ b/intl/unicharutil/tests/Makefile.in @@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk USE_STATIC_LIBS = 1 -CPPSRCS = UnicharSelfTest.cpp \ - NormalizationTest.cpp \ - $(NULL) - SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) LIBS = \ diff --git a/intl/unicharutil/tests/moz.build b/intl/unicharutil/tests/moz.build index 2400a0a9793..9fdc9faaa07 100644 --- a/intl/unicharutil/tests/moz.build +++ b/intl/unicharutil/tests/moz.build @@ -7,3 +7,8 @@ MODULE = 'test_intl_unicharutil' XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +CPP_SOURCES += [ + 'NormalizationTest.cpp', + 'UnicharSelfTest.cpp', +] diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in index 38a36452171..4923912ccaf 100644 --- a/intl/unicharutil/util/Makefile.in +++ b/intl/unicharutil/util/Makefile.in @@ -25,13 +25,6 @@ SDK_HEADERS = \ nsUnicharUtils.h \ $(NULL) -CPPSRCS = \ - nsUnicharUtils.cpp \ - nsBidiUtils.cpp \ - nsSpecialCasingData.cpp \ - nsUnicodeProperties.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in index 994deadf104..11740a096af 100644 --- a/intl/unicharutil/util/internal/Makefile.in +++ b/intl/unicharutil/util/internal/Makefile.in @@ -27,8 +27,6 @@ LOCAL_INCLUDES += -I$(srcdir)/.. \ -I$(srcdir)/../../src -CPPSRCS = $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/intl/unicharutil/util/internal/moz.build b/intl/unicharutil/util/internal/moz.build index 53c86e91227..80399112d16 100644 --- a/intl/unicharutil/util/internal/moz.build +++ b/intl/unicharutil/util/internal/moz.build @@ -6,3 +6,7 @@ MODULE = 'unicharutil' +CPP_SOURCES += [ + '$(INTL_UNICHARUTIL_UTIL_LCPPSRCS)', +] + diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build index f0b71b18308..0ab2afb5b15 100644 --- a/intl/unicharutil/util/moz.build +++ b/intl/unicharutil/util/moz.build @@ -15,3 +15,10 @@ EXPORTS += [ 'nsUnicodeScriptCodes.h', ] +CPP_SOURCES += [ + 'nsBidiUtils.cpp', + 'nsSpecialCasingData.cpp', + 'nsUnicharUtils.cpp', + 'nsUnicodeProperties.cpp', +] + diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in index 640ef3f1942..7f9fdad4767 100644 --- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -13,13 +13,8 @@ ifneq ($(dir $(PROGRAM)),./) GENERATED_DIRS = $(dir $(PROGRAM)) endif -CPPSRCS = \ - MozillaRuntimeMain.cpp \ - $(NULL) - ifeq (android,$(MOZ_WIDGET_TOOLKIT)) WRAP_LDFLAGS = -CPPSRCS = MozillaRuntimeMainAndroid.cpp else LIBS += \ $(XPCOM_LIBS) \ diff --git a/ipc/app/moz.build b/ipc/app/moz.build index 7ae35f48cd9..57e72162004 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -8,3 +8,11 @@ MODULE = 'ipc' PROGRAM = CONFIG['MOZ_CHILD_PROCESS_NAME'] +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + CPP_SOURCES += [ + 'MozillaRuntimeMainAndroid.cpp', + ] +else: + CPP_SOURCES += [ + 'MozillaRuntimeMain.cpp', + ] diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index 97ea7e694f3..3753c5b69fa 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -41,142 +41,10 @@ vpath %.mm \ include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -CPPSRCS += \ - at_exit.cc \ - base_paths.cc \ - base_switches.cc \ - command_line.cc \ - debug_util.cc \ - file_path.cc \ - file_util.cc \ - histogram.cc \ - lazy_instance.cc \ - lock.cc \ - logging.cc \ - memory_debug.cc \ - message_loop.cc \ - message_pump_default.cc \ - non_thread_safe.cc \ - path_service.cc \ - pickle.cc \ - rand_util.cc \ - ref_counted.cc \ - revocable_store.cc \ - scoped_temp_dir.cc \ - simple_thread.cc \ - stats_table.cc \ - string_escape.cc \ - string_piece.cc \ - string_util.cc \ - system_monitor.cc \ - thread.cc \ - thread_collision_warner.cc \ - time.cc \ - timer.cc \ - trace_event.cc \ - tracked.cc \ - tracked_objects.cc \ - child_process.cc \ - child_process_host.cc \ - child_process_info.cc \ - child_thread.cc \ - chrome_counters.cc \ - chrome_paths.cc \ - chrome_switches.cc \ - debug_flags.cc \ - env_vars.cc \ - ipc_channel_proxy.cc \ - ipc_logging.cc \ - ipc_message.cc \ - ipc_message_utils.cc \ - ipc_sync_channel.cc \ - ipc_sync_message.cc \ - message_router.cc \ - notification_service.cc \ - task_queue.cc \ - $(NULL) - -ifdef OS_WIN # { - -CPPSRCS += \ - base_paths_win.cc \ - cpu.cc \ - condition_variable_win.cc \ - debug_util_win.cc \ - event_recorder.cc \ - file_util_win.cc \ - file_version_info.cc \ - lock_impl_win.cc \ - idle_timer.cc \ - message_pump_win.cc \ - object_watcher.cc \ - platform_file_win.cc \ - platform_thread_win.cc \ - process_util_win.cc \ - process_win.cc \ - rand_util_win.cc \ - registry.cc \ - shared_memory_win.cc \ - sys_info_win.cc \ - sys_string_conversions_win.cc \ - system_monitor_win.cc \ - thread_local_storage_win.cc \ - thread_local_win.cc \ - time_win.cc \ - waitable_event_watcher_win.cc \ - waitable_event_win.cc \ - win_util.cc \ - chrome_paths_win.cc \ - chrome_constants.cc \ - ipc_channel_win.cc \ - process_watcher_win.cc \ - transport_dib_win.cc \ - $(NULL) - -endif # } OS_WIN - -ifdef _MSC_VER # { - -CPPSRCS += \ - debug_on_start.cc - -endif # } - ifdef OS_POSIX # { - -CPPSRCS += \ - condition_variable_posix.cc \ - debug_util_posix.cc \ - event_recorder_stubs.cc \ - file_descriptor_shuffle.cc \ - file_util_posix.cc \ - lock_impl_posix.cc \ - message_pump_libevent.cc \ - platform_file_posix.cc \ - platform_thread_posix.cc \ - process_posix.cc \ - process_util_posix.cc \ - rand_util_posix.cc \ - shared_memory_posix.cc \ - string16.cc \ - system_monitor_posix.cc \ - sys_info_posix.cc \ - thread_local_posix.cc \ - thread_local_storage_posix.cc \ - waitable_event_posix.cc \ - waitable_event_watcher_posix.cc \ - file_descriptor_set_posix.cc \ - ipc_channel_posix.cc \ - process_watcher_posix_sigchld.cc \ - $(NULL) - ifeq ($(OS_TARGET),Android) DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0 -CPPSRCS += \ - message_pump_android.cc \ - $(NULL) endif # Android - endif # } OS_POSIX ifdef OS_MACOSX # { @@ -198,75 +66,8 @@ CMMSRCS += \ chrome_application_mac.mm \ $(NULL) -CPPSRCS += \ - debug_util_mac.cc \ - hmac_mac.cc \ - idle_timer.cc \ - sys_info_mac.cc \ - time_mac.cc \ - mach_message_source_mac.cc \ - transport_dib_mac.cc \ - $(NULL) - endif # } OS_MACOSX -ifdef OS_LINUX # { - -CPPSRCS += \ - atomicops_internals_x86_gcc.cc \ - base_paths_linux.cc \ - file_version_info_linux.cc \ - idle_timer_none.cc \ - process_util_linux.cc \ - time_posix.cc \ - $(NULL) - -ifdef MOZ_ENABLE_GTK2 -CPPSRCS += \ - message_pump_glib.cc \ - $(NULL) -endif - -ifdef MOZ_ENABLE_QT -MOCSRCS = \ - moc_message_pump_qt.cc \ - $(NULL) - -CPPSRCS += \ - $(MOCSRCS) \ - message_pump_qt.cc \ - $(NULL) -endif - -endif # } OS_LINUX - -ifdef OS_BSD # { - -CPPSRCS += \ - atomicops_internals_x86_gcc.cc \ - process_util_bsd.cc \ - time_posix.cc \ - $(NULL) - -ifdef MOZ_ENABLE_GTK2 -CPPSRCS += \ - message_pump_glib.cc \ - $(NULL) -endif - -ifdef MOZ_ENABLE_QT -MOCSRCS = \ - moc_message_pump_qt.cc \ - $(NULL) - -CPPSRCS += \ - $(MOCSRCS) \ - message_pump_qt.cc \ - $(NULL) -endif - -endif # } OS_BSD - # libevent ifndef MOZ_NATIVE_LIBEVENT # { @@ -329,15 +130,6 @@ endif # } endif # } -ifneq (86,$(findstring 86,$(OS_TEST))) # { -ifneq (arm,$(findstring arm,$(OS_TEST))) # { -ifneq (mips,$(findstring mips,$(OS_TEST))) # { -# Use mutex-backed atomics -CPPSRCS += atomicops_internals_mutex.cc -endif # } -endif # } -endif # } - OS_CXXFLAGS += $(TK_CFLAGS) include $(topsrcdir)/config/rules.mk diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index 895d11993cf..3270de2f862 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -4,3 +4,211 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +os_win = 0 +os_posix = 0 +os_macosx = 0 +os_dragonfly = 0 +os_bsd = 0 +os_netbsd = 0 +os_openbsd = 0 +os_linux = 0 + +if CONFIG['OS_ARCH'] == 'WINNT': + os_win = 1 +else: + os_posix = 1 + if CONFIG['OS_ARCH'] == 'Darwin': + os_macosx = 1 + elif CONFIG['OS_ARCH'] == 'DragonFly': + os_dragonfly = 1 + os_bsd = 1 + elif CONFIG['OS_ARCH'] == 'FreeBSD': + os_freebsd = 1 + os_freebsd = 1 + elif CONFIG['OS_ARCH'] == 'NetBSD': + os_netbsd = 1 + os_bsd = 1 + elif CONFIG['OS_ARCH'] == 'OpenBSD': + os_openbsd = 1 + os_bsd = 1 + else: + os_linux = 1 + +CPP_SOURCES += [ + 'at_exit.cc', + 'base_paths.cc', + 'base_switches.cc', + 'child_process.cc', + 'child_process_host.cc', + 'child_process_info.cc', + 'child_thread.cc', + 'chrome_counters.cc', + 'chrome_paths.cc', + 'chrome_switches.cc', + 'command_line.cc', + 'debug_flags.cc', + 'debug_util.cc', + 'env_vars.cc', + 'file_path.cc', + 'file_util.cc', + 'histogram.cc', + 'ipc_channel_proxy.cc', + 'ipc_logging.cc', + 'ipc_message.cc', + 'ipc_message_utils.cc', + 'ipc_sync_channel.cc', + 'ipc_sync_message.cc', + 'lazy_instance.cc', + 'lock.cc', + 'logging.cc', + 'memory_debug.cc', + 'message_loop.cc', + 'message_pump_default.cc', + 'message_router.cc', + 'non_thread_safe.cc', + 'notification_service.cc', + 'path_service.cc', + 'pickle.cc', + 'rand_util.cc', + 'ref_counted.cc', + 'revocable_store.cc', + 'scoped_temp_dir.cc', + 'simple_thread.cc', + 'stats_table.cc', + 'string_escape.cc', + 'string_piece.cc', + 'string_util.cc', + 'system_monitor.cc', + 'task_queue.cc', + 'thread.cc', + 'thread_collision_warner.cc', + 'time.cc', + 'timer.cc', + 'trace_event.cc', + 'tracked.cc', + 'tracked_objects.cc', +] + +if os_win: + CPP_SOURCES += [ + 'base_paths_win.cc', + 'cpu.cc', + 'condition_variable_win.cc', + 'debug_util_win.cc', + 'event_recorder.cc', + 'file_util_win.cc', + 'file_version_info.cc', + 'lock_impl_win.cc', + 'idle_timer.cc', + 'message_pump_win.cc', + 'object_watcher.cc', + 'platform_file_win.cc', + 'platform_thread_win.cc', + 'process_util_win.cc', + 'process_win.cc', + 'rand_util_win.cc', + 'registry.cc', + 'shared_memory_win.cc', + 'sys_info_win.cc', + 'sys_string_conversions_win.cc', + 'system_monitor_win.cc', + 'thread_local_storage_win.cc', + 'thread_local_win.cc', + 'time_win.cc', + 'waitable_event_watcher_win.cc', + 'waitable_event_win.cc', + 'win_util.cc', + 'chrome_paths_win.cc', + 'chrome_constants.cc', + 'ipc_channel_win.cc', + 'process_watcher_win.cc', + 'transport_dib_win.cc', + ] + +if os_posix: + CPP_SOURCES += [ + 'condition_variable_posix.cc', + 'debug_util_posix.cc', + 'event_recorder_stubs.cc', + 'file_descriptor_shuffle.cc', + 'file_util_posix.cc', + 'lock_impl_posix.cc', + 'message_pump_libevent.cc', + 'platform_file_posix.cc', + 'platform_thread_posix.cc', + 'process_posix.cc', + 'process_util_posix.cc', + 'rand_util_posix.cc', + 'shared_memory_posix.cc', + 'string16.cc', + 'system_monitor_posix.cc', + 'sys_info_posix.cc', + 'thread_local_posix.cc', + 'thread_local_storage_posix.cc', + 'waitable_event_posix.cc', + 'waitable_event_watcher_posix.cc', + 'file_descriptor_set_posix.cc', + 'ipc_channel_posix.cc', + 'process_watcher_posix_sigchld.cc', + ] + if CONFIG['OS_TARGET'] == 'Android': + CPP_SOURCES += [ + 'message_pump_android.cc', + ] + +if os_macosx: + CPP_SOURCES += [ + 'debug_util_mac.cc', + 'hmac_mac.cc', + 'idle_timer.cc', + 'sys_info_mac.cc', + 'time_mac.cc', + 'mach_message_source_mac.cc', + 'transport_dib_mac.cc', + ] + +if os_linux: + CPP_SOURCES += [ + 'atomicops_internals_x86_gcc.cc', + 'base_paths_linux.cc', + 'file_version_info_linux.cc', + 'idle_timer_none.cc', + 'process_util_linux.cc', + 'time_posix.cc', + ] + if CONFIG['MOZ_ENABLE_GTK2']: + CPP_SOURCES += [ + 'message_pump_glib.cc', + ] + if CONFIG['MOZ_ENABLE_QT']: + CPP_SOURCES += [ + 'moc_message_pump_qt.cc', + 'message_pump_qt.cc', + ] + +if os_bsd: + CPP_SOURCES += [ + 'atomicops_internals_x86_gcc.cc', + 'process_util_bsd.cc', + 'time_posix.cc', + ] + if CONFIG['MOZ_ENABLE_GTK2']: + CPP_SOURCES += [ + 'message_pump_glib.cc', + ] + if CONFIG['MOZ_ENABLE_QT']: + CPP_SOURCES += [ + 'moc_message_pump_qt.cc', + 'message_pump_qt.cc', + ] + +if CONFIG['_MSC_VER']: + CPP_SOURCES += [ + 'debug_on_start.cc', + ] + +ost = CONFIG['OS_TEST'] +if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1: + CPP_SOURCES += [ + 'atomicops_internals_mutex.cc', + ] diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in index d1a6d5c176f..60d72176c23 100644 --- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -18,12 +18,6 @@ ifdef MOZ_ENABLE_DBUS LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS) endif -CPPSRCS += \ - RawDBusConnection.cpp \ - DBusThread.cpp \ - DBusUtils.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build index 2070049d58a..1a5a52099f9 100644 --- a/ipc/dbus/moz.build +++ b/ipc/dbus/moz.build @@ -12,3 +12,9 @@ EXPORTS.mozilla.ipc += [ 'RawDBusConnection.h', ] +CPP_SOURCES += [ + 'DBusThread.cpp', + 'DBusUtils.cpp', + 'RawDBusConnection.cpp', +] + diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index 93b4717fad5..bfec1ef4ccd 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -16,51 +16,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS += \ - AsyncChannel.cpp \ - BrowserProcessSubThread.cpp \ - FileDescriptor.cpp \ - FileDescriptorUtils.cpp \ - GeckoChildProcessHost.cpp \ - InputStreamUtils.cpp \ - MessagePump.cpp \ - ProcessChild.cpp \ - ProtocolUtils.cpp \ - RPCChannel.cpp \ - ScopedXREEmbed.cpp \ - SharedMemory.cpp \ - Shmem.cpp \ - StringUtil.cpp \ - SyncChannel.cpp \ - URIUtils.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) #{ -CPPSRCS += \ - SharedMemory_windows.cpp \ - Transport_win.cpp \ - WindowsMessageLoop.cpp \ - CrossProcessMutex_windows.cpp \ - $(NULL) -else -# POSIX -CPPSRCS += \ - SharedMemory_posix.cpp \ - Transport_posix.cpp \ - CrossProcessMutex_unimplemented.cpp \ - $(NULL) -endif #} - -ifeq ($(OS_TARGET),Android) -CPPSRCS += SharedMemoryBasic_android.cpp -endif #} - -ifeq ($(OS_ARCH),Linux) -CPPSRCS += ProcessUtils_linux.cpp -else -CPPSRCS += ProcessUtils_none.cpp -endif - DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\" DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\" diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index 104da923ddd..e1da661058c 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -37,20 +37,62 @@ if CONFIG['OS_ARCH'] == 'WINNT': EXPORTS.mozilla.ipc += [ 'Transport_win.h', ] + CPP_SOURCES += [ + 'SharedMemory_windows.cpp', + 'Transport_win.cpp', + 'WindowsMessageLoop.cpp', + 'CrossProcessMutex_windows.cpp', + ] else: EXPORTS.mozilla.ipc += [ 'Transport_posix.h', ] + CPP_SOURCES += [ + 'SharedMemory_posix.cpp', + 'Transport_posix.cpp', + 'CrossProcessMutex_unimplemented.cpp', + ] # Android has its own, # almost-but-not-quite-compatible-with-POSIX-or-/dev/shm shared memory # impl. if CONFIG['OS_TARGET'] == 'Android': EXPORTS.mozilla.ipc += ['SharedMemoryBasic_android.h'] + CPP_SOURCES += [ + 'SharedMemoryBasic_android.cpp', + ] else: EXPORTS.mozilla.ipc += ['SharedMemoryBasic_chromium.h'] +if CONFIG['OS_ARCH'] == 'Linux': + CPP_SOURCES += [ + 'ProcessUtils_linux.cpp', + ] +else: + CPP_SOURCES += [ + 'ProcessUtils_none.cpp', + ] + EXPORTS.ipc += [ 'IPCMessageUtils.h', ] +CPP_SOURCES += [ + 'AsyncChannel.cpp', + 'BrowserProcessSubThread.cpp', + 'FileDescriptor.cpp', + 'FileDescriptorUtils.cpp', + 'GeckoChildProcessHost.cpp', + 'InputStreamUtils.cpp', + 'MessagePump.cpp', + 'ProcessChild.cpp', + 'ProtocolUtils.cpp', + 'RPCChannel.cpp', + 'ScopedXREEmbed.cpp', + 'SharedMemory.cpp', + 'Shmem.cpp', + 'StringUtil.cpp', + 'SyncChannel.cpp', + 'URIUtils.cpp', +] + diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 876444b9347..8133804c6a2 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -66,13 +66,6 @@ PROTOCOLS := $(foreach IPDLDIR,$(IPDLDIRS),$(eval $(ADD_IPDLDIR))) -CPPSRCS = \ - $(PROTOCOLS:%.ipdl=%Parent.cpp) \ - $(PROTOCOLS:%.ipdl=%Child.cpp) \ - $(PROTOCOLS:%.ipdl=%.cpp) \ - $(PROTOCOLS:%.ipdlh=%.cpp) \ - $(NULL) - GARBAGE += $(CPPSRCS) LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index 165adeb5da7..4da24a8523f 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -9,3 +9,10 @@ if CONFIG['MOZ_IPDL_TESTS']: MODULE = 'ipdlgen' +CPP_SOURCES += [ + '$(PROTOCOLS:%.ipdl=%.cpp)', + '$(PROTOCOLS:%.ipdl=%Child.cpp)', + '$(PROTOCOLS:%.ipdl=%Parent.cpp)', + '$(PROTOCOLS:%.ipdlh=%.cpp)', +] + diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in index 0c56a103b4d..ddf13a2568d 100644 --- a/ipc/ipdl/test/cxx/Makefile.in +++ b/ipc/ipdl/test/cxx/Makefile.in @@ -61,13 +61,6 @@ IPDLTESTHDRS = $(addprefix $(srcdir)/,$(addsuffix .h,$(IPDLTESTS))) TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp GENTESTER := $(srcdir)/genIPDLUnitTests.py -CPPSRCS = \ - IPDLUnitTests.cpp \ - IPDLUnitTestSubprocess.cpp \ - IPDLUnitTestProcessChild.cpp \ - $(IPDLTESTSRCS) \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in index fd2b73fcf90..b3c12e59e4a 100644 --- a/ipc/ipdl/test/cxx/app/Makefile.in +++ b/ipc/ipdl/test/cxx/app/Makefile.in @@ -14,10 +14,6 @@ NSDISTMODE = copy LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base -CPPSRCS = \ - TestIPDL.cpp \ - $(NULL) - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBXUL_LIBS) \ diff --git a/ipc/ipdl/test/cxx/app/moz.build b/ipc/ipdl/test/cxx/app/moz.build index 38e0f079f86..02f2d572719 100644 --- a/ipc/ipdl/test/cxx/app/moz.build +++ b/ipc/ipdl/test/cxx/app/moz.build @@ -8,3 +8,6 @@ MODULE = 'ipdlunittest' PROGRAM = 'ipdlunittest' +CPP_SOURCES += [ + 'TestIPDL.cpp', +] diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build index 03c56ad2cab..914f039a85d 100644 --- a/ipc/ipdl/test/cxx/moz.build +++ b/ipc/ipdl/test/cxx/moz.build @@ -15,3 +15,10 @@ EXPORTS.mozilla._ipdltest += [ 'IPDLUnitTests.h', ] +CPP_SOURCES += [ + '$(IPDLTESTSRCS)', + 'IPDLUnitTestProcessChild.cpp', + 'IPDLUnitTestSubprocess.cpp', + 'IPDLUnitTests.cpp', +] + diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in index dbafdc1cf15..7c90dd9782a 100644 --- a/ipc/netd/Makefile.in +++ b/ipc/netd/Makefile.in @@ -14,10 +14,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS += \ - Netd.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build index c8c354428f6..972a06834ac 100644 --- a/ipc/netd/moz.build +++ b/ipc/netd/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.ipc += [ 'Netd.h', ] +CPP_SOURCES += [ + 'Netd.cpp', +] + diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in index 88345a28c5f..cc3792182f4 100644 --- a/ipc/ril/Makefile.in +++ b/ipc/ril/Makefile.in @@ -14,10 +14,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS += \ - Ril.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build index bbb2da15f48..0ee44577fd1 100644 --- a/ipc/ril/moz.build +++ b/ipc/ril/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.ipc += [ 'Ril.h', ] +CPP_SOURCES += [ + 'Ril.cpp', +] + diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index 11d8450f330..960615db84f 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -16,12 +16,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS += \ - TestShellChild.cpp \ - TestShellParent.cpp \ - XPCShellEnvironment.cpp \ - $(NULL) - # For xpcshell error messages and nsDependentJSString LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/shell \ diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build index 71e41734628..7a734a97ac3 100644 --- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -15,3 +15,9 @@ EXPORTS.mozilla.ipc += [ # FIXME/bug 575918: out-of-process xpcshell is broken on OS X if CONFIG['OS_ARCH'] != 'Darwin': XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini'] + +CPP_SOURCES += [ + 'TestShellChild.cpp', + 'TestShellParent.cpp', + 'XPCShellEnvironment.cpp', +] diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in index 177434c9369..8ff84f39ca8 100644 --- a/ipc/unixsocket/Makefile.in +++ b/ipc/unixsocket/Makefile.in @@ -15,8 +15,6 @@ LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS += UnixSocket.cpp - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build index 7bdd35879bb..97ee8f94324 100644 --- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -10,3 +10,7 @@ EXPORTS.mozilla.ipc += [ 'UnixSocket.h', ] +CPP_SOURCES += [ + 'UnixSocket.cpp', +] + diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in index 5fa72d94916..485c2acd05e 100644 --- a/js/ductwork/debugger/Makefile.in +++ b/js/ductwork/debugger/Makefile.in @@ -17,10 +17,6 @@ LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = \ - JSDebugger.cpp \ - $(NULL) - EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ diff --git a/js/ductwork/debugger/moz.build b/js/ductwork/debugger/moz.build index 873982e6785..f17f55c54fa 100644 --- a/js/ductwork/debugger/moz.build +++ b/js/ductwork/debugger/moz.build @@ -11,3 +11,7 @@ XPIDL_SOURCES += [ MODULE = 'jsdebugger' XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini'] + +CPP_SOURCES += [ + 'JSDebugger.cpp', +] diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index 971785742da..4aaa949a482 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -15,11 +15,6 @@ FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - ObjectWrapperParent.cpp \ - ObjectWrapperChild.cpp \ - $(NULL) - # For nsDependentJSString LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/js/ipc/moz.build b/js/ipc/moz.build index 08582ab5ac7..71da4f3ad9e 100644 --- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -14,3 +14,8 @@ EXPORTS.mozilla.jsipc += [ 'ObjectWrapperParent.h', ] +CPP_SOURCES += [ + 'ObjectWrapperChild.cpp', + 'ObjectWrapperParent.cpp', +] + diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in index 744dd763347..16bf7c21ba9 100644 --- a/js/jsd/Makefile.in +++ b/js/jsd/Makefile.in @@ -15,9 +15,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsd -CPPSRCS = \ - jsd_xpc.cpp \ - jshash.cpp IS_COMPONENT = 1 LIBXUL_LIBRARY = 1 @@ -30,20 +27,6 @@ ifdef JS_THREADSAFE DEFINES += -DJS_THREADSAFE endif -CPPSRCS += \ - jsdebug.cpp \ - jsd_atom.cpp \ - jsd_high.cpp \ - jsd_hook.cpp \ - jsd_lock.cpp \ - jsd_obj.cpp \ - jsd_scpt.cpp \ - jsd_stak.cpp \ - jsd_step.cpp \ - jsd_text.cpp \ - jsd_val.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_JSD_API diff --git a/js/jsd/moz.build b/js/jsd/moz.build index 120bd3ab9e4..19beb483d88 100644 --- a/js/jsd/moz.build +++ b/js/jsd/moz.build @@ -14,3 +14,19 @@ EXPORTS += [ ] XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini'] + +CPP_SOURCES += [ + 'jsd_atom.cpp', + 'jsd_high.cpp', + 'jsd_hook.cpp', + 'jsd_lock.cpp', + 'jsd_obj.cpp', + 'jsd_scpt.cpp', + 'jsd_stak.cpp', + 'jsd_step.cpp', + 'jsd_text.cpp', + 'jsd_val.cpp', + 'jsd_xpc.cpp', + 'jsdebug.cpp', + 'jshash.cpp', +] diff --git a/js/src/Makefile.in b/js/src/Makefile.in index c0a51876a35..3f23dfc3e5a 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -54,109 +54,6 @@ VPATH += \ $(srcdir)/vm \ $(NULL) -CPPSRCS = \ - jsalloc.cpp \ - jsanalyze.cpp \ - jsapi.cpp \ - jsarray.cpp \ - jsatom.cpp \ - jsbool.cpp \ - jsclone.cpp \ - jscntxt.cpp \ - jscompartment.cpp \ - jsdate.cpp \ - jsdbgapi.cpp \ - jsdhash.cpp \ - jsdtoa.cpp \ - jsexn.cpp \ - jsfriendapi.cpp \ - jsfun.cpp \ - jsgc.cpp \ - jscrashreport.cpp \ - jsinfer.cpp \ - jsinterp.cpp \ - jsiter.cpp \ - jslog2.cpp \ - jsmath.cpp \ - jsmemorymetrics.cpp \ - jsnativestack.cpp \ - jsnum.cpp \ - jsobj.cpp \ - json.cpp \ - jsonparser.cpp \ - jsopcode.cpp \ - jsproxy.cpp \ - jsprf.cpp \ - jsprobes.cpp \ - jspropertycache.cpp \ - jspropertytree.cpp \ - jsreflect.cpp \ - jsscript.cpp \ - jsstr.cpp \ - jstypedarray.cpp \ - jsutil.cpp \ - jswatchpoint.cpp \ - jsweakmap.cpp \ - jsworkers.cpp \ - ThreadPool.cpp \ - Monitor.cpp \ - ForkJoin.cpp \ - jswrapper.cpp \ - prmjtime.cpp \ - sharkctl.cpp \ - ArgumentsObject.cpp \ - DateTime.cpp \ - Debugger.cpp \ - GlobalObject.cpp \ - Object.cpp \ - ObjectImpl.cpp \ - PropertyKey.cpp \ - ScopeObject.cpp \ - Shape.cpp \ - Stack.cpp \ - String.cpp \ - BytecodeCompiler.cpp \ - BytecodeEmitter.cpp \ - CharacterEncoding.cpp \ - FoldConstants.cpp \ - Intl.cpp \ - NameFunctions.cpp \ - ParallelArray.cpp \ - ParseMaps.cpp \ - ParseNode.cpp \ - Parser.cpp \ - SPSProfiler.cpp \ - SelfHosting.cpp \ - TokenStream.cpp \ - TestingFunctions.cpp \ - Profilers.cpp \ - LifoAlloc.cpp \ - Eval.cpp \ - MapObject.cpp \ - RegExpObject.cpp \ - RegExpStatics.cpp \ - RegExp.cpp \ - RootMarking.cpp \ - Marking.cpp \ - Memory.cpp \ - Statistics.cpp \ - StoreBuffer.cpp \ - Nursery.cpp \ - Iteration.cpp \ - Zone.cpp \ - Verifier.cpp \ - StringBuffer.cpp \ - Unicode.cpp \ - Xdr.cpp \ - Module.cpp \ - $(NULL) - -ifdef MOZ_INSTRUMENTS -CPPSRCS += \ - Instruments.cpp \ - $(NULL) -endif - ###################################################### # BEGIN include exported headers from the JS engine # @@ -178,118 +75,20 @@ ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL))) DEFINES += -DENABLE_PARALLEL_JS endif -ifdef ENABLE_TRACE_LOGGING - -############################################### -# BEGIN include sources for trace logging -# -CPPSRCS += TraceLogging.cpp - -endif - # Ion ifdef ENABLE_ION VPATH += $(srcdir)/ion VPATH += $(srcdir)/ion/shared -CPPSRCS += MIR.cpp \ - BytecodeAnalysis.cpp \ - BaselineCompiler.cpp \ - BaselineIC.cpp \ - BaselineFrame.cpp \ - BaselineFrameInfo.cpp \ - BaselineJIT.cpp \ - BaselineInspector.cpp \ - BaselineBailouts.cpp \ - BacktrackingAllocator.cpp \ - Bailouts.cpp \ - BitSet.cpp \ - C1Spewer.cpp \ - CodeGenerator.cpp \ - CodeGenerator-shared.cpp \ - Ion.cpp \ - IonAnalysis.cpp \ - IonBuilder.cpp \ - IonCaches.cpp \ - IonFrames.cpp \ - IonMacroAssembler.cpp \ - IonSpewer.cpp \ - JSONSpewer.cpp \ - PerfSpewer.cpp \ - LICM.cpp \ - LinearScan.cpp \ - LIR.cpp \ - LiveRangeAllocator.cpp \ - Lowering.cpp \ - Lowering-shared.cpp \ - MCallOptimize.cpp \ - MIRGraph.cpp \ - MoveResolver.cpp \ - EdgeCaseAnalysis.cpp \ - RegisterAllocator.cpp \ - Snapshots.cpp \ - Safepoints.cpp \ - StupidAllocator.cpp \ - TypePolicy.cpp \ - ValueNumbering.cpp \ - RangeAnalysis.cpp \ - VMFunctions.cpp \ - ParallelFunctions.cpp \ - AliasAnalysis.cpp \ - ParallelArrayAnalysis.cpp \ - UnreachableCodeElimination.cpp \ - BaselineCompiler-shared.cpp \ - EffectiveAddressAnalysis.cpp \ - AsmJS.cpp \ - AsmJSLink.cpp \ - AsmJSSignalHandlers.cpp \ - $(NULL) ifeq (86, $(findstring 86,$(TARGET_CPU))) -CPPSRCS += CodeGenerator-x86-shared.cpp -CPPSRCS += IonFrames-x86-shared.cpp -CPPSRCS += MoveEmitter-x86-shared.cpp -CPPSRCS += Assembler-x86-shared.cpp -CPPSRCS += Lowering-x86-shared.cpp -CPPSRCS += BaselineCompiler-x86-shared.cpp -CPPSRCS += BaselineIC-x86-shared.cpp ifeq (x86_64, $(TARGET_CPU)) VPATH += $(srcdir)/ion/x64 -CPPSRCS += Lowering-x64.cpp \ - CodeGenerator-x64.cpp \ - Trampoline-x64.cpp \ - Assembler-x64.cpp \ - Bailouts-x64.cpp \ - MacroAssembler-x64.cpp \ - BaselineCompiler-x64.cpp \ - BaselineIC-x64.cpp \ - $(NULL) else VPATH += $(srcdir)/ion/x86 -CPPSRCS += Lowering-x86.cpp \ - CodeGenerator-x86.cpp \ - Trampoline-x86.cpp \ - Assembler-x86.cpp \ - Bailouts-x86.cpp \ - MacroAssembler-x86.cpp \ - BaselineCompiler-x86.cpp \ - BaselineIC-x86.cpp \ - $(NULL) endif endif ifeq (arm, $(findstring arm, $(TARGET_CPU))) VPATH += $(srcdir)/ion/arm -CPPSRCS += Lowering-arm.cpp \ - CodeGenerator-arm.cpp \ - Trampoline-arm.cpp \ - Assembler-arm.cpp \ - Bailouts-arm.cpp \ - IonFrames-arm.cpp \ - MoveEmitter-arm.cpp \ - Architecture-arm.cpp \ - MacroAssembler-arm.cpp \ - BaselineCompiler-arm.cpp \ - BaselineIC-arm.cpp \ - $(NULL) endif endif #ENABLE_ION @@ -303,54 +102,9 @@ VPATH += $(srcdir)/assembler \ $(srcdir)/yarr \ $(NONE) -CPPSRCS += ExecutableAllocator.cpp \ - PageBlock.cpp \ - YarrInterpreter.cpp \ - YarrPattern.cpp \ - YarrSyntaxChecker.cpp \ - YarrCanonicalizeUCS2.cpp \ - $(NONE) - -ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) -CPPSRCS += ExecutableAllocatorPosix.cpp \ - OSAllocatorPosix.cpp \ - $(NONE) -endif -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += ExecutableAllocatorWin.cpp \ - OSAllocatorWin.cpp \ - $(NONE) -endif -ifeq ($(OS_ARCH),OS2) -CPPSRCS += ExecutableAllocatorOS2.cpp \ - OSAllocatorOS2.cpp \ - $(NONE) -endif - ifneq (,$(ENABLE_ION)$(ENABLE_YARR_JIT)) VPATH += $(srcdir)/assembler/assembler \ $(NONE) - -CPPSRCS += ARMAssembler.cpp \ - MacroAssemblerARM.cpp \ - MacroAssemblerX86Common.cpp \ - $(NONE) - -ifdef ENABLE_YARR_JIT -CPPSRCS += YarrJIT.cpp -endif - -ifeq (86, $(findstring 86,$(TARGET_CPU))) -ifeq (x86_64, $(TARGET_CPU)) -#CPPSRCS += only_on_x86_64.cpp -else -#CPPSRCS += only_on_x86.cpp -endif -endif -ifeq (arm, $(findstring arm, $(TARGET_CPU))) -#CPPSRCS += only_on_arm.cpp -endif - endif # @@ -360,11 +114,6 @@ endif ifdef JS_HAS_CTYPES VPATH += $(srcdir)/ctypes -CPPSRCS += \ - CTypes.cpp \ - Library.cpp \ - $(NULL) - ifdef MOZ_NATIVE_FFI LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) else @@ -399,12 +148,6 @@ LOCAL_INCLUDES += -I$(MFBT_ROOT)/double-conversion # implementation source file per supported operating system, plus a stub # for unsupported OSes, plus the Javascript wrapper. VPATH += $(srcdir)/perf -CPPSRCS += jsperf.cpp -ifdef HAVE_LINUX_PERF_EVENT_H -CPPSRCS += pm_linux.cpp -else -CPPSRCS += pm_stub.cpp -endif DASH_R = -r diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in index b840feb5caf..288934a4cfb 100644 --- a/js/src/gdb/Makefile.in +++ b/js/src/gdb/Makefile.in @@ -11,17 +11,6 @@ VPATH = @srcdir@ @srcdir@/tests include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - gdb-tests.cpp \ - test-jsid.cpp \ - test-JSString.cpp \ - test-JSObject.cpp \ - test-jsval.cpp \ - test-prettyprinters.cpp \ - test-Root.cpp \ - typedef-printers.cpp \ - $(NULL) - # Building against js_static requires that we declare mfbt sybols "exported" # on its behalf. DEFINES += -DEXPORT_JS_API -DIMPL_MFBT diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build index 8b10555b36a..f1ff2dbee2a 100644 --- a/js/src/gdb/moz.build +++ b/js/src/gdb/moz.build @@ -6,3 +6,13 @@ PROGRAM = 'gdb-tests' +CPP_SOURCES += [ + 'gdb-tests.cpp', + 'test-JSObject.cpp', + 'test-JSString.cpp', + 'test-Root.cpp', + 'test-jsid.cpp', + 'test-jsval.cpp', + 'test-prettyprinters.cpp', + 'typedef-printers.cpp', +] diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in index 16783bfccd8..5f7d5942a9f 100644 --- a/js/src/jsapi-tests/Makefile.in +++ b/js/src/jsapi-tests/Makefile.in @@ -11,74 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - tests.cpp \ - selfTest.cpp \ - testAddPropertyPropcache.cpp \ - testArrayBuffer.cpp \ - testArgumentsObject.cpp \ - testBindCallable.cpp \ - testBug604087.cpp \ - testCallNonGenericMethodOnProxy.cpp \ - testChromeBuffer.cpp \ - testClassGetter.cpp \ - testCloneScript.cpp \ - testConservativeGC.cpp \ - testContexts.cpp \ - testCustomIterator.cpp \ - testDebugger.cpp \ - testDeepFreeze.cpp \ - testDefineGetterSetterNonEnumerable.cpp \ - testDefineProperty.cpp \ - testEnclosingFunction.cpp \ - testErrorCopying.cpp \ - testExternalStrings.cpp \ - testFindSCCs.cpp \ - testFuncCallback.cpp \ - testFunctionProperties.cpp \ - testGCFinalizeCallback.cpp \ - testGCOutOfMemory.cpp \ - testGetPropertyDefault.cpp \ - testHashTable.cpp \ - testHashTableInit.cpp \ - testIndexToString.cpp \ - testIntString.cpp \ - testIntTypesABI.cpp \ - testIntern.cpp \ - testJSEvaluateScript.cpp \ - testLookup.cpp \ - testLooselyEqual.cpp \ - testNewObject.cpp \ - testObjectEmulatingUndefined.cpp \ - testOOM.cpp \ - testOps.cpp \ - testOriginPrincipals.cpp \ - testParseJSON.cpp \ - testProfileStrings.cpp \ - testPropCache.cpp \ - testRegExp.cpp \ - testResolveRecursion.cpp \ - testSameValue.cpp \ - testScriptInfo.cpp \ - testScriptObject.cpp \ - testSetProperty.cpp \ - testSourcePolicy.cpp \ - testStringBuffer.cpp \ - testTrap.cpp \ - testTypedArrays.cpp \ - testUTF8.cpp \ - testVersion.cpp \ - testXDR.cpp \ - $(NULL) - -# Disabled: an entirely unrelated test seems to cause this to fail. Moreover, -# given the test's dependence on interactions between the compiler, the GC, and -# conservative stack scanning, the fix isn't obvious: more investigation -# needed. -#CPPSRCS += \ -# testRegExpInstanceProperties.cpp \ -# $(NULL) - DEFINES += -DEXPORT_JS_API # Building against js_static requires that we declare mfbt sybols "exported" # on its behalf. diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build index 1ab7ea6173e..2403f91923d 100644 --- a/js/src/jsapi-tests/moz.build +++ b/js/src/jsapi-tests/moz.build @@ -6,3 +6,62 @@ PROGRAM = 'jsapi-tests' +CPP_SOURCES += [ + 'selfTest.cpp', + 'testAddPropertyPropcache.cpp', + 'testArgumentsObject.cpp', + 'testArrayBuffer.cpp', + 'testBindCallable.cpp', + 'testBug604087.cpp', + 'testCallNonGenericMethodOnProxy.cpp', + 'testChromeBuffer.cpp', + 'testClassGetter.cpp', + 'testCloneScript.cpp', + 'testConservativeGC.cpp', + 'testContexts.cpp', + 'testCustomIterator.cpp', + 'testDebugger.cpp', + 'testDeepFreeze.cpp', + 'testDefineGetterSetterNonEnumerable.cpp', + 'testDefineProperty.cpp', + 'testEnclosingFunction.cpp', + 'testErrorCopying.cpp', + 'testExternalStrings.cpp', + 'testFindSCCs.cpp', + 'testFuncCallback.cpp', + 'testFunctionProperties.cpp', + 'testGCFinalizeCallback.cpp', + 'testGCOutOfMemory.cpp', + 'testGetPropertyDefault.cpp', + 'testHashTable.cpp', + 'testHashTableInit.cpp', + 'testIndexToString.cpp', + 'testIntString.cpp', + 'testIntTypesABI.cpp', + 'testIntern.cpp', + 'testJSEvaluateScript.cpp', + 'testLookup.cpp', + 'testLooselyEqual.cpp', + 'testNewObject.cpp', + 'testOOM.cpp', + 'testObjectEmulatingUndefined.cpp', + 'testOps.cpp', + 'testOriginPrincipals.cpp', + 'testParseJSON.cpp', + 'testProfileStrings.cpp', + 'testPropCache.cpp', + 'testRegExp.cpp', + 'testResolveRecursion.cpp', + 'testSameValue.cpp', + 'testScriptInfo.cpp', + 'testScriptObject.cpp', + 'testSetProperty.cpp', + 'testSourcePolicy.cpp', + 'testStringBuffer.cpp', + 'testTrap.cpp', + 'testTypedArrays.cpp', + 'testUTF8.cpp', + 'testVersion.cpp', + 'testXDR.cpp', + 'tests.cpp', +] diff --git a/js/src/moz.build b/js/src/moz.build index 39844a4ba67..ffacc4365a3 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -81,3 +81,260 @@ EXPORTS.js += [ 'Vector.h', ] +CPP_SOURCES += [ + 'ArgumentsObject.cpp', + 'BytecodeCompiler.cpp', + 'BytecodeEmitter.cpp', + 'CharacterEncoding.cpp', + 'DateTime.cpp', + 'Debugger.cpp', + 'Eval.cpp', + 'ExecutableAllocator.cpp', + 'FoldConstants.cpp', + 'ForkJoin.cpp', + 'GlobalObject.cpp', + 'Intl.cpp', + 'Iteration.cpp', + 'LifoAlloc.cpp', + 'MapObject.cpp', + 'Marking.cpp', + 'Memory.cpp', + 'Module.cpp', + 'Monitor.cpp', + 'NameFunctions.cpp', + 'Nursery.cpp', + 'Object.cpp', + 'ObjectImpl.cpp', + 'PageBlock.cpp', + 'ParallelArray.cpp', + 'ParseMaps.cpp', + 'ParseNode.cpp', + 'Parser.cpp', + 'Profilers.cpp', + 'PropertyKey.cpp', + 'RegExp.cpp', + 'RegExpObject.cpp', + 'RegExpStatics.cpp', + 'RootMarking.cpp', + 'SPSProfiler.cpp', + 'ScopeObject.cpp', + 'SelfHosting.cpp', + 'Shape.cpp', + 'Stack.cpp', + 'Statistics.cpp', + 'StoreBuffer.cpp', + 'String.cpp', + 'StringBuffer.cpp', + 'TestingFunctions.cpp', + 'ThreadPool.cpp', + 'TokenStream.cpp', + 'Unicode.cpp', + 'Verifier.cpp', + 'Xdr.cpp', + 'YarrCanonicalizeUCS2.cpp', + 'YarrInterpreter.cpp', + 'YarrPattern.cpp', + 'YarrSyntaxChecker.cpp', + 'Zone.cpp', + 'jsalloc.cpp', + 'jsanalyze.cpp', + 'jsapi.cpp', + 'jsarray.cpp', + 'jsatom.cpp', + 'jsbool.cpp', + 'jsclone.cpp', + 'jscntxt.cpp', + 'jscompartment.cpp', + 'jscrashreport.cpp', + 'jsdate.cpp', + 'jsdbgapi.cpp', + 'jsdhash.cpp', + 'jsdtoa.cpp', + 'jsexn.cpp', + 'jsfriendapi.cpp', + 'jsfun.cpp', + 'jsgc.cpp', + 'jsinfer.cpp', + 'jsinterp.cpp', + 'jsiter.cpp', + 'jslog2.cpp', + 'jsmath.cpp', + 'jsmemorymetrics.cpp', + 'jsnativestack.cpp', + 'jsnum.cpp', + 'jsobj.cpp', + 'json.cpp', + 'jsonparser.cpp', + 'jsopcode.cpp', + 'jsperf.cpp', + 'jsprf.cpp', + 'jsprobes.cpp', + 'jspropertycache.cpp', + 'jspropertytree.cpp', + 'jsproxy.cpp', + 'jsreflect.cpp', + 'jsscript.cpp', + 'jsstr.cpp', + 'jstypedarray.cpp', + 'jsutil.cpp', + 'jswatchpoint.cpp', + 'jsweakmap.cpp', + 'jsworkers.cpp', + 'jswrapper.cpp', + 'prmjtime.cpp', + 'sharkctl.cpp', +] + +if CONFIG['MOZ_INSTRUMENTS']: + CPP_SOURCES += [ + 'Instruments.cpp', + ] + +if CONFIG['ENABLE_TRACE_LOGGING']: + CPP_SOURCES += [ + 'TraceLogging.cpp', + ] + +if CONFIG['ENABLE_ION']: + CPP_SOURCES += [ + 'AliasAnalysis.cpp', + 'AsmJS.cpp', + 'AsmJSLink.cpp', + 'AsmJSSignalHandlers.cpp', + 'BacktrackingAllocator.cpp', + 'Bailouts.cpp', + 'BaselineBailouts.cpp', + 'BaselineCompiler-shared.cpp', + 'BaselineCompiler.cpp', + 'BaselineFrame.cpp', + 'BaselineFrameInfo.cpp', + 'BaselineIC.cpp', + 'BaselineInspector.cpp', + 'BaselineJIT.cpp', + 'BitSet.cpp', + 'BytecodeAnalysis.cpp', + 'C1Spewer.cpp', + 'CodeGenerator-shared.cpp', + 'CodeGenerator.cpp', + 'EdgeCaseAnalysis.cpp', + 'EffectiveAddressAnalysis.cpp', + 'Ion.cpp', + 'IonAnalysis.cpp', + 'IonBuilder.cpp', + 'IonCaches.cpp', + 'IonFrames.cpp', + 'IonMacroAssembler.cpp', + 'IonSpewer.cpp', + 'JSONSpewer.cpp', + 'PerfSpewer.cpp', + 'LICM.cpp', + 'LIR.cpp', + 'LinearScan.cpp', + 'LiveRangeAllocator.cpp', + 'Lowering-shared.cpp', + 'Lowering.cpp', + 'MCallOptimize.cpp', + 'MIR.cpp', + 'MIRGraph.cpp', + 'MoveResolver.cpp', + 'ParallelArrayAnalysis.cpp', + 'ParallelFunctions.cpp', + 'RangeAnalysis.cpp', + 'RegisterAllocator.cpp', + 'Safepoints.cpp', + 'Snapshots.cpp', + 'StupidAllocator.cpp', + 'TypePolicy.cpp', + 'UnreachableCodeElimination.cpp', + 'VMFunctions.cpp', + 'ValueNumbering.cpp', + ] + if CONFIG['TARGET_CPU'].find('86') != -1: + CPP_SOURCES += [ + 'Assembler-x86-shared.cpp', + 'BaselineCompiler-x86-shared.cpp', + 'BaselineIC-x86-shared.cpp', + 'CodeGenerator-x86-shared.cpp', + 'IonFrames-x86-shared.cpp', + 'Lowering-x86-shared.cpp', + 'MoveEmitter-x86-shared.cpp', + ] + if CONFIG['TARGET_CPU'] == 'x86_64': + CPP_SOURCES += [ + 'Assembler-x64.cpp', + 'Bailouts-x64.cpp', + 'BaselineCompiler-x64.cpp', + 'BaselineIC-x64.cpp', + 'CodeGenerator-x64.cpp', + 'Lowering-x64.cpp', + 'MacroAssembler-x64.cpp', + 'Trampoline-x64.cpp', + ] + else: + CPP_SOURCES += [ + 'Assembler-x86.cpp', + 'Bailouts-x86.cpp', + 'BaselineCompiler-x86.cpp', + 'BaselineIC-x86.cpp', + 'CodeGenerator-x86.cpp', + 'Lowering-x86.cpp', + 'MacroAssembler-x86.cpp', + 'Trampoline-x86.cpp', + ] + elif CONFIG['TARGET_CPU'].find('arm') != -1: + CPP_SOURCES += [ + 'Architecture-arm.cpp', + 'Assembler-arm.cpp', + 'Bailouts-arm.cpp', + 'BaselineCompiler-arm.cpp', + 'BaselineIC-arm.cpp', + 'CodeGenerator-arm.cpp', + 'IonFrames-arm.cpp', + 'Lowering-arm.cpp', + 'MacroAssembler-arm.cpp', + 'MoveEmitter-arm.cpp', + 'Trampoline-arm.cpp', + ] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'ExecutableAllocatorWin.cpp', + 'OSAllocatorWin.cpp', + ] +elif CONFIG['OS_ARCH'] == 'OS2': + CPP_SOURCES += [ + 'ExecutableAllocatorOS2.cpp', + 'OSAllocatorOS2.cpp', + ] +else: + CPP_SOURCES += [ + 'ExecutableAllocatorPosix.cpp', + 'OSAllocatorPosix.cpp', + ] + +if CONFIG['ENABLE_ION'] or CONFIG['ENABLE_YARR_JIT']: + CPP_SOURCES += [ + 'ARMAssembler.cpp', + 'MacroAssemblerARM.cpp', + 'MacroAssemblerX86Common.cpp', + ] + +if CONFIG['ENABLE_YARR_JIT']: + CPP_SOURCES += [ + 'YarrJIT.cpp' + ] + +if CONFIG['JS_HAS_CTYPES']: + CPP_SOURCES += [ + 'CTypes.cpp', + 'Library.cpp', + ] + +if CONFIG['HAVE_LINUX_PERF_EVENT_H']: + CPP_SOURCES += [ + 'pm_linux.cpp' + ] +else: + CPP_SOURCES += [ + 'pm_stub.cpp' + ] diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in index 48466483694..2e1df09e753 100644 --- a/js/src/shell/Makefile.in +++ b/js/src/shell/Makefile.in @@ -11,12 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - js.cpp \ - jsoptparse.cpp \ - jsheaptools.cpp \ - $(NULL) - ifdef _MSC_VER # unnecessary PGO for js shell. But gcc cannot turn off pgo because it is # necessary to link PGO lib on gcc when a object/static lib are compiled diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build index 1de39bc6a21..fa883c03a53 100644 --- a/js/src/shell/moz.build +++ b/js/src/shell/moz.build @@ -6,3 +6,8 @@ PROGRAM = CONFIG['JS_SHELL_NAME'] +CPP_SOURCES += [ + 'js.cpp', + 'jsheaptools.cpp', + 'jsoptparse.cpp', +] diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in index 45db36b0def..3e1da84fa67 100644 --- a/js/xpconnect/loader/Makefile.in +++ b/js/xpconnect/loader/Makefile.in @@ -19,8 +19,6 @@ LOCAL_INCLUDES += \ -I$(topsrcdir)/content/base/src \ $(NULL) -CPPSRCS = mozJSComponentLoader.cpp mozJSSubScriptLoader.cpp mozJSLoaderUtils.cpp - EXTRA_JS_MODULES = XPCOMUtils.jsm ISO8601DateUtils.jsm include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build index 31ecf0845cd..5de24e72306 100644 --- a/js/xpconnect/loader/moz.build +++ b/js/xpconnect/loader/moz.build @@ -6,3 +6,9 @@ MODULE = 'jsloader' +CPP_SOURCES += [ + 'mozJSComponentLoader.cpp', + 'mozJSLoaderUtils.cpp', + 'mozJSSubScriptLoader.cpp', +] + diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in index 0ac21bc7d75..71eb88b3349 100644 --- a/js/xpconnect/shell/Makefile.in +++ b/js/xpconnect/shell/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk SDK_BINARY = $(PROGRAM) -CPPSRCS = xpcshell.cpp - LOCAL_INCLUDES += \ -I$(topsrcdir)/toolkit/xre \ $(NULL) diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index 3a1b3a49696..9ab7b07056a 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -8,3 +8,6 @@ MODULE = 'xpcshell' PROGRAM = 'xpcshell' +CPP_SOURCES += [ + 'xpcshell.cpp', +] diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index eef70fdf15e..98d62f59e88 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -14,43 +14,6 @@ LIBRARY_NAME = xpconnect_s MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCxPusher.cpp \ - nsScriptError.cpp \ - nsXPConnect.cpp \ - XPCCallContext.cpp \ - XPCComponents.cpp \ - XPCContext.cpp \ - XPCConvert.cpp \ - XPCDebug.cpp \ - XPCException.cpp \ - XPCJSID.cpp \ - XPCJSRuntime.cpp \ - XPCLocale.cpp \ - XPCLog.cpp \ - XPCMaps.cpp \ - XPCModule.cpp \ - XPCRuntimeService.cpp \ - XPCStack.cpp \ - XPCString.cpp \ - XPCJSContextStack.cpp \ - XPCThrower.cpp \ - XPCWrappedJS.cpp \ - XPCVariant.cpp \ - XPCWrappedJSClass.cpp \ - XPCWrappedNative.cpp \ - XPCWrappedNativeInfo.cpp \ - XPCWrappedNativeJSOps.cpp \ - XPCWrappedNativeProto.cpp \ - XPCWrappedNativeScope.cpp \ - XPCJSWeakReference.cpp \ - XPCWrapper.cpp \ - XPCQuickStubs.cpp \ - dom_quickstubs.cpp \ - DictionaryHelpers.cpp \ - GeneratedEvents.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk LOCAL_INCLUDES = \ diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index 0f204d18ab9..333faf7130f 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -16,3 +16,40 @@ EXPORTS += [ 'xpcpublic.h', ] +CPP_SOURCES += [ + 'DictionaryHelpers.cpp', + 'GeneratedEvents.cpp', + 'XPCCallContext.cpp', + 'XPCComponents.cpp', + 'XPCContext.cpp', + 'XPCConvert.cpp', + 'XPCDebug.cpp', + 'XPCException.cpp', + 'XPCJSContextStack.cpp', + 'XPCJSID.cpp', + 'XPCJSRuntime.cpp', + 'XPCJSWeakReference.cpp', + 'XPCLocale.cpp', + 'XPCLog.cpp', + 'XPCMaps.cpp', + 'XPCModule.cpp', + 'XPCQuickStubs.cpp', + 'XPCRuntimeService.cpp', + 'XPCStack.cpp', + 'XPCString.cpp', + 'XPCThrower.cpp', + 'XPCVariant.cpp', + 'XPCWrappedJS.cpp', + 'XPCWrappedJSClass.cpp', + 'XPCWrappedNative.cpp', + 'XPCWrappedNativeInfo.cpp', + 'XPCWrappedNativeJSOps.cpp', + 'XPCWrappedNativeProto.cpp', + 'XPCWrappedNativeScope.cpp', + 'XPCWrapper.cpp', + 'dom_quickstubs.cpp', + 'nsCxPusher.cpp', + 'nsScriptError.cpp', + 'nsXPConnect.cpp', +] + diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in index 82a0c4a6c1d..68633347fa8 100644 --- a/js/xpconnect/tests/components/native/Makefile.in +++ b/js/xpconnect/tests/components/native/Makefile.in @@ -16,12 +16,6 @@ MODULE_NAME = xpconnect_test NO_DIST_INSTALL = 1 FORCE_SHARED_LIB = 1 -CPPSRCS = \ - xpctest_module.cpp \ - xpctest_attributes.cpp \ - xpctest_params.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk MANIFEST_FILE = xpctest.manifest diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build index 0167687c845..961d1fc6c43 100644 --- a/js/xpconnect/tests/components/native/moz.build +++ b/js/xpconnect/tests/components/native/moz.build @@ -6,3 +6,9 @@ MODULE = 'xpctest' +CPP_SOURCES += [ + 'xpctest_attributes.cpp', + 'xpctest_module.cpp', + 'xpctest_params.cpp', +] + diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in index 1d1fccfb528..a4c95a0ab3d 100644 --- a/js/xpconnect/wrappers/Makefile.in +++ b/js/xpconnect/wrappers/Makefile.in @@ -13,15 +13,6 @@ LIBRARY_NAME = xpcwrappers_s MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - AccessCheck.cpp \ - WaiveXrayWrapper.cpp \ - FilteringWrapper.cpp \ - ChromeObjectWrapper.cpp \ - XrayWrapper.cpp \ - WrapperFactory.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../src \ -I$(srcdir)/../../../dom/base \ diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build index f3b0da337ff..2241de0036d 100644 --- a/js/xpconnect/wrappers/moz.build +++ b/js/xpconnect/wrappers/moz.build @@ -10,3 +10,12 @@ EXPORTS += [ 'WrapperFactory.h', ] +CPP_SOURCES += [ + 'AccessCheck.cpp', + 'ChromeObjectWrapper.cpp', + 'FilteringWrapper.cpp', + 'WaiveXrayWrapper.cpp', + 'WrapperFactory.cpp', + 'XrayWrapper.cpp', +] + diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 04e0996c05f..c6b973ff917 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -15,62 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - - -CPPSRCS = \ - DisplayItemClip.cpp \ - DisplayListClipState.cpp \ - FrameLayerBuilder.cpp \ - FramePropertyTable.cpp \ - MaskLayerImageCache.cpp \ - nsCSSColorUtils.cpp \ - nsCSSFrameConstructor.cpp \ - nsCSSRendering.cpp \ - nsCSSRenderingBorders.cpp \ - nsCaret.cpp \ - nsChildIterator.cpp \ - nsCounterManager.cpp \ - nsDisplayList.cpp \ - nsDisplayListInvalidation.cpp \ - nsDocumentViewer.cpp \ - nsFrameManager.cpp \ - nsFrameTraversal.cpp \ - nsGenConList.cpp \ - nsLayoutDebugger.cpp \ - nsLayoutHistoryState.cpp \ - nsLayoutUtils.cpp \ - nsPresArena.cpp \ - nsPresContext.cpp \ - nsPresShell.cpp \ - nsQuoteList.cpp \ - nsRefreshDriver.cpp \ - nsStyleChangeList.cpp \ - nsStyleSheetService.cpp \ - PaintTracker.cpp \ - PositionedEventTargeting.cpp \ - RestyleTracker.cpp \ - StackArena.cpp \ - $(NULL) - -ifndef MOZ_XUL -CPPSRCS += \ - nsBoxObject.cpp \ - $(NULL) -endif - -ifdef IBMBIDI -CPPSRCS += \ - nsBidiPresUtils.cpp \ - nsBidi.cpp \ - $(NULL) -endif - -ifdef MOZ_DEBUG -CPPSRCS += \ - nsAutoLayoutPhase.cpp \ - $(NULL) -endif - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/layout/base/moz.build b/layout/base/moz.build index ff9ed1914d7..09e2c7fceab 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -17,6 +17,20 @@ if not CONFIG['MOZ_XUL']: EXPORTS += [ 'nsPIBoxObject.h', ] + CPP_SOURCES += [ + 'nsBoxObject.cpp', + ] + +if CONFIG['IBMBIDI']: + CPP_SOURCES += [ + 'nsBidiPresUtils.cpp', + 'nsBidi.cpp', + ] + +if CONFIG['MOZ_DEBUG']: + CPP_SOURCES += [ + 'nsAutoLayoutPhase.cpp', + ] XPIDL_MODULE = 'layout_base' @@ -61,3 +75,38 @@ EXPORTS.mozilla += [ 'PaintTracker.h', ] +CPP_SOURCES += [ + 'DisplayItemClip.cpp', + 'DisplayListClipState.cpp', + 'FrameLayerBuilder.cpp', + 'FramePropertyTable.cpp', + 'MaskLayerImageCache.cpp', + 'PaintTracker.cpp', + 'PositionedEventTargeting.cpp', + 'RestyleTracker.cpp', + 'StackArena.cpp', + 'nsCSSColorUtils.cpp', + 'nsCSSFrameConstructor.cpp', + 'nsCSSRendering.cpp', + 'nsCSSRenderingBorders.cpp', + 'nsCaret.cpp', + 'nsChildIterator.cpp', + 'nsCounterManager.cpp', + 'nsDisplayList.cpp', + 'nsDisplayListInvalidation.cpp', + 'nsDocumentViewer.cpp', + 'nsFrameManager.cpp', + 'nsFrameTraversal.cpp', + 'nsGenConList.cpp', + 'nsLayoutDebugger.cpp', + 'nsLayoutHistoryState.cpp', + 'nsLayoutUtils.cpp', + 'nsPresArena.cpp', + 'nsPresContext.cpp', + 'nsPresShell.cpp', + 'nsQuoteList.cpp', + 'nsRefreshDriver.cpp', + 'nsStyleChangeList.cpp', + 'nsStyleSheetService.cpp', +] + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index e1010fd01b5..b3feaf93a87 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -24,12 +24,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsLayoutModule.cpp \ - nsContentDLF.cpp \ - nsLayoutStatics.cpp \ - $(NULL) - SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ ../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \ diff --git a/layout/build/moz.build b/layout/build/moz.build index 022e8e0d183..fdb12f185b6 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -12,3 +12,9 @@ EXPORTS += [ 'nsLayoutStatics.h', ] +CPP_SOURCES += [ + 'nsContentDLF.cpp', + 'nsLayoutModule.cpp', + 'nsLayoutStatics.cpp', +] + diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index c5221e6aad7..902752303ea 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -15,26 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsButtonFrameRenderer.cpp \ - nsComboboxControlFrame.cpp \ - nsFieldSetFrame.cpp \ - nsFileControlFrame.cpp \ - nsFormControlFrame.cpp \ - nsGfxButtonControlFrame.cpp \ - nsGfxCheckboxControlFrame.cpp \ - nsGfxRadioControlFrame.cpp \ - nsProgressFrame.cpp \ - nsRangeFrame.cpp \ - nsMeterFrame.cpp \ - nsTextControlFrame.cpp \ - nsHTMLButtonControlFrame.cpp \ - nsImageControlFrame.cpp \ - nsLegendFrame.cpp \ - nsListControlFrame.cpp \ - nsSelectsAreaFrame.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 0d470c306c3..029a974df89 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -16,3 +16,23 @@ EXPORTS += [ 'nsITextControlFrame.h', ] +CPP_SOURCES += [ + 'nsButtonFrameRenderer.cpp', + 'nsComboboxControlFrame.cpp', + 'nsFieldSetFrame.cpp', + 'nsFileControlFrame.cpp', + 'nsFormControlFrame.cpp', + 'nsGfxButtonControlFrame.cpp', + 'nsGfxCheckboxControlFrame.cpp', + 'nsGfxRadioControlFrame.cpp', + 'nsHTMLButtonControlFrame.cpp', + 'nsImageControlFrame.cpp', + 'nsLegendFrame.cpp', + 'nsListControlFrame.cpp', + 'nsMeterFrame.cpp', + 'nsProgressFrame.cpp', + 'nsRangeFrame.cpp', + 'nsSelectsAreaFrame.cpp', + 'nsTextControlFrame.cpp', +] + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index be0c1399fff..edf7c03e193 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -16,53 +16,6 @@ ifndef _MSC_VER FAIL_ON_WARNINGS = 1 endif # !_MSC_VER -CPPSRCS = \ - FrameChildList.cpp \ - nsAbsoluteContainingBlock.cpp \ - nsBRFrame.cpp \ - nsBlockFrame.cpp \ - nsBlockReflowContext.cpp \ - nsBlockReflowState.cpp \ - nsBulletFrame.cpp \ - nsColumnSetFrame.cpp \ - nsContainerFrame.cpp \ - nsFirstLetterFrame.cpp \ - nsFlexContainerFrame.cpp \ - nsFloatManager.cpp \ - nsFontInflationData.cpp \ - nsFrame.cpp \ - nsFrameList.cpp \ - nsFrameSetFrame.cpp \ - nsFrameUtil.cpp \ - nsGfxScrollFrame.cpp \ - nsHTMLCanvasFrame.cpp \ - nsCanvasFrame.cpp \ - nsHTMLReflowMetrics.cpp \ - nsHTMLReflowState.cpp \ - nsImageFrame.cpp \ - nsImageMap.cpp \ - nsInlineFrame.cpp \ - nsIntervalSet.cpp \ - nsLeafFrame.cpp \ - nsLineBox.cpp \ - nsLineLayout.cpp \ - nsObjectFrame.cpp \ - nsPageContentFrame.cpp \ - nsPageFrame.cpp \ - nsPlaceholderFrame.cpp \ - ScrollbarActivity.cpp \ - nsSelection.cpp \ - nsSimplePageSequence.cpp \ - nsSplittableFrame.cpp \ - nsSubDocumentFrame.cpp \ - nsTextFrameThebes.cpp \ - nsTextFrameUtils.cpp \ - TextOverflow.cpp \ - nsTextRunTransformations.cpp \ - nsViewportFrame.cpp \ - nsVideoFrame.cpp \ - $(NULL) - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) CMMSRCS += \ nsPluginUtilsOSX.mm \ diff --git a/layout/generic/moz.build b/layout/generic/moz.build index b3f567cdbae..088e108916c 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -41,3 +41,49 @@ EXPORTS.mozilla.layout += [ 'FrameChildList.h', ] +CPP_SOURCES += [ + 'FrameChildList.cpp', + 'ScrollbarActivity.cpp', + 'TextOverflow.cpp', + 'nsAbsoluteContainingBlock.cpp', + 'nsBRFrame.cpp', + 'nsBlockFrame.cpp', + 'nsBlockReflowContext.cpp', + 'nsBlockReflowState.cpp', + 'nsBulletFrame.cpp', + 'nsCanvasFrame.cpp', + 'nsColumnSetFrame.cpp', + 'nsContainerFrame.cpp', + 'nsFirstLetterFrame.cpp', + 'nsFlexContainerFrame.cpp', + 'nsFloatManager.cpp', + 'nsFontInflationData.cpp', + 'nsFrame.cpp', + 'nsFrameList.cpp', + 'nsFrameSetFrame.cpp', + 'nsFrameUtil.cpp', + 'nsGfxScrollFrame.cpp', + 'nsHTMLCanvasFrame.cpp', + 'nsHTMLReflowMetrics.cpp', + 'nsHTMLReflowState.cpp', + 'nsImageFrame.cpp', + 'nsImageMap.cpp', + 'nsInlineFrame.cpp', + 'nsIntervalSet.cpp', + 'nsLeafFrame.cpp', + 'nsLineBox.cpp', + 'nsLineLayout.cpp', + 'nsObjectFrame.cpp', + 'nsPageContentFrame.cpp', + 'nsPageFrame.cpp', + 'nsPlaceholderFrame.cpp', + 'nsSelection.cpp', + 'nsSimplePageSequence.cpp', + 'nsSplittableFrame.cpp', + 'nsSubDocumentFrame.cpp', + 'nsTextFrameThebes.cpp', + 'nsTextFrameUtils.cpp', + 'nsTextRunTransformations.cpp', + 'nsVideoFrame.cpp', + 'nsViewportFrame.cpp', +] diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 9533cab27d1..199bfc7c764 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -14,23 +14,6 @@ LIBRARY_NAME = inspector_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS= \ - inDeepTreeWalker.cpp \ - inFlasher.cpp \ - inSearchLoop.cpp \ - inCSSValueSearch.cpp \ - inDOMUtils.cpp \ - inLayoutUtils.cpp \ - nsFontFace.cpp \ - nsFontFaceList.cpp \ - $(NULL) - -ifdef MOZ_XUL -CPPSRCS += \ - inDOMView.cpp \ - $(NULL) -endif - FORCE_STATIC_LIB = 1 LOCAL_INCLUDES += \ diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build index 7078b81e642..b766e1e2eb3 100644 --- a/layout/inspector/src/moz.build +++ b/layout/inspector/src/moz.build @@ -11,3 +11,18 @@ EXPORTS += [ 'nsFontFaceList.h', ] +CPP_SOURCES += [ + 'inCSSValueSearch.cpp', + 'inDOMUtils.cpp', + 'inDeepTreeWalker.cpp', + 'inFlasher.cpp', + 'inLayoutUtils.cpp', + 'inSearchLoop.cpp', + 'nsFontFace.cpp', + 'nsFontFaceList.cpp', +] + +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'inDOMView.cpp', + ] diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 76965e03dc4..7c7a54111eb 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -15,11 +15,6 @@ FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - RenderFrameChild.cpp \ - RenderFrameParent.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index 86565cc931a..e9c1f734477 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -12,3 +12,8 @@ EXPORTS.mozilla.layout += [ 'RenderFrameUtils.h', ] +CPP_SOURCES += [ + 'RenderFrameChild.cpp', + 'RenderFrameParent.cpp', +] + diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index 3b6feda572c..c00a8a2867a 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -26,33 +26,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../xul/base/src \ $(NULL) -CPPSRCS = nsMathMLChar.cpp \ - nsMathMLFrame.cpp \ - nsMathMLContainerFrame.cpp \ - nsMathMLOperators.cpp \ - nsMathMLTokenFrame.cpp \ - nsMathMLmoFrame.cpp \ - nsMathMLmrowFrame.cpp \ - nsMathMLmphantomFrame.cpp \ - nsMathMLmfencedFrame.cpp \ - nsMathMLmfracFrame.cpp \ - nsMathMLmsupFrame.cpp \ - nsMathMLmsubFrame.cpp \ - nsMathMLmsubsupFrame.cpp \ - nsMathMLmmultiscriptsFrame.cpp \ - nsMathMLmtableFrame.cpp \ - nsMathMLmunderoverFrame.cpp \ - nsMathMLmpaddedFrame.cpp \ - nsMathMLmspaceFrame.cpp \ - nsMathMLmstyleFrame.cpp \ - nsMathMLmsqrtFrame.cpp \ - nsMathMLmrootFrame.cpp \ - nsMathMLSelectedFrame.cpp \ - nsMathMLmactionFrame.cpp \ - nsMathMLmencloseFrame.cpp \ - nsMathMLsemanticsFrame.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index 3fdb5764610..281e98cf377 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -6,3 +6,31 @@ MODULE = 'layout' +CPP_SOURCES += [ + 'nsMathMLChar.cpp', + 'nsMathMLContainerFrame.cpp', + 'nsMathMLFrame.cpp', + 'nsMathMLOperators.cpp', + 'nsMathMLSelectedFrame.cpp', + 'nsMathMLTokenFrame.cpp', + 'nsMathMLmactionFrame.cpp', + 'nsMathMLmencloseFrame.cpp', + 'nsMathMLmfencedFrame.cpp', + 'nsMathMLmfracFrame.cpp', + 'nsMathMLmmultiscriptsFrame.cpp', + 'nsMathMLmoFrame.cpp', + 'nsMathMLmpaddedFrame.cpp', + 'nsMathMLmphantomFrame.cpp', + 'nsMathMLmrootFrame.cpp', + 'nsMathMLmrowFrame.cpp', + 'nsMathMLmspaceFrame.cpp', + 'nsMathMLmsqrtFrame.cpp', + 'nsMathMLmstyleFrame.cpp', + 'nsMathMLmsubFrame.cpp', + 'nsMathMLmsubsupFrame.cpp', + 'nsMathMLmsupFrame.cpp', + 'nsMathMLmtableFrame.cpp', + 'nsMathMLmunderoverFrame.cpp', + 'nsMathMLsemanticsFrame.cpp', +] + diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index 879ea615958..3dc42df2bb5 100644 --- a/layout/printing/Makefile.in +++ b/layout/printing/Makefile.in @@ -13,14 +13,6 @@ LIBRARY_NAME = gkprinting_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsPrintEngine.cpp \ - nsPrintData.cpp \ - nsPrintObject.cpp \ - nsPagePrintTimer.cpp \ - nsPrintPreviewListener.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/layout/printing/moz.build b/layout/printing/moz.build index f70582c657c..2e2ee1d58fd 100644 --- a/layout/printing/moz.build +++ b/layout/printing/moz.build @@ -14,3 +14,11 @@ XPIDL_MODULE = 'layout_printing' MODULE = 'layout' +CPP_SOURCES += [ + 'nsPagePrintTimer.cpp', + 'nsPrintData.cpp', + 'nsPrintEngine.cpp', + 'nsPrintObject.cpp', + 'nsPrintPreviewListener.cpp', +] + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index a2d148d4cb7..d1e7c7f43c2 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -19,53 +19,6 @@ OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow endif -CPPSRCS = \ - AnimationCommon.cpp \ - CSS.cpp \ - nsCSSAnonBoxes.cpp \ - nsCSSDataBlock.cpp \ - Declaration.cpp \ - ErrorReporter.cpp \ - nsCSSKeywords.cpp \ - ImageLoader.cpp \ - Loader.cpp \ - nsAnimationManager.cpp \ - nsCSSParser.cpp \ - nsCSSProps.cpp \ - nsCSSPseudoClasses.cpp \ - nsCSSPseudoElements.cpp \ - nsCSSRuleProcessor.cpp \ - nsCSSRules.cpp \ - nsCSSScanner.cpp \ - nsCSSStyleSheet.cpp \ - nsCSSValue.cpp \ - nsComputedDOMStyle.cpp \ - nsDOMCSSAttrDeclaration.cpp \ - nsDOMCSSDeclaration.cpp \ - nsDOMCSSRGBColor.cpp \ - nsDOMCSSRect.cpp \ - nsDOMCSSValueList.cpp \ - nsDOMMediaQueryList.cpp \ - nsFontFaceLoader.cpp \ - nsHTMLCSSStyleSheet.cpp \ - nsHTMLStyleSheet.cpp \ - nsLayoutStylesheetCache.cpp \ - nsMediaFeatures.cpp \ - nsNthIndexCache.cpp \ - nsROCSSPrimitiveValue.cpp \ - nsRuleData.cpp \ - nsRuleNode.cpp \ - nsStyleAnimation.cpp \ - nsStyleContext.cpp \ - nsStyleCoord.cpp \ - nsStyleSet.cpp \ - nsStyleStruct.cpp \ - nsStyleTransformMatrix.cpp \ - nsStyleUtil.cpp \ - nsTransitionManager.cpp \ - StyleRule.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/layout/style/moz.build b/layout/style/moz.build index f8906812091..5105d130350 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -75,3 +75,50 @@ EXPORTS.mozilla.css += [ 'StyleRule.h', ] +CPP_SOURCES += [ + 'AnimationCommon.cpp', + 'CSS.cpp', + 'Declaration.cpp', + 'ErrorReporter.cpp', + 'ImageLoader.cpp', + 'Loader.cpp', + 'StyleRule.cpp', + 'nsAnimationManager.cpp', + 'nsCSSAnonBoxes.cpp', + 'nsCSSDataBlock.cpp', + 'nsCSSKeywords.cpp', + 'nsCSSParser.cpp', + 'nsCSSProps.cpp', + 'nsCSSPseudoClasses.cpp', + 'nsCSSPseudoElements.cpp', + 'nsCSSRuleProcessor.cpp', + 'nsCSSRules.cpp', + 'nsCSSScanner.cpp', + 'nsCSSStyleSheet.cpp', + 'nsCSSValue.cpp', + 'nsComputedDOMStyle.cpp', + 'nsDOMCSSAttrDeclaration.cpp', + 'nsDOMCSSDeclaration.cpp', + 'nsDOMCSSRGBColor.cpp', + 'nsDOMCSSRect.cpp', + 'nsDOMCSSValueList.cpp', + 'nsDOMMediaQueryList.cpp', + 'nsFontFaceLoader.cpp', + 'nsHTMLCSSStyleSheet.cpp', + 'nsHTMLStyleSheet.cpp', + 'nsLayoutStylesheetCache.cpp', + 'nsMediaFeatures.cpp', + 'nsNthIndexCache.cpp', + 'nsROCSSPrimitiveValue.cpp', + 'nsRuleData.cpp', + 'nsRuleNode.cpp', + 'nsStyleAnimation.cpp', + 'nsStyleContext.cpp', + 'nsStyleCoord.cpp', + 'nsStyleSet.cpp', + 'nsStyleStruct.cpp', + 'nsStyleTransformMatrix.cpp', + 'nsStyleUtil.cpp', + 'nsTransitionManager.cpp', +] + diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index 56f7d65e844..885b2b89872 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -15,44 +15,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsSVGAFrame.cpp \ - nsSVGClipPathFrame.cpp \ - nsSVGContainerFrame.cpp \ - nsSVGEffects.cpp \ - SVGFEContainerFrame.cpp \ - SVGFEImageFrame.cpp \ - SVGFELeafFrame.cpp \ - SVGFEUnstyledLeafFrame.cpp \ - nsSVGFilterFrame.cpp \ - nsSVGFilterInstance.cpp \ - nsSVGForeignObjectFrame.cpp \ - nsSVGGFrame.cpp \ - nsSVGGenericContainerFrame.cpp \ - nsSVGGeometryFrame.cpp \ - nsSVGGlyphFrame.cpp \ - nsSVGGradientFrame.cpp \ - nsSVGImageFrame.cpp \ - nsSVGInnerSVGFrame.cpp \ - nsSVGIntegrationUtils.cpp \ - nsSVGMarkerFrame.cpp \ - nsSVGMaskFrame.cpp \ - nsSVGOuterSVGFrame.cpp \ - nsSVGPaintServerFrame.cpp \ - nsSVGPathGeometryFrame.cpp \ - nsSVGPatternFrame.cpp \ - nsSVGStopFrame.cpp \ - nsSVGSwitchFrame.cpp \ - nsSVGTextContainerFrame.cpp \ - nsSVGTextFrame.cpp \ - nsSVGTextFrame2.cpp \ - nsSVGTextPathFrame.cpp \ - nsSVGTSpanFrame.cpp \ - nsSVGUseFrame.cpp \ - SVGViewFrame.cpp \ - nsSVGUtils.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/layout/svg/moz.build b/layout/svg/moz.build index 194935eec9b..49880173c2d 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -15,3 +15,41 @@ EXPORTS += [ 'nsSVGUtils.h', ] +CPP_SOURCES += [ + 'SVGFEContainerFrame.cpp', + 'SVGFEImageFrame.cpp', + 'SVGFELeafFrame.cpp', + 'SVGFEUnstyledLeafFrame.cpp', + 'SVGViewFrame.cpp', + 'nsSVGAFrame.cpp', + 'nsSVGClipPathFrame.cpp', + 'nsSVGContainerFrame.cpp', + 'nsSVGEffects.cpp', + 'nsSVGFilterFrame.cpp', + 'nsSVGFilterInstance.cpp', + 'nsSVGForeignObjectFrame.cpp', + 'nsSVGGFrame.cpp', + 'nsSVGGenericContainerFrame.cpp', + 'nsSVGGeometryFrame.cpp', + 'nsSVGGlyphFrame.cpp', + 'nsSVGGradientFrame.cpp', + 'nsSVGImageFrame.cpp', + 'nsSVGInnerSVGFrame.cpp', + 'nsSVGIntegrationUtils.cpp', + 'nsSVGMarkerFrame.cpp', + 'nsSVGMaskFrame.cpp', + 'nsSVGOuterSVGFrame.cpp', + 'nsSVGPaintServerFrame.cpp', + 'nsSVGPathGeometryFrame.cpp', + 'nsSVGPatternFrame.cpp', + 'nsSVGStopFrame.cpp', + 'nsSVGSwitchFrame.cpp', + 'nsSVGTSpanFrame.cpp', + 'nsSVGTextContainerFrame.cpp', + 'nsSVGTextFrame.cpp', + 'nsSVGTextFrame2.cpp', + 'nsSVGTextPathFrame.cpp', + 'nsSVGUseFrame.cpp', + 'nsSVGUtils.cpp', +] + diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index 46bf8ee1a29..2794109f16b 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -15,23 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - - -CPPSRCS = \ - BasicTableLayoutStrategy.cpp \ - FixedTableLayoutStrategy.cpp \ - SpanningCellSorter.cpp \ - nsCellMap.cpp \ - nsTableCellFrame.cpp \ - nsTableColFrame.cpp \ - nsTableColGroupFrame.cpp \ - nsTableFrame.cpp \ - nsTableOuterFrame.cpp \ - nsTableRowFrame.cpp \ - nsTableRowGroupFrame.cpp \ - nsTablePainter.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/layout/tables/moz.build b/layout/tables/moz.build index b8d03817b45..477cb73330e 100644 --- a/layout/tables/moz.build +++ b/layout/tables/moz.build @@ -12,3 +12,18 @@ EXPORTS += [ 'nsITableCellLayout.h', ] +CPP_SOURCES += [ + 'BasicTableLayoutStrategy.cpp', + 'FixedTableLayoutStrategy.cpp', + 'SpanningCellSorter.cpp', + 'nsCellMap.cpp', + 'nsTableCellFrame.cpp', + 'nsTableColFrame.cpp', + 'nsTableColGroupFrame.cpp', + 'nsTableFrame.cpp', + 'nsTableOuterFrame.cpp', + 'nsTablePainter.cpp', + 'nsTableRowFrame.cpp', + 'nsTableRowGroupFrame.cpp', +] + diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in index 116e3fa4bfb..a5176a8fc48 100644 --- a/layout/tools/layout-debug/src/Makefile.in +++ b/layout/tools/layout-debug/src/Makefile.in @@ -18,13 +18,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsDebugFactory.cpp \ - nsLayoutDebugCLH.cpp \ - nsLayoutDebuggingTools.cpp \ - nsRegressionTester.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk libs:: diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build index 0472abb02f6..1e14110aded 100644 --- a/layout/tools/layout-debug/src/moz.build +++ b/layout/tools/layout-debug/src/moz.build @@ -15,3 +15,10 @@ EXPORTS += [ 'nsLayoutDebugCIID.h', ] +CPP_SOURCES += [ + 'nsDebugFactory.cpp', + 'nsLayoutDebugCLH.cpp', + 'nsLayoutDebuggingTools.cpp', + 'nsRegressionTester.cpp', +] + diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 8f6ab248f42..25bd6f144cd 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -14,56 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsScrollBoxFrame.cpp \ - nsRootBoxFrame.cpp \ - nsBox.cpp \ - nsBoxFrame.cpp \ - nsBoxLayoutState.cpp \ - nsSprocketLayout.cpp \ - nsStackFrame.cpp \ - nsStackLayout.cpp \ - nsBoxLayout.cpp \ - nsScrollbarFrame.cpp \ - nsScrollbarButtonFrame.cpp \ - nsButtonBoxFrame.cpp \ - nsSliderFrame.cpp \ - nsRepeatService.cpp \ - nsXULTooltipListener.cpp \ - $(NULL) - -ifdef MOZ_XUL -CPPSRCS += \ - nsScrollBoxObject.cpp \ - nsContainerBoxObject.cpp \ - nsMenuBoxObject.cpp \ - nsPopupBoxObject.cpp \ - nsListBoxObject.cpp \ - nsBoxObject.cpp \ - nsImageBoxFrame.cpp \ - nsDocElementBoxFrame.cpp \ - nsLeafBoxFrame.cpp \ - nsTextBoxFrame.cpp \ - nsGroupBoxFrame.cpp \ - nsSplitterFrame.cpp \ - nsDeckFrame.cpp \ - nsProgressMeterFrame.cpp \ - nsMenuPopupFrame.cpp \ - nsMenuFrame.cpp \ - nsMenuBarFrame.cpp \ - nsMenuBarListener.cpp \ - nsPopupSetFrame.cpp \ - nsTitleBarFrame.cpp \ - nsResizerFrame.cpp \ - nsListBoxBodyFrame.cpp \ - nsListItemFrame.cpp \ - nsListBoxLayout.cpp \ - nsXULLabelFrame.cpp \ - nsXULPopupManager.cpp \ - $(NULL) - -endif - include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index 3fdb5764610..5fb54ba5bbe 100644 --- a/layout/xul/base/src/moz.build +++ b/layout/xul/base/src/moz.build @@ -6,3 +6,50 @@ MODULE = 'layout' +CPP_SOURCES += [ + 'nsBox.cpp', + 'nsBoxFrame.cpp', + 'nsBoxLayout.cpp', + 'nsBoxLayoutState.cpp', + 'nsButtonBoxFrame.cpp', + 'nsRepeatService.cpp', + 'nsRootBoxFrame.cpp', + 'nsScrollBoxFrame.cpp', + 'nsScrollbarButtonFrame.cpp', + 'nsScrollbarFrame.cpp', + 'nsSliderFrame.cpp', + 'nsSprocketLayout.cpp', + 'nsStackFrame.cpp', + 'nsStackLayout.cpp', + 'nsXULTooltipListener.cpp', +] + +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'nsScrollBoxObject.cpp', + 'nsContainerBoxObject.cpp', + 'nsMenuBoxObject.cpp', + 'nsPopupBoxObject.cpp', + 'nsListBoxObject.cpp', + 'nsBoxObject.cpp', + 'nsImageBoxFrame.cpp', + 'nsDocElementBoxFrame.cpp', + 'nsLeafBoxFrame.cpp', + 'nsTextBoxFrame.cpp', + 'nsGroupBoxFrame.cpp', + 'nsSplitterFrame.cpp', + 'nsDeckFrame.cpp', + 'nsProgressMeterFrame.cpp', + 'nsMenuPopupFrame.cpp', + 'nsMenuFrame.cpp', + 'nsMenuBarFrame.cpp', + 'nsMenuBarListener.cpp', + 'nsPopupSetFrame.cpp', + 'nsTitleBarFrame.cpp', + 'nsResizerFrame.cpp', + 'nsListBoxBodyFrame.cpp', + 'nsListItemFrame.cpp', + 'nsListBoxLayout.cpp', + 'nsXULLabelFrame.cpp', + 'nsXULPopupManager.cpp', + ] diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in index 1e724c3e26b..904673fd58f 100644 --- a/layout/xul/grid/Makefile.in +++ b/layout/xul/grid/Makefile.in @@ -14,18 +14,6 @@ LIBRARY_NAME = gkxulgrid_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsGridLayout2.cpp \ - nsGridRowLayout.cpp \ - nsGridRowLeafLayout.cpp \ - nsGridRowLeafFrame.cpp \ - nsGridRowGroupLayout.cpp \ - nsGridRowGroupFrame.cpp \ - nsGrid.cpp \ - nsGridRow.cpp \ - nsGridCell.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../base/src \ diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build index 850c98c39da..ed902914d43 100644 --- a/layout/xul/grid/moz.build +++ b/layout/xul/grid/moz.build @@ -18,3 +18,15 @@ EXPORTS += [ 'nsIGridPart.h', ] +CPP_SOURCES += [ + 'nsGrid.cpp', + 'nsGridCell.cpp', + 'nsGridLayout2.cpp', + 'nsGridRow.cpp', + 'nsGridRowGroupFrame.cpp', + 'nsGridRowGroupLayout.cpp', + 'nsGridRowLayout.cpp', + 'nsGridRowLeafFrame.cpp', + 'nsGridRowLeafLayout.cpp', +] + diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in index 56dbd49c0ed..f714c895c7d 100644 --- a/layout/xul/tree/Makefile.in +++ b/layout/xul/tree/Makefile.in @@ -14,18 +14,6 @@ LIBRARY_NAME = gkxultree_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsTreeBodyFrame.cpp \ - nsTreeBoxObject.cpp \ - nsTreeColFrame.cpp \ - nsTreeColumns.cpp \ - nsTreeContentView.cpp \ - nsTreeImageListener.cpp \ - nsTreeSelection.cpp \ - nsTreeStyleCache.cpp \ - nsTreeUtils.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(topsrcdir)/content/events/src \ diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build index 8e599e3ff2d..262e73b3833 100644 --- a/layout/xul/tree/moz.build +++ b/layout/xul/tree/moz.build @@ -21,3 +21,15 @@ EXPORTS += [ 'nsTreeUtils.h', ] +CPP_SOURCES += [ + 'nsTreeBodyFrame.cpp', + 'nsTreeBoxObject.cpp', + 'nsTreeColFrame.cpp', + 'nsTreeColumns.cpp', + 'nsTreeContentView.cpp', + 'nsTreeImageListener.cpp', + 'nsTreeSelection.cpp', + 'nsTreeStyleCache.cpp', + 'nsTreeUtils.cpp', +] + diff --git a/media/libsoundtouch/src/Makefile.in b/media/libsoundtouch/src/Makefile.in index 6cdfa90c0c7..0326ae07b47 100644 --- a/media/libsoundtouch/src/Makefile.in +++ b/media/libsoundtouch/src/Makefile.in @@ -18,23 +18,6 @@ EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB) # Use abort() instead of exception in SoundTouch. DEFINES += -DST_NO_EXCEPTION_HANDLING=1 -CPPSRCS = AAFilter.cpp \ - cpu_detect_x86.cpp \ - FIFOSampleBuffer.cpp \ - FIRFilter.cpp \ - RateTransposer.cpp \ - SoundTouch.cpp \ - TDStretch.cpp \ - $(NULL) - -ifneq (,$(INTEL_ARCHITECTURE)) -ifdef MOZ_SAMPLE_TYPE_FLOAT32 -CPPSRCS += sse_optimized.cpp -else -CPPSRCS += mmx_optimized.cpp -endif -endif - include $(topsrcdir)/config/rules.mk ifneq (,$(INTEL_ARCHITECTURE)) diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build index 7737d485c6e..888ab60f409 100644 --- a/media/libsoundtouch/src/moz.build +++ b/media/libsoundtouch/src/moz.build @@ -13,3 +13,22 @@ EXPORTS.soundtouch += [ 'soundtouch_config.h', ] +CPP_SOURCES += [ + 'AAFilter.cpp', + 'FIFOSampleBuffer.cpp', + 'FIRFilter.cpp', + 'RateTransposer.cpp', + 'SoundTouch.cpp', + 'TDStretch.cpp', + 'cpu_detect_x86.cpp', +] + +if CONFIG['INTEL_ARCHITECTURE']: + if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']: + CPP_SOURCES += [ + 'sse_optimized.cpp', + ] + else: + CPP_SOURCES += [ + 'mmx_optimized.cpp', + ] diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index f93ca185b0e..60ad3881ebf 100644 --- a/media/mtransport/build/Makefile.in +++ b/media/mtransport/build/Makefile.in @@ -24,10 +24,6 @@ ifndef _MSC_VER FAIL_ON_WARNINGS = 1 endif # !_MSC_VER -CPPSRCS = \ - $(MTRANSPORT_LCPPSRCS) \ - $(NULL) - include $(srcdir)/../objs.mk diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build index 1a048822333..4c757ed6a8b 100644 --- a/media/mtransport/build/moz.build +++ b/media/mtransport/build/moz.build @@ -24,3 +24,7 @@ EXPORTS.mtransport += [ '../transportlayerprsock.h', ] +CPP_SOURCES += [ + '$(MTRANSPORT_LCPPSRCS)', +] + diff --git a/media/mtransport/standalone/Makefile.in b/media/mtransport/standalone/Makefile.in index 9ab7522dbc2..064dd456390 100644 --- a/media/mtransport/standalone/Makefile.in +++ b/media/mtransport/standalone/Makefile.in @@ -20,11 +20,6 @@ endif SRCS_IN_OBJDIR = 1 -CPPSRCS = \ - $(MTRANSPORT_LCPPSRCS) \ - $(NULL) - - # Make a copy into the local directory for dual compilation export:: $(MTRANSPORT_CPPSRCS) $(INSTALL) $^ . diff --git a/media/mtransport/standalone/moz.build b/media/mtransport/standalone/moz.build index 7a9ab1e353a..192ddcccfba 100644 --- a/media/mtransport/standalone/moz.build +++ b/media/mtransport/standalone/moz.build @@ -20,3 +20,7 @@ EXPORTS.mtransport += [ '../transportlayerprsock.h', ] +CPP_SOURCES += [ + '$(MTRANSPORT_LCPPSRCS)', +] + diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in index 9372f12878e..208f75e0e72 100644 --- a/media/omx-plugin/Makefile.in +++ b/media/omx-plugin/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPlugin.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in index 0d1d46c9292..4a762115cd6 100644 --- a/media/omx-plugin/froyo/Makefile.in +++ b/media/omx-plugin/froyo/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPluginFroyo.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/froyo/moz.build b/media/omx-plugin/froyo/moz.build index 70d49e5fc3c..f540bc6296e 100644 --- a/media/omx-plugin/froyo/moz.build +++ b/media/omx-plugin/froyo/moz.build @@ -6,3 +6,7 @@ MODULE = 'omxpluginfroyo' +CPP_SOURCES += [ + 'OmxPluginFroyo.cpp', +] + diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in index 9e780138966..ff1847c0515 100644 --- a/media/omx-plugin/gb/Makefile.in +++ b/media/omx-plugin/gb/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPlugin236.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/gb/moz.build b/media/omx-plugin/gb/moz.build index c37f2fbacf9..201cc51e729 100644 --- a/media/omx-plugin/gb/moz.build +++ b/media/omx-plugin/gb/moz.build @@ -6,3 +6,7 @@ MODULE = 'omxplugingb' +CPP_SOURCES += [ + 'OmxPlugin236.cpp', +] + diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in index b1f104b1dfc..f2290c01cfe 100644 --- a/media/omx-plugin/gb235/Makefile.in +++ b/media/omx-plugin/gb235/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPlugin235.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/gb235/moz.build b/media/omx-plugin/gb235/moz.build index af8d73b7939..ba93820cb5d 100644 --- a/media/omx-plugin/gb235/moz.build +++ b/media/omx-plugin/gb235/moz.build @@ -6,3 +6,7 @@ MODULE = 'omxplugingb235' +CPP_SOURCES += [ + 'OmxPlugin235.cpp', +] + diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in index 96338d32dfd..6bca76205e3 100644 --- a/media/omx-plugin/hc/Makefile.in +++ b/media/omx-plugin/hc/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPluginHoneycomb.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/hc/moz.build b/media/omx-plugin/hc/moz.build index 5de974a537f..27f559c88b2 100644 --- a/media/omx-plugin/hc/moz.build +++ b/media/omx-plugin/hc/moz.build @@ -6,3 +6,7 @@ MODULE = 'omxpluginhc' +CPP_SOURCES += [ + 'OmxPluginHoneycomb.cpp', +] + diff --git a/media/omx-plugin/jb-htc/Makefile.in b/media/omx-plugin/jb-htc/Makefile.in index 284616bd170..a09c8e87117 100644 --- a/media/omx-plugin/jb-htc/Makefile.in +++ b/media/omx-plugin/jb-htc/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPluginJB-HTC.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/jb-htc/moz.build b/media/omx-plugin/jb-htc/moz.build index 69e705661db..dafc1667dfc 100644 --- a/media/omx-plugin/jb-htc/moz.build +++ b/media/omx-plugin/jb-htc/moz.build @@ -6,3 +6,7 @@ MODULE = 'omxpluginjb-htc' +CPP_SOURCES += [ + 'OmxPluginJB-HTC.cpp', +] + diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in index a60941412bf..d2d4b9d1562 100644 --- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libstagefright.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/froyo/libstagefright/moz.build b/media/omx-plugin/lib/froyo/libstagefright/moz.build index 26bd3522bca..9b7700a3a11 100644 --- a/media/omx-plugin/lib/froyo/libstagefright/moz.build +++ b/media/omx-plugin/lib/froyo/libstagefright/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidstagefrightfroyo' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libstagefright.cpp', + ] diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in index 2409ba75cc0..d72acf3a688 100644 --- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libstagefright.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/gb/libstagefright/moz.build b/media/omx-plugin/lib/gb/libstagefright/moz.build index f1aefd90992..406b01614eb 100644 --- a/media/omx-plugin/lib/gb/libstagefright/moz.build +++ b/media/omx-plugin/lib/gb/libstagefright/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidstagefrightgb' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libstagefright.cpp', + ] diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in index e129c7251a9..f850add9c11 100644 --- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in +++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libstagefright_color_conversion.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build index de225adf8f7..2646020ec5d 100644 --- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build +++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build @@ -6,3 +6,7 @@ MODULE = 'libstagefright_color_conversion' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libstagefright_color_conversion.cpp', + ] diff --git a/media/omx-plugin/lib/gb/libutils/Makefile.in b/media/omx-plugin/lib/gb/libutils/Makefile.in index bbe909c3f5c..b1cd1f71970 100644 --- a/media/omx-plugin/lib/gb/libutils/Makefile.in +++ b/media/omx-plugin/lib/gb/libutils/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libutils.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/gb/libutils/moz.build b/media/omx-plugin/lib/gb/libutils/moz.build index 81fc3c83618..182abfa206a 100644 --- a/media/omx-plugin/lib/gb/libutils/moz.build +++ b/media/omx-plugin/lib/gb/libutils/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidutilsgb' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libutils.cpp', + ] diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in index 84d2a172160..ff2505a9217 100644 --- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libstagefright.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/gb235/libstagefright/moz.build b/media/omx-plugin/lib/gb235/libstagefright/moz.build index 3bf4192dd51..48738518c35 100644 --- a/media/omx-plugin/lib/gb235/libstagefright/moz.build +++ b/media/omx-plugin/lib/gb235/libstagefright/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidstagefrightgb234' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libstagefright.cpp', + ] diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in index e25d4abba34..d68335cbab0 100644 --- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libstagefright.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/hc/libstagefright/moz.build b/media/omx-plugin/lib/hc/libstagefright/moz.build index da250db8866..1a5d3b07d89 100644 --- a/media/omx-plugin/lib/hc/libstagefright/moz.build +++ b/media/omx-plugin/lib/hc/libstagefright/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidstagefrighthc' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libstagefright.cpp', + ] diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in index 74e667c1b94..02064f4d175 100644 --- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in +++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libstagefright.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build index aeee51259e7..2695a3b545f 100644 --- a/media/omx-plugin/lib/ics/libstagefright/moz.build +++ b/media/omx-plugin/lib/ics/libstagefright/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidstagefright' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libstagefright.cpp', + ] diff --git a/media/omx-plugin/lib/ics/libutils/Makefile.in b/media/omx-plugin/lib/ics/libutils/Makefile.in index d55f55568a9..a017490b075 100644 --- a/media/omx-plugin/lib/ics/libutils/Makefile.in +++ b/media/omx-plugin/lib/ics/libutils/Makefile.in @@ -32,12 +32,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -ifneq ($(MOZ_WIDGET_TOOLKIT),gonk) -CPPSRCS = \ - libutils.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build index d28467bf2d6..d48bdabba22 100644 --- a/media/omx-plugin/lib/ics/libutils/moz.build +++ b/media/omx-plugin/lib/ics/libutils/moz.build @@ -6,3 +6,7 @@ MODULE = 'libandroidutils' +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': + CPP_SOURCES += [ + 'libutils.cpp', + ] diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build index ac79fdcf13f..d213f684b82 100644 --- a/media/omx-plugin/moz.build +++ b/media/omx-plugin/moz.build @@ -16,3 +16,7 @@ MODULE = 'omxplugin' +CPP_SOURCES += [ + 'OmxPlugin.cpp', +] + diff --git a/media/omx-plugin/sony/Makefile.in b/media/omx-plugin/sony/Makefile.in index 8c990537a35..072d38dce0e 100644 --- a/media/omx-plugin/sony/Makefile.in +++ b/media/omx-plugin/sony/Makefile.in @@ -33,10 +33,6 @@ USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 -CPPSRCS = \ - OmxPluginSony.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk ifdef GNU_CXX diff --git a/media/omx-plugin/sony/moz.build b/media/omx-plugin/sony/moz.build index 404799ca53b..2bd97445d2a 100644 --- a/media/omx-plugin/sony/moz.build +++ b/media/omx-plugin/sony/moz.build @@ -6,3 +6,7 @@ MODULE = 'omxpluginsony' +CPP_SOURCES += [ + 'OmxPluginSony.cpp', +] + diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in index 86bff9da8bb..82eca69b586 100644 --- a/memory/mozalloc/Makefile.in +++ b/memory/mozalloc/Makefile.in @@ -35,34 +35,6 @@ ifeq (,$(filter-out OS2,$(OS_ARCH))) DEFINES += -D_GNU_SOURCE endif -CPPSRCS = \ - mozalloc.cpp \ - mozalloc_abort.cpp \ - mozalloc_oom.cpp \ - $(NULL) - -ifdef WRAP_STL_INCLUDES #{ -ifdef _MSC_VER #{ - -ifeq ($(MOZ_MSVC_STL_WRAP__RAISE),1) #{ -BUILD_MSVC_WRAPPERS = 1 -else -ifeq ($(MOZ_MSVC_STL_WRAP__Throw),1) #{ -BUILD_MSVC_WRAPPERS = 1 -endif #} -endif #} - -ifdef BUILD_MSVC_WRAPPERS #{ -CPPSRCS += \ - msvc_raise_wrappers.cpp \ - msvc_throw_wrapper.cpp \ - $(NULL) -endif #} - -endif #} - -endif #} - ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) SDK_LIBRARY = $(IMPORT_LIBRARY) else diff --git a/memory/mozalloc/moz.build b/memory/mozalloc/moz.build index 0a027faf6de..965e9c77f0b 100644 --- a/memory/mozalloc/moz.build +++ b/memory/mozalloc/moz.build @@ -30,3 +30,13 @@ if CONFIG['WRAP_STL_INCLUDES']: 'msvc_throw_wrapper.h', 'throw_msvc.h', ] + CPP_SOURCES += [ + 'msvc_raise_wrappers.cpp', + 'msvc_throw_wrapper.cpp', + ] + +CPP_SOURCES += [ + 'mozalloc.cpp', + 'mozalloc_abort.cpp', + 'mozalloc_oom.cpp', +] diff --git a/memory/replace/dmd/Makefile.in b/memory/replace/dmd/Makefile.in index f738b25aa58..3c8cc49a2ef 100644 --- a/memory/replace/dmd/Makefile.in +++ b/memory/replace/dmd/Makefile.in @@ -15,16 +15,11 @@ FORCE_SHARED_LIB= 1 DEFINES += -DMOZ_NO_MOZALLOC -CPPSRCS = DMD.cpp - VPATH += $(topsrcdir)/xpcom/base -CPPSRCS += nsStackWalk.cpp - VPATH += $(topsrcdir)/nsprpub/lib/libc/src CSRCS += strcpy.c VPATH += $(topsrcdir)/mfbt -CPPSRCS += HashFunctions.cpp # Disable mozglue. WRAP_LDFLAGS = diff --git a/memory/replace/dmd/moz.build b/memory/replace/dmd/moz.build index 1a1e9dc1967..60e080a0b26 100644 --- a/memory/replace/dmd/moz.build +++ b/memory/replace/dmd/moz.build @@ -10,3 +10,9 @@ EXPORTS += [ 'DMD.h', ] +CPP_SOURCES += [ + 'DMD.cpp', + 'HashFunctions.cpp', + 'nsStackWalk.cpp', +] + diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in index 0b61aa8bedc..faa2fd68db4 100644 --- a/mobile/android/components/build/Makefile.in +++ b/mobile/android/components/build/Makefile.in @@ -16,13 +16,7 @@ LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 EXPORT_LIBRARY = 1 -CPPSRCS = \ - nsBrowserModule.cpp \ - nsShellService.cpp \ - $(NULL) - ifdef MOZ_ANDROID_HISTORY -CPPSRCS += nsAndroidHistory.cpp LOCAL_INCLUDES += \ -I$(topsrcdir)/docshell/base \ -I$(topsrcdir)/content/base/src \ diff --git a/mobile/android/components/build/moz.build b/mobile/android/components/build/moz.build index cdf42b298ff..06f6fc2c1f7 100644 --- a/mobile/android/components/build/moz.build +++ b/mobile/android/components/build/moz.build @@ -14,3 +14,12 @@ EXPORTS += [ 'nsBrowserComponents.h', ] +CPP_SOURCES += [ + 'nsBrowserModule.cpp', + 'nsShellService.cpp', +] + +if CONFIG['MOZ_ANDROID_HISTORY']: + CPP_SOURCES += [ + 'nsAndroidHistory.cpp', + ] diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index 36f42224ce2..e55e88daf69 100644 --- a/modules/libjar/Makefile.in +++ b/modules/libjar/Makefile.in @@ -20,8 +20,6 @@ LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = $(MODULES_LIBJAR_LCPPSRCS) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index 4ef838c9c84..e0ca848c8e4 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -20,3 +20,8 @@ EXPORTS += [ 'nsZipArchive.h', 'zipstruct.h', ] + +CPP_SOURCES += [ + '$(MODULES_LIBJAR_LCPPSRCS)', +] + diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in index 507b13efa58..e436453d17c 100644 --- a/modules/libjar/zipwriter/src/Makefile.in +++ b/modules/libjar/zipwriter/src/Makefile.in @@ -16,13 +16,4 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = \ - StreamFunctions.cpp \ - nsDeflateConverter.cpp \ - nsZipHeader.cpp \ - nsZipDataStream.cpp \ - nsZipWriter.cpp \ - ZipWriterModule.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/zipwriter/src/moz.build b/modules/libjar/zipwriter/src/moz.build index 5ee3873960c..28390a6a3e3 100644 --- a/modules/libjar/zipwriter/src/moz.build +++ b/modules/libjar/zipwriter/src/moz.build @@ -6,3 +6,12 @@ MODULE = 'zipwriter' +CPP_SOURCES += [ + 'StreamFunctions.cpp', + 'ZipWriterModule.cpp', + 'nsDeflateConverter.cpp', + 'nsZipDataStream.cpp', + 'nsZipHeader.cpp', + 'nsZipWriter.cpp', +] + diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index c63da239dae..442a317080e 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -17,14 +17,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsPrefModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsPrefBranch.cpp \ - nsPrefsFactory.cpp \ - prefapi.cpp \ - prefread.cpp \ - Preferences.cpp \ - $(NULL) - DEFINES += -DOS_ARCH=$(OS_ARCH) \ -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ $(NULL) diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index e8b0fdf6d66..80e1a31251b 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -6,3 +6,11 @@ MODULE = 'pref' +CPP_SOURCES += [ + 'Preferences.cpp', + 'nsPrefBranch.cpp', + 'nsPrefsFactory.cpp', + 'prefapi.cpp', + 'prefread.cpp', +] + diff --git a/mozglue/android/Makefile.in b/mozglue/android/Makefile.in index f34463bbc1e..7fd3ca2a2d3 100644 --- a/mozglue/android/Makefile.in +++ b/mozglue/android/Makefile.in @@ -22,13 +22,6 @@ ifdef MOZ_FOLD_LIBS DEFINES += -DMOZ_FOLD_LIBS endif -CPPSRCS = \ - nsGeckoUtils.cpp \ - APKOpen.cpp \ - SQLiteBridge.cpp \ - NSSBridge.cpp \ - $(NULL) - LOCAL_INCLUDES += -I$(DEPTH)/build LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build diff --git a/mozglue/android/moz.build b/mozglue/android/moz.build index adb0370a4b7..4b8c986fcb3 100644 --- a/mozglue/android/moz.build +++ b/mozglue/android/moz.build @@ -10,3 +10,10 @@ EXPORTS += [ 'APKOpen.h', ] +CPP_SOURCES += [ + 'APKOpen.cpp', + 'NSSBridge.cpp', + 'SQLiteBridge.cpp', + 'nsGeckoUtils.cpp', +] + diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in index ddd085dac57..6c37aca044a 100644 --- a/mozglue/build/Makefile.in +++ b/mozglue/build/Makefile.in @@ -27,7 +27,6 @@ SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) else # Temporary, until bug 662814 lands VISIBILITY_FLAGS = -CPPSRCS = dummy.cpp ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) SDK_LIBRARY = $(IMPORT_LIBRARY) @@ -86,7 +85,6 @@ endif endif ifeq (Android,$(OS_TARGET)) -CPPSRCS += BionicGlue.cpp SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,$(DEPTH)/other-licenses/android) endif diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build index 322dae0a1a3..9ef29824499 100644 --- a/mozglue/build/moz.build +++ b/mozglue/build/moz.build @@ -6,3 +6,26 @@ MODULE = 'mozglue' +# Build mozglue as a shared lib on Windows, OSX and Android. +# If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in +if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): + # TODO: These should be the all-caps variables when FORCE_SHARED_LIB and + # FORCE_STATIC_LIB are ported over + force_shared_lib = 1 + force_static_lib = 0 +else: + force_shared_lib = 0 + force_static_lib = 1 + +if CONFIG['MOZ_MEMORY'] and (CONFIG['MOZ_NATIVE_JEMALLOC'] or force_shared_lib): + pass + # TODO: SHARED_LIBRARY_LIBS go here +else: + CPP_SOURCES += [ + 'dummy.cpp', + ] + +if CONFIG['OS_TARGET'] == 'Android': + CPP_SOURCES += [ + 'BionicGlue.cpp', + ] diff --git a/mozglue/linker/Makefile.in b/mozglue/linker/Makefile.in index 7d305e3a803..18f0d00ff63 100644 --- a/mozglue/linker/Makefile.in +++ b/mozglue/linker/Makefile.in @@ -13,10 +13,6 @@ LIBRARY_NAME = linker FORCE_STATIC_LIB= 1 STL_FLAGS = -CPPSRCS = \ - Zip.cpp \ - $(NULL) - HOST_PROGRAM = szip HOST_CPPSRCS = \ @@ -26,13 +22,6 @@ HOST_CPPSRCS = \ HOST_LIBS = -lz -CPPSRCS += \ - ElfLoader.cpp \ - CustomElf.cpp \ - Mappable.cpp \ - SeekableZStream.cpp \ - $(NULL) - DEFINES += -DIMPL_MFBT include $(topsrcdir)/config/rules.mk diff --git a/mozglue/linker/moz.build b/mozglue/linker/moz.build index 322dae0a1a3..5cca39f677d 100644 --- a/mozglue/linker/moz.build +++ b/mozglue/linker/moz.build @@ -6,3 +6,11 @@ MODULE = 'mozglue' +CPP_SOURCES += [ + 'CustomElf.cpp', + 'ElfLoader.cpp', + 'Mappable.cpp', + 'SeekableZStream.cpp', + 'Zip.cpp', +] + diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in index 4379e0f5ee4..17809fb2de6 100644 --- a/mozglue/tests/Makefile.in +++ b/mozglue/tests/Makefile.in @@ -10,11 +10,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_LINKER -CPPSRCS = \ - TestZip.cpp \ - $(NULL) - -SIMPLE_PROGRAMS := $(CPPSRCS:.cpp=$(BIN_SUFFIX)) +SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX) NO_DIST_INSTALL = 1 STL_FLAGS = diff --git a/mozglue/tests/moz.build b/mozglue/tests/moz.build index 895d11993cf..e9d5e973736 100644 --- a/mozglue/tests/moz.build +++ b/mozglue/tests/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +if CONFIG['MOZ_LINKER']: + CPP_SOURCES += [ + 'TestZip.cpp', + ] diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index cb51873956e..3f814ca0e36 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -16,87 +16,13 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ -+ ArrayBufferInputStream.cpp \ - BackgroundFileSaver.cpp \ - nsTransportUtils.cpp \ - nsAsyncStreamCopier.cpp \ - nsAsyncRedirectVerifyHelper.cpp \ - nsAuthInformationHolder.cpp \ - nsBaseChannel.cpp \ - nsBaseContentStream.cpp \ - nsBufferedStreams.cpp \ - nsChannelClassifier.cpp \ - nsDirectoryIndexStream.cpp \ - nsDownloader.cpp \ - nsFileStreams.cpp \ - nsIncrementalDownload.cpp \ - nsInputStreamChannel.cpp \ - nsInputStreamPump.cpp \ - nsStreamTransportService.cpp \ - nsIOService.cpp \ - nsLoadGroup.cpp \ - nsMediaFragmentURIParser.cpp \ - nsMIMEInputStream.cpp \ - nsProtocolProxyService.cpp \ - nsProxyInfo.cpp \ - nsPACMan.cpp \ - nsRequestObserverProxy.cpp \ - nsSimpleStreamListener.cpp \ - nsSimpleURI.cpp \ - nsSimpleNestedURI.cpp \ - nsStandardURL.cpp \ - nsSocketTransport2.cpp \ - nsSocketTransportService2.cpp \ - nsServerSocket.cpp \ - nsUDPServerSocket.cpp \ - nsStreamListenerTee.cpp \ - nsStreamLoader.cpp \ - nsSyncStreamListener.cpp \ - nsUnicharStreamLoader.cpp \ - nsURIChecker.cpp \ - nsURLHelper.cpp \ - nsURLParsers.cpp \ - nsNetAddr.cpp \ - nsNetStrings.cpp \ - nsBase64Encoder.cpp \ - nsSerializationHelper.cpp \ - nsDNSPrefetch.cpp \ - RedirectChannelRegistrar.cpp \ - nsPreloadedStream.cpp \ - nsStreamListenerWrapper.cpp \ - ProxyAutoConfig.cpp \ - Dashboard.cpp \ - NetworkActivityMonitor.cpp \ - EventTokenBucket.cpp \ - $(NULL) - LOCAL_INCLUDES += -I$(topsrcdir)/dom/base -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) - CPPSRCS += nsURLHelperOS2.cpp -else -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) - CPPSRCS += nsURLHelperWin.cpp - CPPSRCS += nsNativeConnectionHelper.cpp - CPPSRCS += nsAutodialWin.cpp -else -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - CPPSRCS += nsURLHelperOSX.cpp -else - CPPSRCS += nsURLHelperUnix.cpp -endif -endif -endif - ifdef MOZ_PLATFORM_MAEMO - CPPSRCS += nsNativeConnectionHelper.cpp ifdef MOZ_ENABLE_LIBCONIC - CPPSRCS += nsAutodialMaemo.cpp LOCAL_INCLUDES += -I$(srcdir)/../../system/maemo endif ifdef MOZ_ENABLE_QTNETWORK - CPPSRCS += nsAutodialQt.cpp LOCAL_INCLUDES += -I$(srcdir)/../../system/qt OS_INCLUDES += $(MOZ_QT_CFLAGS) endif diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index 6b5d7193f6c..760c1c146dd 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -17,3 +17,89 @@ EXPORTS.mozilla.net += [ 'DashboardTypes.h', ] +CPP_SOURCES += [ + 'ArrayBufferInputStream.cpp', + 'BackgroundFileSaver.cpp', + 'Dashboard.cpp', + 'EventTokenBucket.cpp', + 'NetworkActivityMonitor.cpp', + 'ProxyAutoConfig.cpp', + 'RedirectChannelRegistrar.cpp', + 'nsAsyncRedirectVerifyHelper.cpp', + 'nsAsyncStreamCopier.cpp', + 'nsAuthInformationHolder.cpp', + 'nsBase64Encoder.cpp', + 'nsBaseChannel.cpp', + 'nsBaseContentStream.cpp', + 'nsBufferedStreams.cpp', + 'nsChannelClassifier.cpp', + 'nsDNSPrefetch.cpp', + 'nsDirectoryIndexStream.cpp', + 'nsDownloader.cpp', + 'nsFileStreams.cpp', + 'nsIOService.cpp', + 'nsIncrementalDownload.cpp', + 'nsInputStreamChannel.cpp', + 'nsInputStreamPump.cpp', + 'nsLoadGroup.cpp', + 'nsMIMEInputStream.cpp', + 'nsMediaFragmentURIParser.cpp', + 'nsNetAddr.cpp', + 'nsNetStrings.cpp', + 'nsPACMan.cpp', + 'nsPreloadedStream.cpp', + 'nsProtocolProxyService.cpp', + 'nsProxyInfo.cpp', + 'nsRequestObserverProxy.cpp', + 'nsSerializationHelper.cpp', + 'nsServerSocket.cpp', + 'nsSimpleNestedURI.cpp', + 'nsSimpleStreamListener.cpp', + 'nsSimpleURI.cpp', + 'nsSocketTransport2.cpp', + 'nsSocketTransportService2.cpp', + 'nsStandardURL.cpp', + 'nsStreamListenerTee.cpp', + 'nsStreamListenerWrapper.cpp', + 'nsStreamLoader.cpp', + 'nsStreamTransportService.cpp', + 'nsSyncStreamListener.cpp', + 'nsTransportUtils.cpp', + 'nsUDPServerSocket.cpp', + 'nsURIChecker.cpp', + 'nsURLHelper.cpp', + 'nsURLParsers.cpp', + 'nsUnicharStreamLoader.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': + CPP_SOURCES += [ + 'nsURLHelperOS2.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'nsURLHelperWin.cpp', + 'nsNativeConnectionHelper.cpp', + 'nsAutodialWin.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CPP_SOURCES += [ + 'nsURLHelperOSX.cpp', + ] +else: + CPP_SOURCES += [ + 'nsURLHelperUnix.cpp', + ] + +if CONFIG['MOZ_PLATFORM_MAEMO']: + CPP_SOURCES += [ + 'nsNativeConnectionHelper.cpp', + ] + if CONFIG['MOZ_ENABLE_LIBCONIC']: + CPP_SOURCES += [ + 'nsAutodialMaemo.cpp', + ] + if CONFIG['MOZ_ENABLE_QTNETWORK']: + CPP_SOURCES += [ + 'nsAutodialQt.cpp', + ] diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 746a3b6bd04..4f724b6b470 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -18,7 +18,6 @@ MODULE_NAME = necko LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = nsNetModule.cpp SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \ diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index ee3c1d4a67d..987d4da8656 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'nsNetCID.h', ] +CPP_SOURCES += [ + 'nsNetModule.cpp', +] + diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index 21ef53f7235..6c8fea0d4e9 100644 --- a/netwerk/cache/Makefile.in +++ b/netwerk/cache/Makefile.in @@ -17,26 +17,6 @@ FAIL_ON_WARNINGS := 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsCache.cpp \ - nsCacheEntry.cpp \ - nsCacheEntryDescriptor.cpp \ - nsCacheMetaData.cpp \ - nsCacheService.cpp \ - nsCacheSession.cpp \ - nsCacheUtils.cpp \ - nsMemoryCacheDevice.cpp \ - nsDiskCacheBinding.cpp \ - nsDiskCacheBlockFile.cpp \ - nsDiskCacheDevice.cpp \ - nsDiskCacheDeviceSQL.cpp \ - nsDiskCacheEntry.cpp \ - nsDiskCacheMap.cpp \ - nsDiskCacheStreams.cpp \ - nsDeleteDir.cpp \ - nsApplicationCacheService.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ $(NULL) diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index 599915e6e32..fe8c0480582 100644 --- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -22,3 +22,23 @@ EXPORTS += [ 'nsCacheService.h', ] +CPP_SOURCES += [ + 'nsApplicationCacheService.cpp', + 'nsCache.cpp', + 'nsCacheEntry.cpp', + 'nsCacheEntryDescriptor.cpp', + 'nsCacheMetaData.cpp', + 'nsCacheService.cpp', + 'nsCacheSession.cpp', + 'nsCacheUtils.cpp', + 'nsDeleteDir.cpp', + 'nsDiskCacheBinding.cpp', + 'nsDiskCacheBlockFile.cpp', + 'nsDiskCacheDevice.cpp', + 'nsDiskCacheDeviceSQL.cpp', + 'nsDiskCacheEntry.cpp', + 'nsDiskCacheMap.cpp', + 'nsDiskCacheStreams.cpp', + 'nsMemoryCacheDevice.cpp', +] + diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 5087db422c0..024ad331498 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -19,15 +19,6 @@ LIBRARY_NAME = neckocookie_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsCookie.cpp \ - nsCookieService.cpp \ - $(NULL) - -CPPSRCS += \ - CookieServiceParent.cpp \ - CookieServiceChild.cpp \ - $(NULL) LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/uconv/src \ diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index 0edbb9c0e3c..e9a61b9b3c9 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -22,6 +22,12 @@ if CONFIG['NECKO_COOKIES']: 'CookieServiceParent.h', 'CookieServiceChild.h', ] + CPP_SOURCES += [ + 'nsCookie.cpp', + 'nsCookieService.cpp', + 'CookieServiceParent.cpp', + 'CookieServiceChild.cpp', + ] if CONFIG['NECKO_COOKIES']: XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in index 8727e99dd2c..0967444dee9 100644 --- a/netwerk/dash/mpd/Makefile.in +++ b/netwerk/dash/mpd/Makefile.in @@ -19,19 +19,6 @@ LIBRARY_NAME := nkdashmpd_s LIBXUL_LIBRARY := 1 FORCE_STATIC_LIB := 1 -CPPSRCS := \ - nsDASHMPDParser.cpp \ - IMPDManager.cpp \ - nsDASHWebMODManager.cpp \ - nsDASHWebMODParser.cpp \ - MPD.cpp \ - Period.cpp \ - AdaptationSet.cpp \ - Representation.cpp \ - SegmentBase.cpp \ - $(NULL) - - LOCAL_INCLUDES := \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/html/content/public \ diff --git a/netwerk/dash/mpd/moz.build b/netwerk/dash/mpd/moz.build index 8b58b4859ca..916aeb1ff92 100644 --- a/netwerk/dash/mpd/moz.build +++ b/netwerk/dash/mpd/moz.build @@ -6,3 +6,15 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'AdaptationSet.cpp', + 'IMPDManager.cpp', + 'MPD.cpp', + 'Period.cpp', + 'Representation.cpp', + 'SegmentBase.cpp', + 'nsDASHMPDParser.cpp', + 'nsDASHWebMODManager.cpp', + 'nsDASHWebMODParser.cpp', +] + diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index bd18d50d618..d5e97dccdd3 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -15,14 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - DNS.cpp \ - nsIDNService.cpp \ - nsHostResolver.cpp \ - nsDNSService2.cpp \ - nsEffectiveTLDService.cpp \ - $(NULL) - DISABLED_CSRCS = \ race.c \ nameprep.c \ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index c9ea457d52e..df82687eaf1 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -26,3 +26,11 @@ CSRCS += [ 'punycode.c', 'race.c', ] + +CPP_SOURCES += [ + 'DNS.cpp', + 'nsDNSService2.cpp', + 'nsEffectiveTLDService.cpp', + 'nsHostResolver.cpp', + 'nsIDNService.cpp', +] diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index 45a8abb97f7..b6b60ba2021 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -14,15 +14,6 @@ LIBRARY_NAME = neckoipc_s LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 -CPPSRCS = \ - NeckoCommon.cpp \ - NeckoChild.cpp \ - NeckoParent.cpp \ - ChannelEventQueue.cpp \ - RemoteOpenFileParent.cpp \ - RemoteOpenFileChild.cpp \ - $(NULL) - LOCAL_INCLUDES += \ -I$(srcdir)/../protocol/http \ -I$(srcdir)/../base/src \ diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index 2150a00b4dd..0389e1b11f0 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -22,3 +22,12 @@ EXPORTS.mozilla.net += [ 'RemoteOpenFileParent.h', ] +CPP_SOURCES += [ + 'ChannelEventQueue.cpp', + 'NeckoChild.cpp', + 'NeckoCommon.cpp', + 'NeckoParent.cpp', + 'RemoteOpenFileChild.cpp', + 'RemoteOpenFileParent.cpp', +] + diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index 0b7c962c044..e9107df8772 100644 --- a/netwerk/mime/Makefile.in +++ b/netwerk/mime/Makefile.in @@ -17,10 +17,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsMIMEHeaderParamImpl.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build index 5f33604b5f2..d9a3019afd5 100644 --- a/netwerk/mime/moz.build +++ b/netwerk/mime/moz.build @@ -20,3 +20,7 @@ EXPORTS += [ 'nsMimeTypes.h', ] +CPP_SOURCES += [ + 'nsMIMEHeaderParamImpl.cpp', +] + diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index 6c8cbcd925f..ca0b6151aff 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -16,14 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsAboutProtocolHandler.cpp \ - nsAboutBlank.cpp \ - nsAboutBloat.cpp \ - nsAboutCache.cpp \ - nsAboutCacheEntry.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 01f4cd8f13e..3892cb706eb 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -16,3 +16,11 @@ EXPORTS += [ 'nsAboutProtocolUtils.h', ] +CPP_SOURCES += [ + 'nsAboutBlank.cpp', + 'nsAboutBloat.cpp', + 'nsAboutCache.cpp', + 'nsAboutCacheEntry.cpp', + 'nsAboutProtocolHandler.cpp', +] + diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in index aa89e90f3c3..7228a072c13 100644 --- a/netwerk/protocol/data/Makefile.in +++ b/netwerk/protocol/data/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsDataHandler.cpp \ - nsDataChannel.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index 8b58b4859ca..235ca616a0d 100644 --- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -6,3 +6,8 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'nsDataChannel.cpp', + 'nsDataHandler.cpp', +] + diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 8150df75e4c..cc64f19d36e 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -14,17 +14,6 @@ LIBRARY_NAME = nkdevice_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsDeviceChannel.cpp \ - nsDeviceProtocolHandler.cpp \ - $(NULL) - -ifeq (android,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += AndroidCaptureProvider.cpp \ - CameraStreamImpl.cpp \ - $(NULL) -endif - LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \ $(NULL) diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index c23bf3c2ba8..147c8eb2af4 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -10,4 +10,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': EXPORTS.mozilla.net += [ 'CameraStreamImpl.h', ] + CPP_SOURCES += [ + 'AndroidCaptureProvider.cpp', + 'CameraStreamImpl.cpp', + ] + +CPP_SOURCES += [ + 'nsDeviceChannel.cpp', + 'nsDeviceProtocolHandler.cpp', +] diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index a95b5b99b32..08df9209193 100644 --- a/netwerk/protocol/file/Makefile.in +++ b/netwerk/protocol/file/Makefile.in @@ -17,11 +17,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsFileProtocolHandler.cpp \ - nsFileChannel.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index 76f3eafd2c6..66dc1ff6851 100644 --- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -17,3 +17,8 @@ XPIDL_FLAGS += [ MODULE = 'necko' +CPP_SOURCES += [ + 'nsFileChannel.cpp', + 'nsFileProtocolHandler.cpp', +] + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 00a32b612e7..dedc936c653 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -17,15 +17,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsFtpProtocolHandler.cpp \ - nsFTPChannel.cpp \ - nsFtpConnectionThread.cpp \ - nsFtpControlConnection.cpp \ - FTPChannelParent.cpp \ - FTPChannelChild.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index f768faf5431..6ef70c57a5a 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -21,3 +21,12 @@ EXPORTS.mozilla.net += [ 'FTPChannelParent.h', ] +CPP_SOURCES += [ + 'FTPChannelChild.cpp', + 'FTPChannelParent.cpp', + 'nsFTPChannel.cpp', + 'nsFtpConnectionThread.cpp', + 'nsFtpControlConnection.cpp', + 'nsFtpProtocolHandler.cpp', +] + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 9b89e0e0009..bcbaad9fd87 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -16,40 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS := 1 -CPPSRCS = \ - nsHttp.cpp \ - nsHttpHeaderArray.cpp \ - nsHttpConnectionInfo.cpp \ - nsHttpConnection.cpp \ - nsHttpConnectionMgr.cpp \ - nsHttpRequestHead.cpp \ - nsHttpResponseHead.cpp \ - nsHttpChunkedDecoder.cpp \ - nsHttpAuthCache.cpp \ - nsHttpAuthManager.cpp \ - nsHttpBasicAuth.cpp \ - nsHttpDigestAuth.cpp \ - nsHttpNTLMAuth.cpp \ - nsHttpTransaction.cpp \ - nsHttpHandler.cpp \ - HttpBaseChannel.cpp \ - nsHttpChannel.cpp \ - nsHttpPipeline.cpp \ - nsHttpActivityDistributor.cpp \ - nsHttpChannelAuthProvider.cpp \ - HttpChannelParent.cpp \ - HttpChannelChild.cpp \ - HttpChannelParentListener.cpp \ - HttpInfo.cpp \ - NullHttpTransaction.cpp \ - ASpdySession.cpp \ - SpdySession2.cpp \ - SpdyStream2.cpp \ - SpdySession3.cpp \ - SpdyStream3.cpp \ - ConnectionDiagnostics.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index 11a74965f16..ae3e5d12bbf 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -41,3 +41,37 @@ EXPORTS.mozilla.net += [ 'PHttpChannelParams.h', ] +CPP_SOURCES += [ + 'ASpdySession.cpp', + 'ConnectionDiagnostics.cpp', + 'HttpBaseChannel.cpp', + 'HttpChannelChild.cpp', + 'HttpChannelParent.cpp', + 'HttpChannelParentListener.cpp', + 'HttpInfo.cpp', + 'NullHttpTransaction.cpp', + 'SpdySession2.cpp', + 'SpdySession3.cpp', + 'SpdyStream2.cpp', + 'SpdyStream3.cpp', + 'nsHttp.cpp', + 'nsHttpActivityDistributor.cpp', + 'nsHttpAuthCache.cpp', + 'nsHttpAuthManager.cpp', + 'nsHttpBasicAuth.cpp', + 'nsHttpChannel.cpp', + 'nsHttpChannelAuthProvider.cpp', + 'nsHttpChunkedDecoder.cpp', + 'nsHttpConnection.cpp', + 'nsHttpConnectionInfo.cpp', + 'nsHttpConnectionMgr.cpp', + 'nsHttpDigestAuth.cpp', + 'nsHttpHandler.cpp', + 'nsHttpHeaderArray.cpp', + 'nsHttpNTLMAuth.cpp', + 'nsHttpPipeline.cpp', + 'nsHttpRequestHead.cpp', + 'nsHttpResponseHead.cpp', + 'nsHttpTransaction.cpp', +] + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index 44c838e9835..b316ed3e53a 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -17,10 +17,6 @@ FAIL_ON_WARNINGS = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsResProtocolHandler.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 82105061bca..c8a643f4e62 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -16,3 +16,7 @@ XPIDL_FLAGS += [ MODULE = 'necko' +CPP_SOURCES += [ + 'nsResProtocolHandler.cpp', +] + diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in index 5c701d67b7f..de449377962 100644 --- a/netwerk/protocol/viewsource/Makefile.in +++ b/netwerk/protocol/viewsource/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsViewSourceHandler.cpp \ - nsViewSourceChannel.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index 6369f7afdc2..2134e373c03 100644 --- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -16,3 +16,8 @@ XPIDL_FLAGS += [ MODULE = 'necko' +CPP_SOURCES += [ + 'nsViewSourceChannel.cpp', + 'nsViewSourceHandler.cpp', +] + diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 4d49d8d2cab..45d0040c490 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -15,13 +15,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - WebSocketChannel.cpp \ - WebSocketChannelParent.cpp \ - WebSocketChannelChild.cpp \ - BaseWebSocketChannel.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/content/base/src \ diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index 28b25dadf2f..90422372234 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -20,3 +20,10 @@ EXPORTS.mozilla.net += [ 'WebSocketChannelParent.h', ] +CPP_SOURCES += [ + 'BaseWebSocketChannel.cpp', + 'WebSocketChannel.cpp', + 'WebSocketChannelChild.cpp', + 'WebSocketChannelParent.cpp', +] + diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index 235acdc72ac..ac38eb4dacf 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -14,14 +14,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsWyciwyg.cpp \ - nsWyciwygChannel.cpp \ - nsWyciwygProtocolHandler.cpp \ - WyciwygChannelParent.cpp \ - WyciwygChannelChild.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index 77d7f9436da..5f45c29abc0 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -21,3 +21,11 @@ EXPORTS.mozilla.net += [ 'WyciwygChannelParent.h', ] +CPP_SOURCES += [ + 'WyciwygChannelChild.cpp', + 'WyciwygChannelParent.cpp', + 'nsWyciwyg.cpp', + 'nsWyciwygChannel.cpp', + 'nsWyciwygProtocolHandler.cpp', +] + diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index 7ebedffa59f..ddd7e3c0a6b 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -15,10 +15,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO -CPPSRCS = \ - DataChannel.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/ds \ -I$(srcdir)/../src \ diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index ef74519ae1e..bf6e9be7cd9 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -13,3 +13,7 @@ EXPORTS.mozilla.net += [ 'DataChannelProtocol.h', ] +CPP_SOURCES += [ + 'DataChannel.cpp', +] + diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 140b5c7913e..2a7c489e02d 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -19,12 +19,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO -ifeq ($(OS_TARGET),Android) -CPPSRCS = \ - ifaddrs_android.cpp \ - $(NULL) -endif - DISABLED_CSRCS = \ user_environment.c \ user_mbuf.c \ diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build index 44ade75917e..1ac90db9802 100644 --- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -39,3 +39,8 @@ CSRCS += [ 'user_sctp_timer_iterate.c', 'user_socket.c', ] + +if CONFIG['OS_TARGET'] == 'Android': + CPP_SOURCES += [ + 'ifaddrs_android.cpp', + ] diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in index 33d3961ce92..174b22af5b2 100644 --- a/netwerk/socket/Makefile.in +++ b/netwerk/socket/Makefile.in @@ -16,13 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsSocketProviderService.cpp \ - nsSOCKSSocketProvider.cpp \ - nsSOCKSIOLayer.cpp \ - nsUDPSocketProvider.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index fae07088695..f42a2e6ef9d 100644 --- a/netwerk/socket/moz.build +++ b/netwerk/socket/moz.build @@ -16,3 +16,10 @@ XPIDL_MODULE = 'necko_socket' MODULE = 'necko' +CPP_SOURCES += [ + 'nsSOCKSIOLayer.cpp', + 'nsSOCKSSocketProvider.cpp', + 'nsSocketProviderService.cpp', + 'nsUDPSocketProvider.cpp', +] + diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 9c42ea311bd..e66857d4627 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -15,33 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS := 1 - -CPPSRCS = \ - mozTXTToHTMLConv.cpp \ - nsUnknownDecoder.cpp \ - nsHTTPCompressConv.cpp \ - nsTXTToHTMLConv.cpp \ - nsDirIndex.cpp \ - nsDirIndexParser.cpp \ - nsIndexedToHTML.cpp \ - nsMultiMixedConv.cpp \ - $(NULL) - -# only include FTP directory listing support if the FTP -# protocol is being built. -ifneq (,$(filter ftp,$(NECKO_PROTOCOLS))) -CPPSRCS += \ - ParseFTPList.cpp \ - nsFTPDirListingConv.cpp \ - $(NULL) -endif - -ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += \ - nsBinHexDecoder.cpp \ - $(NULL) -endif - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index 8b58b4859ca..59c30885311 100644 --- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -6,3 +6,24 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'mozTXTToHTMLConv.cpp', + 'nsDirIndex.cpp', + 'nsDirIndexParser.cpp', + 'nsHTTPCompressConv.cpp', + 'nsIndexedToHTML.cpp', + 'nsMultiMixedConv.cpp', + 'nsTXTToHTMLConv.cpp', + 'nsUnknownDecoder.cpp', +] + +if CONFIG['NECKO_PROTOCOLS'].find('ftp') != -1: + CPP_SOURCES += [ + 'ParseFTPList.cpp', + 'nsFTPDirListingConv.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa': + CPP_SOURCES += [ + 'nsBinHexDecoder.cpp', + ] diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index 40120d07682..9bf2c6c56c0 100644 --- a/netwerk/streamconv/src/Makefile.in +++ b/netwerk/streamconv/src/Makefile.in @@ -21,18 +21,6 @@ FAIL_ON_WARNINGS := 1 endif endif -CPPSRCS = \ - nsStreamConverterService.cpp \ - $(NULL) - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -ifneq (x86_64,$(OS_TEST)) -CPPSRCS += \ - nsAppleFileDecoder.cpp \ - $(NULL) -endif -endif - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build index 8b58b4859ca..de38cd7648a 100644 --- a/netwerk/streamconv/src/moz.build +++ b/netwerk/streamconv/src/moz.build @@ -6,3 +6,12 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'nsStreamConverterService.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + if CONFIG['OS_TEST'] != 'x86_64': + CPP_SOURCES += [ + 'nsAppleFileDecoder.cpp', + ] diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in index 879a3672d9e..43d0e647e84 100644 --- a/netwerk/streamconv/test/Makefile.in +++ b/netwerk/streamconv/test/Makefile.in @@ -11,11 +11,6 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - Converters.cpp \ - TestStreamConv.cpp \ - $(NULL) - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(XPCOM_LIBS) \ diff --git a/netwerk/streamconv/test/moz.build b/netwerk/streamconv/test/moz.build index 8776ec023ab..1dc3688dcb5 100644 --- a/netwerk/streamconv/test/moz.build +++ b/netwerk/streamconv/test/moz.build @@ -8,3 +8,7 @@ MODULE = 'TestStreamConv' PROGRAM = 'TestStreamConv' +CPP_SOURCES += [ + 'Converters.cpp', + 'TestStreamConv.cpp', +] diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index 5c6d24af31b..37e2a3e4486 100644 --- a/netwerk/system/android/Makefile.in +++ b/netwerk/system/android/Makefile.in @@ -15,10 +15,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS += \ - nsAndroidNetworkLinkService.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/android/moz.build b/netwerk/system/android/moz.build index 8b58b4859ca..7656de83e41 100644 --- a/netwerk/system/android/moz.build +++ b/netwerk/system/android/moz.build @@ -6,3 +6,7 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'nsAndroidNetworkLinkService.cpp', +] + diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in index 4c88b578169..069a35c1dd4 100644 --- a/netwerk/system/maemo/Makefile.in +++ b/netwerk/system/maemo/Makefile.in @@ -15,11 +15,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS += \ - nsMaemoNetworkLinkService.cpp \ - nsMaemoNetworkManager.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/maemo/moz.build b/netwerk/system/maemo/moz.build index 8b58b4859ca..fccacbdfce0 100644 --- a/netwerk/system/maemo/moz.build +++ b/netwerk/system/maemo/moz.build @@ -6,3 +6,8 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'nsMaemoNetworkLinkService.cpp', + 'nsMaemoNetworkManager.cpp', +] + diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index c3b7513708f..996ed1f9cad 100644 --- a/netwerk/system/qt/Makefile.in +++ b/netwerk/system/qt/Makefile.in @@ -15,15 +15,6 @@ LIBRARY_NAME = neckosystem_s LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -MOCSRCS = \ - moc_nsQtNetworkManager.cpp \ - $(NULL) - -CPPSRCS += \ - $(MOCSRCS) \ - nsQtNetworkLinkService.cpp \ - nsQtNetworkManager.cpp \ - $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/netwerk/system/qt/moz.build b/netwerk/system/qt/moz.build index 8b58b4859ca..4f0ab2ce5ee 100644 --- a/netwerk/system/qt/moz.build +++ b/netwerk/system/qt/moz.build @@ -6,3 +6,9 @@ MODULE = 'necko' +CPP_SOURCES += [ + 'moc_nsQtNetworkManager.cpp', + 'nsQtNetworkLinkService.cpp', + 'nsQtNetworkManager.cpp', +] + diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in index 10b417745d4..54c454a583c 100644 --- a/netwerk/system/win32/Makefile.in +++ b/netwerk/system/win32/Makefile.in @@ -16,10 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -ifeq ($(OS_ARCH),WINNT) - CPPSRCS += nsNotifyAddrListener.cpp -endif - include $(topsrcdir)/config/rules.mk DEFINES += -DIMPL_NS_NET diff --git a/netwerk/system/win32/moz.build b/netwerk/system/win32/moz.build index 8b58b4859ca..88b59d61f73 100644 --- a/netwerk/system/win32/moz.build +++ b/netwerk/system/win32/moz.build @@ -6,3 +6,7 @@ MODULE = 'necko' +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsNotifyAddrListener.cpp', + ] diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in index 9c27df6d9a6..2c7de39a321 100644 --- a/netwerk/test/Makefile.in +++ b/netwerk/test/Makefile.in @@ -13,7 +13,7 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ +cppsrcs = \ TestIncrementalDownload.cpp \ TestStreamLoader.cpp \ PropertiesTest.cpp \ @@ -32,7 +32,7 @@ CPPSRCS = \ TestProtocols.cpp \ $(NULL) -SIMPLE_PROGRAMS := $(CPPSRCS:.cpp=$(BIN_SUFFIX)) +SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX)) # XXX Make this work in libxul builds. #SIMPLE_PROGRAMS += \ diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build index 3a5d28eda21..2fe1bf43922 100644 --- a/netwerk/test/moz.build +++ b/netwerk/test/moz.build @@ -13,3 +13,22 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] # FIXME/bug 575918: out-of-process xpcshell is broken on OS X if CONFIG['OS_ARCH'] != 'Darwin': XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini'] + +CPP_SOURCES += [ + 'PropertiesTest.cpp', + 'ReadNTLM.cpp', + 'TestBlockingSocket.cpp', + 'TestCallbacks.cpp', + 'TestCookie.cpp', + 'TestDNS.cpp', + 'TestIncrementalDownload.cpp', + 'TestOpen.cpp', + 'TestPageLoad.cpp', + 'TestProtocols.cpp', + 'TestServ.cpp', + 'TestStandardURL.cpp', + 'TestStreamLoader.cpp', + 'TestURLParser.cpp', + 'TestUpload.cpp', + 'urltest.cpp', +] diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index 385f86e8489..dbbcdf2ce8d 100644 --- a/netwerk/wifi/Makefile.in +++ b/netwerk/wifi/Makefile.in @@ -19,30 +19,15 @@ ifneq ($(OS_ARCH),Darwin) FAIL_ON_WARNINGS := 1 endif -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += nsWifiMonitorGonk.cpp -else -CPPSRCS += nsWifiMonitor.cpp -endif - -CPPSRCS += nsWifiAccessPoint.cpp - ifeq ($(OS_ARCH),Darwin) -CPPSRCS += nsWifiScannerMac.cpp CMMSRCS = osx_corewlan.mm endif -ifneq (,$(filter WINNT,$(OS_ARCH))) -CPPSRCS += nsWifiScannerWin.cpp -endif - ifeq ($(OS_ARCH),SunOS) -CPPSRCS += nsWifiScannerSolaris.cpp OS_INCLUDES += $(GLIB_CFLAGS) endif ifdef MOZ_ENABLE_DBUS -CPPSRCS += nsWifiScannerDBus.cpp OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS) endif diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index 784d1c06355..035f8afd98b 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -14,3 +14,33 @@ XPIDL_MODULE = 'necko_wifi' MODULE = 'necko' +CPP_SOURCES += [ + 'nsWifiAccessPoint.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + CPP_SOURCES += [ + 'nsWifiMonitorGonk.cpp', + ] +else: + CPP_SOURCES += [ + 'nsWifiMonitor.cpp', + ] + +if CONFIG['OS_ARCH'] == 'Darwin': + CPP_SOURCES += [ + 'nsWifiScannerMac.cpp', + ] +elif CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsWifiScannerWin.cpp', + ] +elif CONFIG['OS_ARCH'] == 'SunOS': + CPP_SOURCES += [ + 'nsWifiScannerSolaris.cpp', + ] + +if CONFIG['MOZ_ENABLE_DBUS']: + CPP_SOURCES += [ + 'nsWifiScannerDBus.cpp', + ] diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in index 6a0730260f0..2fffed071de 100644 --- a/other-licenses/skia-npapi/Makefile.in +++ b/other-licenses/skia-npapi/Makefile.in @@ -26,12 +26,4 @@ LOCAL_INCLUDES += \ $(NULL) -CPPSRCS = \ - SkANP.cpp \ - ANPCanvas.cpp \ - ANPPaint.cpp \ - ANPPath.cpp \ - ANPTypeface.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build index 02da1c654f8..d4a535929df 100644 --- a/other-licenses/skia-npapi/moz.build +++ b/other-licenses/skia-npapi/moz.build @@ -10,3 +10,11 @@ EXPORTS += [ 'SkANP.h', ] +CPP_SOURCES += [ + 'ANPCanvas.cpp', + 'ANPPaint.cpp', + 'ANPPath.cpp', + 'ANPTypeface.cpp', + 'SkANP.cpp', +] + diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in index 5fe70981d4e..b1e03e7f70d 100644 --- a/other-licenses/snappy/Makefile.in +++ b/other-licenses/snappy/Makefile.in @@ -19,11 +19,4 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -CPPSRCS = \ - snappy.cc \ - snappy-sinksource.cc \ - snappy-stubs-internal.cc \ - snappy-c.cc \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/other-licenses/snappy/moz.build b/other-licenses/snappy/moz.build index f3356ece104..7368760cdb8 100644 --- a/other-licenses/snappy/moz.build +++ b/other-licenses/snappy/moz.build @@ -10,3 +10,10 @@ EXPORTS.snappy += [ 'snappy.h', ] +CPP_SOURCES += [ + 'snappy-c.cc', + 'snappy-sinksource.cc', + 'snappy-stubs-internal.cc', + 'snappy.cc', +] + diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in index 60f4d966fa5..4be9626d124 100644 --- a/parser/html/Makefile.in +++ b/parser/html/Makefile.in @@ -13,42 +13,6 @@ LIBRARY_NAME = html5p_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsHtml5Atoms.cpp \ - nsHtml5Atom.cpp \ - nsHtml5AtomTable.cpp \ - nsHtml5Parser.cpp \ - nsHtml5AttributeName.cpp \ - nsHtml5ElementName.cpp \ - nsHtml5HtmlAttributes.cpp \ - nsHtml5StackNode.cpp \ - nsHtml5UTF16Buffer.cpp \ - nsHtml5DependentUTF16Buffer.cpp \ - nsHtml5OwningUTF16Buffer.cpp \ - nsHtml5NamedCharacters.cpp \ - nsHtml5NamedCharactersAccel.cpp \ - nsHtml5Tokenizer.cpp \ - nsHtml5TreeBuilder.cpp \ - nsHtml5Portability.cpp \ - nsHtml5Module.cpp \ - nsHtml5ReleasableAttributeName.cpp \ - nsHtml5ReleasableElementName.cpp \ - nsHtml5MetaScanner.cpp \ - nsHtml5TreeOperation.cpp \ - nsHtml5TreeOpStage.cpp \ - nsHtml5StateSnapshot.cpp \ - nsHtml5TreeOpExecutor.cpp \ - nsHtml5StreamParser.cpp \ - nsHtml5Speculation.cpp \ - nsHtml5SpeculativeLoad.cpp \ - nsHtml5SVGLoadDispatcher.cpp \ - nsHtml5Highlighter.cpp \ - nsHtml5PlainTextUtils.cpp \ - nsHtml5ViewSourceUtils.cpp \ - nsHtml5StringParser.cpp \ - nsParserUtils.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/parser/html/moz.build b/parser/html/moz.build index aacebd939a0..e66c8d3e92a 100644 --- a/parser/html/moz.build +++ b/parser/html/moz.build @@ -47,3 +47,39 @@ EXPORTS += [ 'nsParserUtils.h', ] +CPP_SOURCES += [ + 'nsHtml5Atom.cpp', + 'nsHtml5AtomTable.cpp', + 'nsHtml5Atoms.cpp', + 'nsHtml5AttributeName.cpp', + 'nsHtml5DependentUTF16Buffer.cpp', + 'nsHtml5ElementName.cpp', + 'nsHtml5Highlighter.cpp', + 'nsHtml5HtmlAttributes.cpp', + 'nsHtml5MetaScanner.cpp', + 'nsHtml5Module.cpp', + 'nsHtml5NamedCharacters.cpp', + 'nsHtml5NamedCharactersAccel.cpp', + 'nsHtml5OwningUTF16Buffer.cpp', + 'nsHtml5Parser.cpp', + 'nsHtml5PlainTextUtils.cpp', + 'nsHtml5Portability.cpp', + 'nsHtml5ReleasableAttributeName.cpp', + 'nsHtml5ReleasableElementName.cpp', + 'nsHtml5SVGLoadDispatcher.cpp', + 'nsHtml5Speculation.cpp', + 'nsHtml5SpeculativeLoad.cpp', + 'nsHtml5StackNode.cpp', + 'nsHtml5StateSnapshot.cpp', + 'nsHtml5StreamParser.cpp', + 'nsHtml5StringParser.cpp', + 'nsHtml5Tokenizer.cpp', + 'nsHtml5TreeBuilder.cpp', + 'nsHtml5TreeOpExecutor.cpp', + 'nsHtml5TreeOpStage.cpp', + 'nsHtml5TreeOperation.cpp', + 'nsHtml5UTF16Buffer.cpp', + 'nsHtml5ViewSourceUtils.cpp', + 'nsParserUtils.cpp', +] + diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index 4ed1509a86c..c7f485b9a4b 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -20,24 +20,4 @@ SHARED_LIBRARY_LIBS = \ $(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \ $(NULL) -CPPSRCS = \ - nsScannerString.cpp \ - nsDTDUtils.cpp \ - nsHTMLTokenizer.cpp \ - nsElementTable.cpp \ - nsExpatDriver.cpp \ - CNavDTD.cpp \ - nsHTMLEntities.cpp \ - nsHTMLTags.cpp \ - nsHTMLTokens.cpp \ - nsParser.cpp \ - CParserContext.cpp \ - nsParserService.cpp \ - nsParserModule.cpp \ - nsParserNode.cpp \ - nsScanner.cpp \ - nsToken.cpp \ - nsParserMsgUtils.cpp\ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/parser/htmlparser/src/moz.build b/parser/htmlparser/src/moz.build index 833a9e50e95..fa7a6e63e02 100644 --- a/parser/htmlparser/src/moz.build +++ b/parser/htmlparser/src/moz.build @@ -6,3 +6,23 @@ MODULE = 'htmlparser' +CPP_SOURCES += [ + 'CNavDTD.cpp', + 'CParserContext.cpp', + 'nsDTDUtils.cpp', + 'nsElementTable.cpp', + 'nsExpatDriver.cpp', + 'nsHTMLEntities.cpp', + 'nsHTMLTags.cpp', + 'nsHTMLTokenizer.cpp', + 'nsHTMLTokens.cpp', + 'nsParser.cpp', + 'nsParserModule.cpp', + 'nsParserMsgUtils.cpp', + 'nsParserNode.cpp', + 'nsParserService.cpp', + 'nsScanner.cpp', + 'nsScannerString.cpp', + 'nsToken.cpp', +] + diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in index 3db8563d71a..00ddb7ded08 100644 --- a/parser/xml/src/Makefile.in +++ b/parser/xml/src/Makefile.in @@ -16,12 +16,6 @@ MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsSAXAttributes.cpp \ - nsSAXLocator.cpp \ - nsSAXXMLReader.cpp \ - $(NULL) - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/parser/xml/src/moz.build b/parser/xml/src/moz.build index 70c13412cf3..5816621524f 100644 --- a/parser/xml/src/moz.build +++ b/parser/xml/src/moz.build @@ -12,3 +12,9 @@ EXPORTS += [ 'nsSAXXMLReader.h', ] +CPP_SOURCES += [ + 'nsSAXAttributes.cpp', + 'nsSAXLocator.cpp', + 'nsSAXXMLReader.cpp', +] + diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in index f6d356dfa1d..0f851be9b1f 100644 --- a/profile/dirserviceprovider/src/Makefile.in +++ b/profile/dirserviceprovider/src/Makefile.in @@ -13,9 +13,6 @@ include $(srcdir)/objs.mk LIBRARY_NAME = profdirserviceprovider_s MOZILLA_INTERNAL_API = 1 - -CPPSRCS = $(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS) - # we don't want the shared lib FORCE_STATIC_LIB = 1 diff --git a/profile/dirserviceprovider/src/moz.build b/profile/dirserviceprovider/src/moz.build index 3edcb5b8edd..e171b5663f7 100644 --- a/profile/dirserviceprovider/src/moz.build +++ b/profile/dirserviceprovider/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'profdirserviceprovider' +CPP_SOURCES += [ + '$(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS)', +] + diff --git a/profile/dirserviceprovider/standalone/Makefile.in b/profile/dirserviceprovider/standalone/Makefile.in index 000f253e706..13dd478efbb 100644 --- a/profile/dirserviceprovider/standalone/Makefile.in +++ b/profile/dirserviceprovider/standalone/Makefile.in @@ -12,8 +12,6 @@ include $(srcdir)/../src/objs.mk LIBRARY_NAME = profdirserviceprovidersa_s -CPPSRCS = $(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS) - # we don't want the shared lib FORCE_STATIC_LIB = 1 diff --git a/profile/dirserviceprovider/standalone/moz.build b/profile/dirserviceprovider/standalone/moz.build index 3edcb5b8edd..e171b5663f7 100644 --- a/profile/dirserviceprovider/standalone/moz.build +++ b/profile/dirserviceprovider/standalone/moz.build @@ -6,3 +6,7 @@ MODULE = 'profdirserviceprovider' +CPP_SOURCES += [ + '$(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS)', +] + diff --git a/rdf/base/src/Makefile.in b/rdf/base/src/Makefile.in index 63f194414ea..85d708917ec 100644 --- a/rdf/base/src/Makefile.in +++ b/rdf/base/src/Makefile.in @@ -13,24 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = rdfbase_s LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - rdfTriplesSerializer.cpp \ - nsCompositeDataSource.cpp \ - nsContainerEnumerator.cpp \ - nsDefaultResourceFactory.cpp \ - nsInMemoryDataSource.cpp \ - nsNameSpaceMap.cpp \ - nsRDFContentSink.cpp \ - nsRDFContainer.cpp \ - nsRDFContainerUtils.cpp \ - nsRDFService.cpp \ - nsRDFXMLDataSource.cpp \ - nsRDFXMLParser.cpp \ - nsRDFXMLSerializer.cpp \ - rdfutil.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/rdf/base/src/moz.build b/rdf/base/src/moz.build index 05466ed0fe3..cecb444dede 100644 --- a/rdf/base/src/moz.build +++ b/rdf/base/src/moz.build @@ -6,3 +6,20 @@ MODULE = 'rdf' +CPP_SOURCES += [ + 'nsCompositeDataSource.cpp', + 'nsContainerEnumerator.cpp', + 'nsDefaultResourceFactory.cpp', + 'nsInMemoryDataSource.cpp', + 'nsNameSpaceMap.cpp', + 'nsRDFContainer.cpp', + 'nsRDFContainerUtils.cpp', + 'nsRDFContentSink.cpp', + 'nsRDFService.cpp', + 'nsRDFXMLDataSource.cpp', + 'nsRDFXMLParser.cpp', + 'nsRDFXMLSerializer.cpp', + 'rdfTriplesSerializer.cpp', + 'rdfutil.cpp', +] + diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 0d9b1640cdd..fbca1aef906 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -16,10 +16,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsRDFModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsRDFModule.cpp \ - $(NULL) - # XXX Note dependencies on implementation headers for factory functions SHARED_LIBRARY_LIBS = \ diff --git a/rdf/build/moz.build b/rdf/build/moz.build index 406f3af3666..992a5f3afbc 100644 --- a/rdf/build/moz.build +++ b/rdf/build/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'nsRDFCID.h', ] +CPP_SOURCES += [ + 'nsRDFModule.cpp', +] + diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in index 7eeb4fa2cdc..8835bcbe977 100644 --- a/rdf/datasource/src/Makefile.in +++ b/rdf/datasource/src/Makefile.in @@ -13,12 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = rdfdatasource_s LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsLocalStore.cpp \ - nsFileSystemDataSource.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build index 05466ed0fe3..d742aa87a94 100644 --- a/rdf/datasource/src/moz.build +++ b/rdf/datasource/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'rdf' +CPP_SOURCES += [ + 'nsFileSystemDataSource.cpp', + 'nsLocalStore.cpp', +] + diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in index 2859c6b5cca..f525ced13a2 100644 --- a/rdf/tests/dsds/Makefile.in +++ b/rdf/tests/dsds/Makefile.in @@ -17,11 +17,6 @@ MOZILLA_INTERNAL_API = 1 LIBRARY_NAME = rdfdsds IS_COMPONENT = 1 -CPPSRCS = \ - nsRDFDataSourceDS.cpp \ - nsRDFDataSourceFactory.cpp \ - $(NULL) - SAMPLES_DIR = $(DIST)/bin/res/samples/rdf RESOURCE_SAMPLES = \ diff --git a/rdf/tests/dsds/moz.build b/rdf/tests/dsds/moz.build index 05466ed0fe3..7f007de197e 100644 --- a/rdf/tests/dsds/moz.build +++ b/rdf/tests/dsds/moz.build @@ -6,3 +6,8 @@ MODULE = 'rdf' +CPP_SOURCES += [ + 'nsRDFDataSourceDS.cpp', + 'nsRDFDataSourceFactory.cpp', +] + diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in index 7795d91e62b..70d914bda2b 100644 --- a/rdf/tests/rdfcat/Makefile.in +++ b/rdf/tests/rdfcat/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = rdfcat.cpp - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ diff --git a/rdf/tests/rdfcat/moz.build b/rdf/tests/rdfcat/moz.build index eec80ce6bbc..4fd5db4de63 100644 --- a/rdf/tests/rdfcat/moz.build +++ b/rdf/tests/rdfcat/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'rdfcat' +CPP_SOURCES += [ + 'rdfcat.cpp', +] diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index e7cc6011301..02a8f2e2f7f 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = rdfpoll.cpp - - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ diff --git a/rdf/tests/rdfpoll/moz.build b/rdf/tests/rdfpoll/moz.build index a82aadc53a3..66dd4682987 100644 --- a/rdf/tests/rdfpoll/moz.build +++ b/rdf/tests/rdfpoll/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'rdfpoll' +CPP_SOURCES += [ + 'rdfpoll.cpp', +] diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in index 096ac9ef9c1..7d002f182ad 100644 --- a/rdf/tests/triplescat/Makefile.in +++ b/rdf/tests/triplescat/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = triplescat.cpp - LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(LIBS_DIR) \ diff --git a/rdf/tests/triplescat/moz.build b/rdf/tests/triplescat/moz.build index da6280dfed2..e7cacf53c02 100644 --- a/rdf/tests/triplescat/moz.build +++ b/rdf/tests/triplescat/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'triplescat' +CPP_SOURCES += [ + 'triplescat.cpp', +] diff --git a/rdf/util/src/Makefile.in b/rdf/util/src/Makefile.in index bcf52284852..18848bfaebe 100644 --- a/rdf/util/src/Makefile.in +++ b/rdf/util/src/Makefile.in @@ -21,9 +21,6 @@ EXTRA_DEPS += $(srcdir)/objs.mk LIBRARY_NAME = rdfutil_external_s DIST_INSTALL = 1 - -CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/rdf/util/src/internal/Makefile.in b/rdf/util/src/internal/Makefile.in index 537c63bd037..cbfe7f78b43 100644 --- a/rdf/util/src/internal/Makefile.in +++ b/rdf/util/src/internal/Makefile.in @@ -21,9 +21,6 @@ EXTRA_DEPS += $(srcdir)/../objs.mk LIBRARY_NAME = rdfutil_s MOZILLA_INTERNAL_API = 1 - -CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/rdf/util/src/internal/moz.build b/rdf/util/src/internal/moz.build index ea9312a2c72..874ba631285 100644 --- a/rdf/util/src/internal/moz.build +++ b/rdf/util/src/internal/moz.build @@ -6,3 +6,7 @@ MODULE = 'rdfutil' +CPP_SOURCES += [ + '$(RDF_UTIL_SRC_LCPPSRCS)', +] + diff --git a/rdf/util/src/moz.build b/rdf/util/src/moz.build index 4b0f551a863..3a6f8a42930 100644 --- a/rdf/util/src/moz.build +++ b/rdf/util/src/moz.build @@ -8,3 +8,7 @@ DIRS += ['internal'] MODULE = 'rdfutil' +CPP_SOURCES += [ + '$(RDF_UTIL_SRC_LCPPSRCS)', +] + diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in index 5cc6eff5846..92c99051613 100644 --- a/security/manager/boot/src/Makefile.in +++ b/security/manager/boot/src/Makefile.in @@ -17,14 +17,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsEntropyCollector.cpp \ - nsSecureBrowserUIImpl.cpp \ - nsBOOTModule.cpp \ - nsSecurityWarningDialogs.cpp \ - nsStrictTransportSecurityService.cpp \ - $(NULL) - DEFINES += -D__STDC_CONSTANT_MACROS include $(topsrcdir)/config/rules.mk diff --git a/security/manager/boot/src/moz.build b/security/manager/boot/src/moz.build index bec5eab4604..fe17f92fdd4 100644 --- a/security/manager/boot/src/moz.build +++ b/security/manager/boot/src/moz.build @@ -6,3 +6,11 @@ MODULE = 'pipboot' +CPP_SOURCES += [ + 'nsBOOTModule.cpp', + 'nsEntropyCollector.cpp', + 'nsSecureBrowserUIImpl.cpp', + 'nsSecurityWarningDialogs.cpp', + 'nsStrictTransportSecurityService.cpp', +] + diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in index 809a3f73422..1bf3a95165b 100644 --- a/security/manager/pki/src/Makefile.in +++ b/security/manager/pki/src/Makefile.in @@ -18,16 +18,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsNSSDialogs.cpp \ - nsPKIModule.cpp \ - nsPKIParamBlock.cpp \ - nsASN1Tree.cpp \ - nsNSSDialogHelper.cpp \ - nsFormSigningDialog.cpp \ - $(NULL) - - INCLUDES += \ -I$(DIST)/public/nss \ $(NULL) diff --git a/security/manager/pki/src/moz.build b/security/manager/pki/src/moz.build index 810ab87185a..b7dfb0e8eda 100644 --- a/security/manager/pki/src/moz.build +++ b/security/manager/pki/src/moz.build @@ -6,3 +6,12 @@ MODULE = 'pippki' +CPP_SOURCES += [ + 'nsASN1Tree.cpp', + 'nsFormSigningDialog.cpp', + 'nsNSSDialogHelper.cpp', + 'nsNSSDialogs.cpp', + 'nsPKIModule.cpp', + 'nsPKIParamBlock.cpp', +] + diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index 1b1ec3defb2..9d345901e2e 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -16,74 +16,6 @@ IS_COMPONENT = 1 MODULE_NAME = NSS EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - CryptoTask.cpp \ - JARSignatureVerification.cpp \ - nsNSSCleaner.cpp \ - nsCertOverrideService.cpp \ - nsRecentBadCerts.cpp \ - nsClientAuthRemember.cpp \ - nsPSMBackgroundThread.cpp \ - nsCertVerificationThread.cpp \ - nsProtectedAuthThread.cpp \ - nsNSSCallbacks.cpp \ - nsNSSComponent.cpp \ - nsNSSErrors.cpp \ - nsNSSIOLayer.cpp \ - SSLServerCertVerification.cpp \ - TransportSecurityInfo.cpp \ - nsSSLStatus.cpp \ - nsNSSModule.cpp \ - nsSSLSocketProvider.cpp \ - nsTLSSocketProvider.cpp \ - nsSDR.cpp \ - nsPK11TokenDB.cpp \ - nsNSSCertificate.cpp \ - nsPKCS12Blob.cpp \ - nsNSSASN1Object.cpp \ - nsKeygenHandler.cpp \ - nsCrypto.cpp \ - nsPKCS11Slot.cpp \ - nsKeygenThread.cpp \ - nsCMSSecureMessage.cpp \ - nsCMS.cpp \ - nsCertPicker.cpp \ - nsCRLInfo.cpp \ - nsNSSCertCache.cpp \ - nsNSSCertHelper.cpp \ - nsNSSCertificateDB.cpp \ - nsNSSCertTrust.cpp \ - nsNSSCertValidity.cpp \ - nsUsageArrayHelper.cpp \ - nsCRLManager.cpp \ - nsNSSShutDown.cpp \ - nsNTLMAuthModule.cpp \ - nsStreamCipher.cpp \ - nsKeyModule.cpp \ - nsIdentityChecking.cpp \ - nsDataSignatureVerifier.cpp \ - nsRandomGenerator.cpp \ - NSSErrorsService.cpp \ - nsNSSCertificateFakeTransport.cpp \ - PSMRunnable.cpp \ - nsNSSVersion.cpp \ - nsCertificatePrincipal.cpp \ - SharedSSLState.cpp \ - CertVerifier.cpp \ - $(NULL) - - -ifndef MOZ_DISABLE_CRYPTOLEGACY -CPPSRCS += \ - nsSmartCardMonitor.cpp \ - $(NULL) -endif - -ifdef MOZ_XUL -CPPSRCS += nsCertTree.cpp -endif - CSRCS += md4.c DEFINES += \ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build index b40211b59ae..ac1217b97a1 100644 --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -17,3 +17,69 @@ EXPORTS.mozilla += [ 'PublicSSL.h', ] +CPP_SOURCES += [ + 'CertVerifier.cpp', + 'CryptoTask.cpp', + 'JARSignatureVerification.cpp', + 'nsCertificatePrincipal.cpp', + 'nsCertOverrideService.cpp', + 'nsCertPicker.cpp', + 'nsCertVerificationThread.cpp', + 'nsClientAuthRemember.cpp', + 'nsCMS.cpp', + 'nsCMSSecureMessage.cpp', + 'nsCRLInfo.cpp', + 'nsCRLManager.cpp', + 'nsCrypto.cpp', + 'nsDataSignatureVerifier.cpp', + 'nsIdentityChecking.cpp', + 'nsKeygenHandler.cpp', + 'nsKeygenThread.cpp', + 'nsKeyModule.cpp', + 'nsNSSASN1Object.cpp', + 'nsNSSCallbacks.cpp', + 'nsNSSCertCache.cpp', + 'nsNSSCertHelper.cpp', + 'nsNSSCertificate.cpp', + 'nsNSSCertificateDB.cpp', + 'nsNSSCertificateFakeTransport.cpp', + 'nsNSSCertTrust.cpp', + 'nsNSSCertValidity.cpp', + 'nsNSSCleaner.cpp', + 'nsNSSComponent.cpp', + 'nsNSSErrors.cpp', + 'nsNSSIOLayer.cpp', + 'nsNSSModule.cpp', + 'nsNSSShutDown.cpp', + 'nsNSSVersion.cpp', + 'nsNTLMAuthModule.cpp', + 'nsPK11TokenDB.cpp', + 'nsPKCS11Slot.cpp', + 'nsPKCS12Blob.cpp', + 'nsProtectedAuthThread.cpp', + 'nsPSMBackgroundThread.cpp', + 'nsRandomGenerator.cpp', + 'nsRecentBadCerts.cpp', + 'nsSDR.cpp', + 'NSSErrorsService.cpp', + 'nsSSLSocketProvider.cpp', + 'nsSSLStatus.cpp', + 'nsStreamCipher.cpp', + 'nsTLSSocketProvider.cpp', + 'nsUsageArrayHelper.cpp', + 'PSMRunnable.cpp', + 'SharedSSLState.cpp', + 'SSLServerCertVerification.cpp', + 'TransportSecurityInfo.cpp', +] + +if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY']: + CPP_SOURCES += [ + 'nsSmartCardMonitor.cpp', + ] + +if CONFIG['MOZ_XUL']: + CPP_SOURCES += [ + 'nsCertTree.cpp', + ] + diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in index 172d0c13c57..ca56ee4eba8 100644 --- a/services/crypto/component/Makefile.in +++ b/services/crypto/component/Makefile.in @@ -18,8 +18,4 @@ MODULE_NAME := nsServicesCryptoModule LIBXUL_LIBRARY := 1 MOZILLA_INTERNAL_API := 1 -CPPSRCS := \ - nsSyncJPAKE.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/services/crypto/component/moz.build b/services/crypto/component/moz.build index ed832d89394..36a938169b0 100644 --- a/services/crypto/component/moz.build +++ b/services/crypto/component/moz.build @@ -14,3 +14,7 @@ XPIDL_MODULE = 'services-crypto-component' MODULE = 'services-crypto' +CPP_SOURCES += [ + 'nsSyncJPAKE.cpp', +] + diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in index 1552db5658a..e939f0f025f 100644 --- a/startupcache/Makefile.in +++ b/startupcache/Makefile.in @@ -16,9 +16,4 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = StartupCache.cpp \ - StartupCacheUtils.cpp \ - StartupCacheModule.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/startupcache/moz.build b/startupcache/moz.build index 41a34a7d1c7..e4b196868ef 100644 --- a/startupcache/moz.build +++ b/startupcache/moz.build @@ -18,3 +18,9 @@ EXPORTS.mozilla.scache += [ 'StartupCacheUtils.h', ] +CPP_SOURCES += [ + 'StartupCache.cpp', + 'StartupCacheModule.cpp', + 'StartupCacheUtils.cpp', +] + diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in index 7fcba067405..f7783ed5faa 100644 --- a/storage/build/Makefile.in +++ b/storage/build/Makefile.in @@ -17,8 +17,6 @@ MODULE_NAME = mozStorageModule LIBXUL_LIBRARY = 1 -CPPSRCS = mozStorageModule.cpp - LOCAL_INCLUDES = \ $(SQLITE_CFLAGS) \ -I$(srcdir)/../src diff --git a/storage/build/moz.build b/storage/build/moz.build index eeccbabc0bc..5549e8ce057 100644 --- a/storage/build/moz.build +++ b/storage/build/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'mozStorageCID.h', ] +CPP_SOURCES += [ + 'mozStorageModule.cpp', +] + diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in index 0ed7a2bfdcb..365127c7576 100644 --- a/storage/src/Makefile.in +++ b/storage/src/Makefile.in @@ -32,32 +32,6 @@ DEFINES += -DMOZ_STORAGE_MEMORY endif endif -CPPSRCS = \ - mozStorageService.cpp \ - mozStorageConnection.cpp \ - mozStorageStatement.cpp \ - mozStorageStatementParams.cpp \ - mozStorageStatementRow.cpp \ - mozStorageArgValueArray.cpp \ - mozStorageSQLFunctions.cpp \ - mozStorageRow.cpp \ - mozStorageResultSet.cpp \ - mozStorageError.cpp \ - mozStorageAsyncStatementExecution.cpp \ - mozStorageStatementJSHelper.cpp \ - mozStoragePrivateHelpers.cpp \ - mozStorageBindingParamsArray.cpp \ - mozStorageBindingParams.cpp \ - mozStorageAsyncStatement.cpp \ - mozStorageAsyncStatementJSHelper.cpp \ - mozStorageAsyncStatementParams.cpp \ - StorageBaseStatementInternal.cpp \ - SQLCollations.cpp \ - VacuumManager.cpp \ - TelemetryVFS.cpp \ - FileSystemModule.cpp \ - $(NULL) - # For nsDependentJSString LOCAL_INCLUDES = \ $(SQLITE_CFLAGS) \ diff --git a/storage/src/moz.build b/storage/src/moz.build index 4ed56218f08..763048df2dd 100644 --- a/storage/src/moz.build +++ b/storage/src/moz.build @@ -11,3 +11,29 @@ EXPORTS.mozilla.storage += [ 'Variant_inl.h', ] +CPP_SOURCES += [ + 'FileSystemModule.cpp', + 'SQLCollations.cpp', + 'StorageBaseStatementInternal.cpp', + 'TelemetryVFS.cpp', + 'VacuumManager.cpp', + 'mozStorageArgValueArray.cpp', + 'mozStorageAsyncStatement.cpp', + 'mozStorageAsyncStatementExecution.cpp', + 'mozStorageAsyncStatementJSHelper.cpp', + 'mozStorageAsyncStatementParams.cpp', + 'mozStorageBindingParams.cpp', + 'mozStorageBindingParamsArray.cpp', + 'mozStorageConnection.cpp', + 'mozStorageError.cpp', + 'mozStoragePrivateHelpers.cpp', + 'mozStorageResultSet.cpp', + 'mozStorageRow.cpp', + 'mozStorageSQLFunctions.cpp', + 'mozStorageService.cpp', + 'mozStorageStatement.cpp', + 'mozStorageStatementJSHelper.cpp', + 'mozStorageStatementParams.cpp', + 'mozStorageStatementRow.cpp', +] + diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in index 9f99d61a041..c9a94e65cbd 100644 --- a/testing/gtest/Makefile.in +++ b/testing/gtest/Makefile.in @@ -23,12 +23,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = \ - gmock-all.cc \ - gtest-all.cc \ - GTestRunner.cpp \ - $(NULL) - GTEST_CPPSRCS = \ SanityTest.cpp \ $(NULL) diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build index 14302771417..3adc01069bf 100644 --- a/testing/gtest/moz.build +++ b/testing/gtest/moz.build @@ -53,3 +53,9 @@ EXPORTS.gmock.internal += [ 'gmock/include/gmock/internal/gmock-port.h', ] +CPP_SOURCES += [ + 'GTestRunner.cpp', + 'gmock-all.cc', + 'gtest-all.cc', +] + diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in index 98a35a2b317..c965e42e694 100644 --- a/testing/mochitest/ssltunnel/Makefile.in +++ b/testing/mochitest/ssltunnel/Makefile.in @@ -14,8 +14,6 @@ include $(DEPTH)/config/autoconf.mk # wrappers STL_FLAGS = -CPPSRCS = ssltunnel.cpp - LIBS = \ $(NSPR_LIBS) \ $(NSS_LIBS) \ diff --git a/testing/mochitest/ssltunnel/moz.build b/testing/mochitest/ssltunnel/moz.build index ac250113dd1..930ab10535e 100644 --- a/testing/mochitest/ssltunnel/moz.build +++ b/testing/mochitest/ssltunnel/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'ssltunnel' +CPP_SOURCES += [ + 'ssltunnel.cpp', +] diff --git a/testing/tools/screenshot/Makefile.in b/testing/tools/screenshot/Makefile.in index 8ffb9d0a5ae..83fcfc02788 100644 --- a/testing/tools/screenshot/Makefile.in +++ b/testing/tools/screenshot/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ifdef MOZ_X11 -CPPSRCS = gdk-screenshot.cpp LOCAL_INCLUDES = $(MOZ_GTK2_CFLAGS) OS_LIBS = $(MOZ_GTK2_LIBS) $(XSS_LIBS) @@ -21,7 +20,6 @@ endif # GTK2 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS = win32-screenshot.cpp OS_LIBS += $(call EXPAND_LIBNAME,gdiplus) MOZ_GLUE_PROGRAM_LDFLAGS = USE_STATIC_LIBS = 1 diff --git a/testing/tools/screenshot/moz.build b/testing/tools/screenshot/moz.build index 92192296c94..955023838a4 100644 --- a/testing/tools/screenshot/moz.build +++ b/testing/tools/screenshot/moz.build @@ -6,5 +6,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2' and CONFIG['MOZ_X11']: PROGRAM = 'screentopng' + CPP_SOURCES += [ + 'gdk-screenshot.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': PROGRAM = 'screenshot' + CPP_SOURCES += [ + 'win32-screenshot.cpp', + ] diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index 2c7d9218a7a..578eb76956b 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = alerts_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsAlertsService.cpp \ - nsXULAlerts.cpp \ - $(NULL) LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ include $(topsrcdir)/config/config.mk diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build index 8aa16199809..99b84efa074 100644 --- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -11,3 +11,9 @@ XPIDL_SOURCES += [ ] MODULE = 'alerts' + +CPP_SOURCES += [ + 'nsAlertsService.cpp', + 'nsXULAlerts.cpp', +] + diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in index 634760cc9ef..a76c2acb5af 100644 --- a/toolkit/components/autocomplete/Makefile.in +++ b/toolkit/components/autocomplete/Makefile.in @@ -16,9 +16,4 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsAutoCompleteController.cpp \ - nsAutoCompleteSimpleResult.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build index 404d793f4ee..0463f311ec8 100644 --- a/toolkit/components/autocomplete/moz.build +++ b/toolkit/components/autocomplete/moz.build @@ -17,3 +17,8 @@ XPIDL_SOURCES += [ MODULE = 'autocomplete' +CPP_SOURCES += [ + 'nsAutoCompleteController.cpp', + 'nsAutoCompleteSimpleResult.cpp', +] + diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index 47c6fa8997f..4453d76d534 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -16,8 +16,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsToolkitCompsModule LIBXUL_LIBRARY = 1 -CPPSRCS = nsToolkitCompsModule.cpp - include $(topsrcdir)/config/config.mk LOCAL_INCLUDES = \ diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build index d01a78024fd..5e15b2e6060 100644 --- a/toolkit/components/build/moz.build +++ b/toolkit/components/build/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'nsToolkitCompsCID.h', ] +CPP_SOURCES += [ + 'nsToolkitCompsModule.cpp', +] + diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in index 0531ec6cbef..f0289fa9f73 100644 --- a/toolkit/components/commandlines/Makefile.in +++ b/toolkit/components/commandlines/Makefile.in @@ -15,8 +15,4 @@ IS_COMPONENT = 1 MODULE_NAME = CommandLineModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsCommandLine.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build index 41f04597505..dfe2b7f96a2 100644 --- a/toolkit/components/commandlines/moz.build +++ b/toolkit/components/commandlines/moz.build @@ -17,3 +17,7 @@ XPIDL_MODULE = 'commandlines' MODULE = 'toolkitcomps' +CPP_SOURCES += [ + 'nsCommandLine.cpp', +] + diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in index 449adc27272..ca9e3ce77e9 100644 --- a/toolkit/components/ctypes/Makefile.in +++ b/toolkit/components/ctypes/Makefile.in @@ -20,10 +20,6 @@ LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = \ - ctypes.cpp \ - $(NULL) - LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ $(NULL) diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build index 211134a77b1..8a27ac6e08b 100644 --- a/toolkit/components/ctypes/moz.build +++ b/toolkit/components/ctypes/moz.build @@ -8,3 +8,7 @@ TEST_DIRS += ['tests'] MODULE = 'jsctypes' +CPP_SOURCES += [ + 'ctypes.cpp', +] + diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in index 87a504456a1..49c69fa7869 100644 --- a/toolkit/components/ctypes/tests/Makefile.in +++ b/toolkit/components/ctypes/tests/Makefile.in @@ -15,11 +15,6 @@ SHORT_LIBNAME = jscttest FORCE_SHARED_LIB = 1 NO_DIST_INSTALL = 1 -CPPSRCS = jsctypes-test.cpp \ - jsctypes-test-errno.cpp \ - jsctypes-test-finalizer.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/js/src/ctypes \ $(NULL) diff --git a/toolkit/components/ctypes/tests/moz.build b/toolkit/components/ctypes/tests/moz.build index a18b45ee821..46e68dc940b 100644 --- a/toolkit/components/ctypes/tests/moz.build +++ b/toolkit/components/ctypes/tests/moz.build @@ -7,3 +7,9 @@ MODULE = 'jsctypes-test' XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +CPP_SOURCES += [ + 'jsctypes-test-errno.cpp', + 'jsctypes-test-finalizer.cpp', + 'jsctypes-test.cpp', +] diff --git a/toolkit/components/diskspacewatcher/Makefile.in b/toolkit/components/diskspacewatcher/Makefile.in index 3e652f96152..c1100116c83 100644 --- a/toolkit/components/diskspacewatcher/Makefile.in +++ b/toolkit/components/diskspacewatcher/Makefile.in @@ -15,9 +15,5 @@ IS_COMPONENT = 1 MODULE_NAME = DiskSpaceWatcherModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - DiskSpaceWatcher.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/diskspacewatcher/moz.build b/toolkit/components/diskspacewatcher/moz.build index a5d05120de7..54f71d03d34 100644 --- a/toolkit/components/diskspacewatcher/moz.build +++ b/toolkit/components/diskspacewatcher/moz.build @@ -14,3 +14,7 @@ EXPORTS += [ XPIDL_MODULE = 'diskspacewatcher' MODULE = 'toolkitcomps' + +CPP_SOURCES = [ + 'DiskSpaceWatcher.cpp', +] diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index 68636165a18..c66993631fb 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -14,15 +14,6 @@ LIBRARY_NAME = download_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsDownloadManager.cpp \ - SQLFunctions.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += nsDownloadScanner.cpp -endif - # definition of MOZ_SUITE is only added via config.mk include $(topsrcdir)/config/config.mk diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 4357ce2be57..096fad9e3eb 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -15,3 +15,12 @@ XPIDL_SOURCES += [ MODULE = 'downloads' +CPP_SOURCES += [ + 'SQLFunctions.cpp', + 'nsDownloadManager.cpp', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsDownloadScanner.cpp', + ] diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in index a96c32e3663..a65bdb170d8 100644 --- a/toolkit/components/filepicker/Makefile.in +++ b/toolkit/components/filepicker/Makefile.in @@ -18,9 +18,6 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsFileViewModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsFileView.cpp \ - $(NULL) EXTRA_COMPONENTS = nsFilePicker.js EXTRA_PP_COMPONENTS = nsFilePicker.manifest endif diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build index 8f0184c3176..c8f96cafd11 100644 --- a/toolkit/components/filepicker/moz.build +++ b/toolkit/components/filepicker/moz.build @@ -10,4 +10,7 @@ if CONFIG['MOZ_XUL'] and \ XPIDL_SOURCES += [ 'nsIFileView.idl', ] + CPP_SOURCES += [ + 'nsFileView.cpp', + ] diff --git a/toolkit/components/find/Makefile.in b/toolkit/components/find/Makefile.in index 4342fc60bbf..41388cfc6b3 100644 --- a/toolkit/components/find/Makefile.in +++ b/toolkit/components/find/Makefile.in @@ -14,8 +14,4 @@ LIBRARY_NAME = mozfind_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsFindService.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/find/moz.build b/toolkit/components/find/moz.build index d21cc983927..57d4ad7a43d 100644 --- a/toolkit/components/find/moz.build +++ b/toolkit/components/find/moz.build @@ -10,3 +10,7 @@ XPIDL_SOURCES += [ MODULE = 'mozfind' +CPP_SOURCES += [ + 'nsFindService.cpp', +] + diff --git a/toolkit/components/intl/Makefile.in b/toolkit/components/intl/Makefile.in index 6d1121b1b5e..2e3f319490e 100644 --- a/toolkit/components/intl/Makefile.in +++ b/toolkit/components/intl/Makefile.in @@ -14,8 +14,4 @@ LIBRARY_NAME = intl_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS= \ - nsCharsetMenu.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/intl/moz.build b/toolkit/components/intl/moz.build index 758dcf6deba..65d87b537f1 100644 --- a/toolkit/components/intl/moz.build +++ b/toolkit/components/intl/moz.build @@ -6,3 +6,7 @@ MODULE = 'intl' +CPP_SOURCES += [ + 'nsCharsetMenu.cpp', +] + diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in index b4249ab8602..ecf83317120 100644 --- a/toolkit/components/maintenanceservice/Makefile.in +++ b/toolkit/components/maintenanceservice/Makefile.in @@ -9,15 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - maintenanceservice.cpp \ - serviceinstall.cpp \ - workmonitor.cpp \ - certificatecheck.cpp \ - servicebase.cpp \ - registrycertificates.cpp \ - $(NULL) - # For debugging purposes only #DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK diff --git a/toolkit/components/maintenanceservice/moz.build b/toolkit/components/maintenanceservice/moz.build index a37da1f4bcd..3ad1fd8a679 100644 --- a/toolkit/components/maintenanceservice/moz.build +++ b/toolkit/components/maintenanceservice/moz.build @@ -6,3 +6,11 @@ PROGRAM = 'maintenanceservice' +CPP_SOURCES += [ + 'certificatecheck.cpp', + 'maintenanceservice.cpp', + 'registrycertificates.cpp', + 'servicebase.cpp', + 'serviceinstall.cpp', + 'workmonitor.cpp', +] diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in index 89d51fdf31d..fc625361fbb 100644 --- a/toolkit/components/mediasniffer/Makefile.in +++ b/toolkit/components/mediasniffer/Makefile.in @@ -16,10 +16,5 @@ MODULE_NAME = nsMediaSnifferModule IS_COMPONENT = 1 -CPPSRCS = \ - nsMediaSniffer.cpp \ - nsMediaSnifferModule.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build index a397e9da9bc..7f5105654e8 100644 --- a/toolkit/components/mediasniffer/moz.build +++ b/toolkit/components/mediasniffer/moz.build @@ -12,3 +12,8 @@ EXPORTS += [ 'nsMediaSniffer.h', ] +CPP_SOURCES += [ + 'nsMediaSniffer.cpp', + 'nsMediaSnifferModule.cpp', +] + diff --git a/toolkit/components/parentalcontrols/Makefile.in b/toolkit/components/parentalcontrols/Makefile.in index 23394cc0ead..3024ff55eb9 100644 --- a/toolkit/components/parentalcontrols/Makefile.in +++ b/toolkit/components/parentalcontrols/Makefile.in @@ -15,9 +15,6 @@ ifeq (WINNT,$(OS_ARCH)) LIBRARY_NAME = parentalcontrols_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsParentalControlsServiceWin.cpp \ - $(NULL) endif endif diff --git a/toolkit/components/parentalcontrols/moz.build b/toolkit/components/parentalcontrols/moz.build index 144bb913300..495fd8d4b73 100644 --- a/toolkit/components/parentalcontrols/moz.build +++ b/toolkit/components/parentalcontrols/moz.build @@ -10,3 +10,8 @@ XPIDL_SOURCES += [ MODULE = 'parentalcontrols' +if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']: + if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsParentalControlsServiceWin.cpp', + ] diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in index c63d6125cfc..ca5bb7e0b7d 100644 --- a/toolkit/components/perf/Makefile.in +++ b/toolkit/components/perf/Makefile.in @@ -21,10 +21,6 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - PerfMeasurement.cpp \ - $(NULL) - LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ $(NULL) diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build index 1f4862f279e..ce9ea338ff7 100644 --- a/toolkit/components/perf/moz.build +++ b/toolkit/components/perf/moz.build @@ -6,3 +6,7 @@ MODULE = 'jsperf' +CPP_SOURCES += [ + 'PerfMeasurement.cpp', +] + diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index 6a44e871c22..390238a1464 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -17,25 +17,6 @@ EXPORT_LIBRARY = 1 MODULE_NAME = nsPlacesModule IS_COMPONENT = 1 -CPPSRCS = \ - nsAnnoProtocolHandler.cpp \ - nsAnnotationService.cpp \ - nsFaviconService.cpp \ - nsNavHistory.cpp \ - nsNavHistoryQuery.cpp \ - nsNavHistoryResult.cpp \ - nsNavBookmarks.cpp \ - nsMaybeWeakPtr.cpp \ - nsPlacesModule.cpp \ - SQLFunctions.cpp \ - Helpers.cpp \ - History.cpp \ - AsyncFaviconHelpers.cpp \ - PlaceInfo.cpp \ - VisitInfo.cpp \ - Database.cpp \ - $(NULL) - LOCAL_INCLUDES += -I$(srcdir)/../build EXTRA_COMPONENTS = \ diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index 308051a51b6..cc6062da6e0 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -32,5 +32,24 @@ if CONFIG['MOZ_PLACES']: 'Database.h', ] + CPP_SOURCES += [ + 'nsAnnoProtocolHandler.cpp', + 'nsAnnotationService.cpp', + 'nsFaviconService.cpp', + 'nsNavHistory.cpp', + 'nsNavHistoryQuery.cpp', + 'nsNavHistoryResult.cpp', + 'nsNavBookmarks.cpp', + 'nsMaybeWeakPtr.cpp', + 'nsPlacesModule.cpp', + 'SQLFunctions.cpp', + 'Helpers.cpp', + 'History.cpp', + 'AsyncFaviconHelpers.cpp', + 'PlaceInfo.cpp', + 'VisitInfo.cpp', + 'Database.cpp', + ] + MODULE = 'places' diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in index 23d974e3102..fcd901e135d 100644 --- a/toolkit/components/protobuf/Makefile.in +++ b/toolkit/components/protobuf/Makefile.in @@ -24,22 +24,6 @@ LOCAL_INCLUDES = \ -I$(srcdir) \ $(NULL) -CPPSRCS = \ - coded_stream.cc \ - common.cc \ - extension_set.cc \ - generated_message_util.cc \ - message_lite.cc \ - once.cc \ - repeated_field.cc \ - wire_format_lite.cc \ - zero_copy_stream.cc \ - zero_copy_stream_impl_lite.cc \ - $(NULL) - -# These exports should only be included by source code automatically generated -# by the protocol compiler, protoc. The verbose naming is due to directory -# structure included in the generated code. include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build index f256ae748c7..2768b721ef4 100644 --- a/toolkit/components/protobuf/moz.build +++ b/toolkit/components/protobuf/moz.build @@ -32,3 +32,16 @@ EXPORTS.protobuf.google.protobuf.io += [ 'zero_copy_stream_impl_lite.h', ] +CPP_SOURCES += [ + 'coded_stream.cc', + 'common.cc', + 'extension_set.cc', + 'generated_message_util.cc', + 'message_lite.cc', + 'once.cc', + 'repeated_field.cc', + 'wire_format_lite.cc', + 'zero_copy_stream.cc', + 'zero_copy_stream_impl_lite.cc', +] + diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in index 9ca7c5f02b1..2f3cbbeafd8 100644 --- a/toolkit/components/reflect/Makefile.in +++ b/toolkit/components/reflect/Makefile.in @@ -20,10 +20,6 @@ LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = \ - reflect.cpp \ - $(NULL) - EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ diff --git a/toolkit/components/reflect/moz.build b/toolkit/components/reflect/moz.build index 6782d9e24b6..ca7a98030a6 100644 --- a/toolkit/components/reflect/moz.build +++ b/toolkit/components/reflect/moz.build @@ -6,3 +6,7 @@ MODULE = 'jsreflect' +CPP_SOURCES += [ + 'reflect.cpp', +] + diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in index 3aa8cb753c4..0953af3e209 100644 --- a/toolkit/components/remote/Makefile.in +++ b/toolkit/components/remote/Makefile.in @@ -17,16 +17,6 @@ MODULE_NAME = RemoteServiceModule LIBXUL_LIBRARY = 1 - -CPPSRCS += nsXRemoteService.cpp -ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) -CPPSRCS += nsGTKRemoteService.cpp -endif - -ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += nsQtRemoteService.cpp -endif - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build index 14b5770df0d..2d28df54ef9 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -12,3 +12,15 @@ XPIDL_MODULE = 'toolkitremote' MODULE = 'toolkitcomps' +CPP_SOURCES += [ + 'nsXRemoteService.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'nsGTKRemoteService.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': + CPP_SOURCES += [ + 'nsQtRemoteService.cpp', + ] diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in index 4fe220cf647..2ebfb46f698 100644 --- a/toolkit/components/satchel/Makefile.in +++ b/toolkit/components/satchel/Makefile.in @@ -19,10 +19,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(NULL) -CPPSRCS = \ - nsFormFillController.cpp \ - $(NULL) - EXTRA_COMPONENTS = \ nsFormAutoComplete.js \ FormHistoryStartup.js \ diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build index 006a8c66606..55ea4ffdaf4 100644 --- a/toolkit/components/satchel/moz.build +++ b/toolkit/components/satchel/moz.build @@ -15,3 +15,7 @@ XPIDL_SOURCES += [ MODULE = 'satchel' +CPP_SOURCES += [ + 'nsFormFillController.cpp', +] + diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in index 2c368b13314..00f60059c51 100644 --- a/toolkit/components/startup/Makefile.in +++ b/toolkit/components/startup/Makefile.in @@ -14,23 +14,8 @@ LIBRARY_NAME = appstartup_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsAppStartup.cpp \ - StartupTimeline.cpp \ - $(NULL) - -ifeq (os2,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += nsUserInfoOS2.cpp -else -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += nsUserInfoWin.cpp -else ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) CMMSRCS += nsUserInfoMac.mm -else -CPPSRCS += nsUserInfoUnix.cpp -endif -endif endif include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index d2dcd8125a4..08ec6291c39 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -15,3 +15,24 @@ EXPORTS.mozilla += [ ] XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] + +CPP_SOURCES += [ + 'StartupTimeline.cpp', + 'nsAppStartup.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': + CPP_SOURCES += [ + 'nsUserInfoOS2.cpp', + ] +elif CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsUserInfoWin.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + # TODO: CMMSRCS go here + pass +else: + CPP_SOURCES += [ + 'nsUserInfoUnix.cpp', + ] diff --git a/toolkit/components/statusfilter/Makefile.in b/toolkit/components/statusfilter/Makefile.in index 41b355a8714..190101cb002 100644 --- a/toolkit/components/statusfilter/Makefile.in +++ b/toolkit/components/statusfilter/Makefile.in @@ -16,8 +16,4 @@ LIBXUL_LIBRARY = 1 MODULE_NAME = nsBrowserModule -CPPSRCS = \ - nsBrowserStatusFilter.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/statusfilter/moz.build b/toolkit/components/statusfilter/moz.build index 5bbc9690573..c58e812c93a 100644 --- a/toolkit/components/statusfilter/moz.build +++ b/toolkit/components/statusfilter/moz.build @@ -6,3 +6,7 @@ MODULE = 'browser' +CPP_SOURCES += [ + 'nsBrowserStatusFilter.cpp', +] + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index c196e2c88c3..60ac654b614 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -34,10 +34,6 @@ EXTRA_JS_MODULES = \ TelemetryStopwatch.jsm \ $(NULL) -CPPSRCS = \ - Telemetry.cpp \ - $(NULL) - LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index 68371d998b9..01607bb004b 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -19,3 +19,7 @@ EXPORTS.mozilla += [ 'TelemetryHistogramEnums.h', ] +CPP_SOURCES += [ + 'Telemetry.cpp', +] + diff --git a/toolkit/components/typeaheadfind/Makefile.in b/toolkit/components/typeaheadfind/Makefile.in index 4cac7bd93a0..b8339861f71 100644 --- a/toolkit/components/typeaheadfind/Makefile.in +++ b/toolkit/components/typeaheadfind/Makefile.in @@ -13,8 +13,4 @@ LIBRARY_NAME = fastfind_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsTypeAheadFind.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/typeaheadfind/moz.build b/toolkit/components/typeaheadfind/moz.build index bf9e802eb09..407ebb12f76 100644 --- a/toolkit/components/typeaheadfind/moz.build +++ b/toolkit/components/typeaheadfind/moz.build @@ -10,3 +10,7 @@ XPIDL_SOURCES += [ MODULE = 'fastfind' +CPP_SOURCES += [ + 'nsTypeAheadFind.cpp', +] + diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index b1df56ed187..71c6e06759b 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -16,20 +16,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - ChunkSet.cpp \ - Classifier.cpp \ - HashStore.cpp \ - ProtocolParser.cpp \ - LookupCache.cpp \ - nsUrlClassifierDBService.cpp \ - nsUrlClassifierStreamUpdater.cpp \ - nsUrlClassifierUtils.cpp \ - nsUrlClassifierPrefixSet.cpp \ - nsUrlClassifierProxies.cpp \ - nsCheckSummedOutputStream.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(SQLITE_CFLAGS) \ diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build index a45684bd8bd..1bb70cbc64a 100644 --- a/toolkit/components/url-classifier/moz.build +++ b/toolkit/components/url-classifier/moz.build @@ -17,3 +17,17 @@ XPIDL_SOURCES += [ MODULE = 'url-classifier' +CPP_SOURCES += [ + 'ChunkSet.cpp', + 'Classifier.cpp', + 'HashStore.cpp', + 'LookupCache.cpp', + 'ProtocolParser.cpp', + 'nsCheckSummedOutputStream.cpp', + 'nsUrlClassifierDBService.cpp', + 'nsUrlClassifierPrefixSet.cpp', + 'nsUrlClassifierProxies.cpp', + 'nsUrlClassifierStreamUpdater.cpp', + 'nsUrlClassifierUtils.cpp', +] + diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 93f1aba4c05..2cc40c0cbdb 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -43,17 +43,6 @@ endif LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src DEFINES += -DUNICODE -D_UNICODE -CPPSRCS = \ - nsExceptionHandler.cpp \ - $(NULL) - -ifdef MOZ_CRASHREPORTER_INJECTOR -CPPSRCS += \ - LoadLibraryRemote.cpp \ - InjectCrashReporter.cpp \ - $(NULL) -endif - FORCE_STATIC_LIB = 1 EXTRA_JS_MODULES = \ diff --git a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in index 0f5b5b68a73..6d015c8acf8 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in +++ b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in @@ -28,14 +28,6 @@ VPATH += \ $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation \ $(NULL) -CPPSRCS = \ - $(objs_common) \ - $(objs_handler) \ - $(objs_sender) \ - $(objs_crash_generation) \ - http_upload.cc \ # required for the libxul version but not standalone - $(NULL) - DEFINES += -DUNICODE -DUNICODE_ -DBREAKPAD_NO_TERMINATE_THREAD -DNOMINMAX include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/breakpad-windows-libxul/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/moz.build index 895d11993cf..622e4d5f407 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build +++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build @@ -4,3 +4,11 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + '$(objs_common)', + '$(objs_crash_generation)', + '$(objs_handler)', + '$(objs_sender)', + 'http_upload.cc', +] + diff --git a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in index d7fdc4f6e3a..033fb06a185 100644 --- a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in +++ b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in @@ -28,12 +28,6 @@ VPATH += \ $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation \ $(NULL) -CPPSRCS = \ - $(objs_common) \ - $(objs_handler) \ - $(objs_crash_generation) \ - $(NULL) - DEFINES += -DUNICODE -DUNICODE_ -DBREAKPAD_NO_TERMINATE_THREAD -DNOMINMAX include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/breakpad-windows-standalone/moz.build b/toolkit/crashreporter/breakpad-windows-standalone/moz.build index 895d11993cf..f240277297e 100644 --- a/toolkit/crashreporter/breakpad-windows-standalone/moz.build +++ b/toolkit/crashreporter/breakpad-windows-standalone/moz.build @@ -4,3 +4,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + '$(objs_common)', + '$(objs_crash_generation)', + '$(objs_handler)', +] + diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index 4ae5ad28f5c..d14ea9bdf42 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -27,12 +27,7 @@ LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src VPATH += $(topsrcdir)/build/ -CPPSRCS = \ - crashreporter.cpp \ - $(NULL) - ifeq ($(OS_ARCH),WINNT) -CPPSRCS += crashreporter_win.cpp LIBS += \ $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX) $(NULL) @@ -44,7 +39,6 @@ MOZ_WINCONSOLE = 0 endif ifeq ($(OS_ARCH),Darwin) -CPPSRCS += crashreporter_unix_common.cpp CMMSRCS += crashreporter_osx.mm OS_LIBS += -framework Cocoa LIBS += \ @@ -56,20 +50,14 @@ LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../google-breakpad/src/common/mac/ endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -CPPSRCS += crashreporter_gtk_common.cpp crashreporter_unix_common.cpp ifdef MOZ_PLATFORM_MAEMO -CPPSRCS += crashreporter_maemo_gtk.cpp - # Maemo's libcurl doesn't ship with a set of CA certificates, # so we have to ship our own. libs:: $(DIST)/bin/crashreporter.crt $(DIST)/bin/crashreporter.crt: $(topsrcdir)/security/nss/lib/ckfw/builtins/certdata.txt certdata2pem.py $(PYTHON) $(srcdir)/certdata2pem.py < $< > $@ - -else -CPPSRCS += crashreporter_linux.cpp endif LIBS += \ @@ -81,7 +69,6 @@ OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS) endif ifeq ($(OS_ARCH),SunOS) -CPPSRCS += crashreporter_linux.cpp crashreporter_unix.cpp LIBS += \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build index 1726547bbf0..bf8c1847fc4 100644 --- a/toolkit/crashreporter/client/moz.build +++ b/toolkit/crashreporter/client/moz.build @@ -11,3 +11,35 @@ if CONFIG['OS_TARGET'] != 'Android': # The xpcshell test case here verifies that the CA certificate list if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2' and CONFIG['MOZ_PLATFORM_MAEMO']: XPCSHELL_TESTS_MANIFESTS += ['maemo-unit/xpcshell.ini'] + +CPP_SOURCES += [ + 'crashreporter.cpp', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'crashreporter_win.cpp', + ] +elif CONFIG['OS_ARCH'] == 'Darwin': + CPP_SOURCES += [ + 'crashreporter_unix_common.cpp', + ] +elif CONFIG['OS_ARCH'] == 'SunOS': + CPP_SOURCES += [ + 'crashreporter_linux.cpp', + 'crashreporter_unix.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'crashreporter_gtk_common.cpp', + 'crashreporter_unix_common.cpp', + ] + if CONFIG['MOZ_PLATFORM_MAEMO']: + CPP_SOURCES += [ + 'crashreporter_maemo_gtk.cpp', + ] + else: + CPP_SOURCES += [ + 'crashreporter_linux.cpp', + ] diff --git a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in index 228b101112d..9012fccee0c 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/Makefile.in @@ -14,10 +14,6 @@ XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/.. -CPPSRCS = \ - minidump_file_writer.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in index 3a2029316e2..3aabafec0cd 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in @@ -15,11 +15,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \ $(NULL) -CPPSRCS = \ - crash_generation_client.cc \ - crash_generation_server.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build index 5a7e33e10e9..4dbcc55f18d 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build @@ -6,3 +6,8 @@ MODULE = 'crash_generation' +CPP_SOURCES += [ + 'crash_generation_client.cc', + 'crash_generation_server.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in index 867916c26f9..12effdd85b2 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in @@ -32,12 +32,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \ $(NULL) -CPPSRCS = \ - exception_handler.cc \ - log.cc \ - minidump_descriptor.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build index ee77be6202b..ccebf5f924d 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build @@ -6,3 +6,9 @@ MODULE = 'handler' +CPP_SOURCES += [ + 'exception_handler.cc', + 'log.cc', + 'minidump_descriptor.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in index 51bb547a7e7..02dd53018c3 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in @@ -16,12 +16,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \ $(NULL) -CPPSRCS = \ - linux_dumper.cc \ - linux_ptrace_dumper.cc \ - minidump_writer.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build index 656322b4f66..3533b45dbcd 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build @@ -6,3 +6,9 @@ MODULE = 'writer' +CPP_SOURCES += [ + 'linux_dumper.cc', + 'linux_ptrace_dumper.cc', + 'minidump_writer.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in index 83a97004de4..54d938c20e9 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in @@ -14,11 +14,6 @@ XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/../../.. -CPPSRCS = \ - crash_generation_client.cc \ - crash_generation_server.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build index 5a7e33e10e9..4dbcc55f18d 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build @@ -6,3 +6,8 @@ MODULE = 'crash_generation' +CPP_SOURCES += [ + 'crash_generation_client.cc', + 'crash_generation_server.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in index 53536621579..690c98ccb40 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in @@ -14,13 +14,6 @@ XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/../../.. -CPPSRCS = \ - breakpad_nlist_64.cc \ - dynamic_images.cc \ - exception_handler.cc \ - minidump_generator.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build index ee77be6202b..3b6dcb66ee6 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build @@ -6,3 +6,10 @@ MODULE = 'handler' +CPP_SOURCES += [ + 'breakpad_nlist_64.cc', + 'dynamic_images.cc', + 'exception_handler.cc', + 'minidump_generator.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/client/moz.build b/toolkit/crashreporter/google-breakpad/src/client/moz.build index ebe032a156f..da8726c2306 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/moz.build @@ -6,3 +6,7 @@ MODULE = 'minidump_file_writer' +CPP_SOURCES += [ + 'minidump_file_writer.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in index 7b7e6b3585f..690c98ccb40 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in @@ -14,12 +14,6 @@ XPI_NAME = crashreporter LOCAL_INCLUDES = -I$(srcdir)/../../.. -CPPSRCS = \ - exception_handler.cc \ - minidump_generator.cc \ - solaris_lwp.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build index ee77be6202b..79354040b34 100644 --- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build @@ -6,3 +6,9 @@ MODULE = 'handler' +CPP_SOURCES += [ + 'exception_handler.cc', + 'minidump_generator.cc', + 'solaris_lwp.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index adb9030c31a..554b64ae0f4 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -19,25 +19,7 @@ endif LOCAL_INCLUDES = -I$(srcdir)/.. -CPPSRCS = \ - string_conversion.cc \ - module.cc \ - unique_string.cc \ - pathname_stripper.cc \ - logging.cc \ - $(NULL) - ifneq (WINNT,$(OS_TARGET)) -CPPSRCS += \ - md5.cc \ - dwarf/bytereader.cc \ - dwarf_cfi_to_module.cc \ - dwarf/dwarf2reader.cc \ - dwarf_cu_to_module.cc \ - language.cc \ - dwarf/dwarf2diehandler.cc \ - dwarf_line_to_module.cc \ - $(NULL) ifdef MOZ_CRASHREPORTER HOST_CPPSRCS = \ string_conversion.cc \ @@ -56,12 +38,6 @@ HOST_CPPSRCS = \ endif endif -ifeq ($(OS_ARCH),Linux) -CPPSRCS += \ - linux/dump_symbols.cc \ - linux/elf_symbols_to_module.cc -endif - ifeq ($(OS_ARCH),Darwin) CMMSRCS += \ mac/dump_syms.mm @@ -76,13 +52,6 @@ VPATH += $(srcdir)/android SSRCS := breakpad_getcontext.S TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/ DEFINES += -DNO_STABS_SUPPORT -else -ifneq (WINNT,$(OS_TARGET)) -CPPSRCS += \ - stabs_to_module.cc \ - stabs_reader.cc \ - $(NULL) -endif endif ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in index 60f5a597ca4..aac0fd4de3b 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in @@ -18,17 +18,7 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \ $(NULL) -CPPSRCS = \ - elfutils.cc \ - file_id.cc \ - guid_creator.cc \ - linux_libc_support.cc \ - memory_mapped_file.cc \ - safe_readlink.cc \ - $(NULL) - ifneq (Android,$(OS_TARGET)) -CPPSRCS += http_upload.cc else TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/ endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build index f45f7e1c750..7c1b2113271 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build @@ -6,3 +6,16 @@ MODULE = 'breakpad_linux_common' +CPP_SOURCES += [ + 'elfutils.cc', + 'file_id.cc', + 'guid_creator.cc', + 'linux_libc_support.cc', + 'memory_mapped_file.cc', + 'safe_readlink.cc', +] + +if CONFIG['OS_TARGET'] != 'Android': + CPP_SOURCES += [ + 'http_upload.cc', + ] diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in index 2febc943366..36ca91d4722 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in @@ -17,17 +17,6 @@ LOCAL_INCLUDES = -I$(srcdir)/../.. # This is a little weird, but we're building a host and a target lib here. # The host lib is used for dump_syms, and the target lib for the # crash reporter client. Therefore, we don't need all the srcs in both. -CPPSRCS = \ - arch_utilities.cc \ - bootstrap_compat.cc \ - file_id.cc \ - macho_id.cc \ - macho_reader.cc \ - macho_utilities.cc \ - macho_walker.cc \ - string_utilities.cc \ - $(NULL) - CMSRCS = \ HTTPMultipartUpload.m \ $(NULL) diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build index f670fc2d6dc..8b228eec60b 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build @@ -6,3 +6,14 @@ MODULE = 'breakpad_mac_common' +CPP_SOURCES += [ + 'arch_utilities.cc', + 'bootstrap_compat.cc', + 'file_id.cc', + 'macho_id.cc', + 'macho_reader.cc', + 'macho_utilities.cc', + 'macho_walker.cc', + 'string_utilities.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build index 23d05ba0671..dbd624df399 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -12,3 +12,38 @@ MODULE = 'breakpad_common' CSRCS += [ 'convert_UTF.c', ] + +CPP_SOURCES += [ + 'logging.cc', + 'module.cc', + 'pathname_stripper.cc', + 'string_conversion.cc', + 'unique_string.cc', +] + +if CONFIG['OS_TARGET'] != 'WINNT': + CPP_SOURCES += [ + 'md5.cc', + 'dwarf/bytereader.cc', + 'dwarf_cfi_to_module.cc', + 'dwarf/dwarf2reader.cc', + 'dwarf_cu_to_module.cc', + 'language.cc', + 'dwarf/dwarf2diehandler.cc', + 'dwarf_line_to_module.cc', + ] + +if CONFIG['OS_ARCH'] == 'Linux': + CPP_SOURCES += [ + 'linux/dump_symbols.cc', + 'linux/elf_symbols_to_module.cc', + ] + +if CONFIG['OS_TARGET'] == 'Android': + pass +else: + if CONFIG['OS_TARGET'] != 'WINNT': + CPP_SOURCES += [ + 'stabs_to_module.cc', + 'stabs_reader.cc', + ] diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in index 66ca02767f5..1d8d73c0d2e 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in @@ -16,12 +16,6 @@ LOCAL_INCLUDES = -I$(srcdir)/../.. # not compiling http_upload.cc currently # since it depends on libcurl -CPPSRCS = \ - dump_symbols.cc \ - file_id.cc \ - guid_creator.cc \ - $(NULL) - HOST_CPPSRCS = \ dump_symbols.cc \ file_id.cc \ diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build index b1931e5b566..6716c72dc9c 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build @@ -6,3 +6,9 @@ MODULE = 'breakpad_solaris_common' +CPP_SOURCES += [ + 'dump_symbols.cc', + 'file_id.cc', + 'guid_creator.cc', +] + diff --git a/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in b/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in index 2bab577d0aa..b540b498c28 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/processor/Makefile.in @@ -13,23 +13,6 @@ LIBRARY_NAME = breakpad_sps_common_s LOCAL_INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -CPPSRCS = \ - stackwalker.cc \ - stackwalker_amd64.cc \ - stackwalker_arm.cc \ - stackwalker_ppc.cc \ - stackwalker_x86.cc \ - stackwalker_sparc.cc \ - minidump.cc \ - basic_source_line_resolver.cc \ - basic_code_modules.cc \ - cfi_frame_info.cc \ - call_stack.cc \ - tokenize.cc \ - source_line_resolver_base.cc \ - stack_frame_symbolizer.cc \ - $(NULL) - # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/crashreporter/google-breakpad/src/processor/moz.build b/toolkit/crashreporter/google-breakpad/src/processor/moz.build index 1915ae51218..349491631d8 100644 --- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build @@ -6,3 +6,20 @@ MODULE = 'breakpad_sps_common' +CPP_SOURCES += [ + 'basic_code_modules.cc', + 'basic_source_line_resolver.cc', + 'call_stack.cc', + 'cfi_frame_info.cc', + 'minidump.cc', + 'source_line_resolver_base.cc', + 'stack_frame_symbolizer.cc', + 'stackwalker.cc', + 'stackwalker_amd64.cc', + 'stackwalker_arm.cc', + 'stackwalker_ppc.cc', + 'stackwalker_sparc.cc', + 'stackwalker_x86.cc', + 'tokenize.cc', +] + diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in index 180fc28139e..5eaedd2b537 100644 --- a/toolkit/crashreporter/injector/Makefile.in +++ b/toolkit/crashreporter/injector/Makefile.in @@ -15,8 +15,6 @@ USE_STATIC_LIBS = 1 STL_FLAGS = MOZ_GLUE_LDFLAGS = -CPPSRCS = injector.cpp - SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX) include $(topsrcdir)/config/config.mk diff --git a/toolkit/crashreporter/injector/moz.build b/toolkit/crashreporter/injector/moz.build index 895d11993cf..371a3734d58 100644 --- a/toolkit/crashreporter/injector/moz.build +++ b/toolkit/crashreporter/injector/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'injector.cpp', +] + diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index d276c400bfb..a712a39c3a3 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -50,6 +50,10 @@ DIRS += ['client'] if CONFIG['MOZ_CRASHREPORTER_INJECTOR']: DIRS += ['injector'] + CPP_SOURCES += [ + 'LoadLibraryRemote.cpp', + 'InjectCrashReporter.cpp', + ] TEST_TOOL_DIRS += ['test'] @@ -59,3 +63,7 @@ EXPORTS += [ 'nsExceptionHandler.h', ] +CPP_SOURCES += [ + 'nsExceptionHandler.cpp', +] + diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in index b1626652bcc..3cd62fc0cf6 100644 --- a/toolkit/crashreporter/test/Makefile.in +++ b/toolkit/crashreporter/test/Makefile.in @@ -22,15 +22,6 @@ VPATH += \ $(topsrcdir)/build/ \ $(NULL) -CPPSRCS = \ - nsTestCrasher.cpp \ - dumputils.cpp \ - basic_code_modules.cc \ - logging.cc \ - minidump.cc \ - pathname_stripper.cc \ - $(NULL) - LOCAL_INCLUDES += \ -I$(XPIDL_GEN_DIR) \ -I$(srcdir)/../google-breakpad/src/ \ diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build index 602ae76328e..dccf0e224c9 100644 --- a/toolkit/crashreporter/test/moz.build +++ b/toolkit/crashreporter/test/moz.build @@ -7,3 +7,12 @@ MODULE = 'crashreporter_test' XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini'] + +CPP_SOURCES += [ + 'basic_code_modules.cc', + 'dumputils.cpp', + 'logging.cc', + 'minidump.cc', + 'nsTestCrasher.cpp', + 'pathname_stripper.cc', +] diff --git a/toolkit/devtools/server/Makefile.in b/toolkit/devtools/server/Makefile.in index 2060ae48b07..63baba41234 100644 --- a/toolkit/devtools/server/Makefile.in +++ b/toolkit/devtools/server/Makefile.in @@ -16,10 +16,6 @@ LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = \ - nsJSInspector.cpp \ - $(NULL) - EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ diff --git a/toolkit/devtools/server/moz.build b/toolkit/devtools/server/moz.build index 54d24b18dac..fb1658331b8 100644 --- a/toolkit/devtools/server/moz.build +++ b/toolkit/devtools/server/moz.build @@ -12,3 +12,7 @@ XPIDL_SOURCES += [ MODULE = 'jsinspector' +CPP_SOURCES += [ + 'nsJSInspector.cpp', +] + diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in index 96aed54bf27..a0704392e5f 100644 --- a/toolkit/identity/Makefile.in +++ b/toolkit/identity/Makefile.in @@ -18,10 +18,6 @@ LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 EXPORT_LIBRARY = 1 -CPPSRCS = \ - IdentityCryptoService.cpp \ - $(NULL) - EXTRA_JS_MODULES = \ IdentityUtils.jsm \ Identity.jsm \ diff --git a/toolkit/identity/moz.build b/toolkit/identity/moz.build index 5c3dac22daa..9ede7bb515e 100644 --- a/toolkit/identity/moz.build +++ b/toolkit/identity/moz.build @@ -12,3 +12,7 @@ XPIDL_SOURCES += [ MODULE = 'identity' +CPP_SOURCES += [ + 'IdentityCryptoService.cpp', +] + diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 517bc369025..faf5478f44c 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -29,14 +29,6 @@ endif VPATH += $(topsrcdir)/build/ -ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) -CPPSRCS += dlldeps-xul.cpp -endif - -ifeq ($(OS_ARCH),OS2) -CPPSRCS += dlldeps-xul.cpp -endif - SHARED_LIBRARY_LIBS += \ $(DEPTH)/media/kiss_fft/$(LIB_PREFIX)kiss_fft.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/components/osfile/$(LIB_PREFIX)osfile_s.$(LIB_SUFFIX) \ @@ -74,41 +66,14 @@ SHARED_LIBRARY_LIBS += \ $(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \ $(NULL) -CPPSRCS += \ - nsStaticXULComponents.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += \ - nsDllMain.cpp \ - $(NULL) -endif - ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) -CPPSRCS += \ - nsGFXDeps.cpp \ - $(NULL) - RCINCLUDE = xulrunner.rc -ifndef MOZ_NATIVE_ZLIB -CPPSRCS += dlldeps-zlib.cpp -endif - LOCAL_INCLUDES += -I$(topsrcdir)/widget/windows LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base endif ifeq ($(OS_ARCH),OS2) - -CPPSRCS += \ - nsGFXDeps.cpp \ - $(NULL) - -ifndef MOZ_NATIVE_ZLIB -CPPSRCS += dlldeps-zlib.cpp -endif - RESFILE = xulrunos2.res RCFLAGS += -i $(topsrcdir)/widget/os2 @@ -503,11 +468,6 @@ EXTRA_DEPS += \ $(topsrcdir)/rdf/util/src/objs.mk \ $(NULL) -CPPSRCS += \ - $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \ - $(RDF_UTIL_SRC_LCPPSRCS) \ - $(NULL) - GARBAGE += \ $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \ $(RDF_UTIL_SRC_LCPPSRCS) \ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 093fc1e1027..89a33fc5521 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -9,3 +9,32 @@ if CONFIG['MOZ_METRO'] and CONFIG['OS_ARCH'] == 'WINNT': MODULE = 'libxul' +CPP_SOURCES += [ + '$(INTL_UNICHARUTIL_UTIL_LCPPSRCS)', + '$(RDF_UTIL_SRC_LCPPSRCS)', + 'nsStaticXULComponents.cpp', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsDllMain.cpp', + ] + if not CONFIG['GNU_CC']: + CPP_SOURCES += [ + 'dlldeps-xul.cpp', + 'nsGFXDeps.cpp', + ] + if not CONFIG['MOZ_NATIVE_ZLIB']: + CPP_SOURCES += [ + 'dlldeps-zlib.cpp', + ] + +if CONFIG['OS_ARCH'] == 'OS2': + CPP_SOURCES += [ + 'dlldeps-xul.cpp', + 'nsGFXDeps.cpp', + ] + if not CONFIG['MOZ_NATIVE_ZLIB']: + CPP_SOURCES += [ + 'dlldeps-zlib.cpp', + ] diff --git a/toolkit/library/winvccorlib/Makefile.in b/toolkit/library/winvccorlib/Makefile.in index 533ed1d8ccf..f948ad58245 100644 --- a/toolkit/library/winvccorlib/Makefile.in +++ b/toolkit/library/winvccorlib/Makefile.in @@ -13,9 +13,5 @@ include $(DEPTH)/config/autoconf.mk FORCE_SHARED_LIB=1 -CPPSRCS = \ - dummyvccorlib.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/library/winvccorlib/moz.build b/toolkit/library/winvccorlib/moz.build index 72fc623e62e..072297e5038 100644 --- a/toolkit/library/winvccorlib/moz.build +++ b/toolkit/library/winvccorlib/moz.build @@ -6,3 +6,7 @@ MODULE = 'dummyvccorlib' +CPP_SOURCES += [ + 'dummyvccorlib.cpp', +] + diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in index 7b897192e3d..d282215bc38 100644 --- a/toolkit/mozapps/plugins/tests/Makefile.in +++ b/toolkit/mozapps/plugins/tests/Makefile.in @@ -21,11 +21,6 @@ _BROWSER_FILES = \ BadExtension.xpi \ $(NULL) -CPPSRCS = \ - GoodPlugin.cpp \ - BadPlugin.cpp \ - $(NULL) - SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) PROGRAMS = $(SIMPLE_PROGRAMS:%$(BIN_SUFFIX)=$(TESTROOT)/%) diff --git a/toolkit/mozapps/plugins/tests/moz.build b/toolkit/mozapps/plugins/tests/moz.build index 2c06751621b..b0086432824 100644 --- a/toolkit/mozapps/plugins/tests/moz.build +++ b/toolkit/mozapps/plugins/tests/moz.build @@ -6,3 +6,8 @@ MODULE = 'test_plugins' +CPP_SOURCES += [ + 'BadPlugin.cpp', + 'GoodPlugin.cpp', +] + diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in index b5ab3ddd504..34a3b9d73eb 100644 --- a/toolkit/mozapps/update/common/Makefile.in +++ b/toolkit/mozapps/update/common/Makefile.in @@ -16,17 +16,5 @@ ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 endif -CPPSRCS = \ - updatelogging.cpp \ - readstrings.cpp \ - $(NULL) - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += updatehelper.cpp \ - uachelper.cpp \ - pathhash.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index ea12c167a12..94ea9dc2193 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -19,3 +19,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'updatehelper.cpp', 'updatehelper.h', ] + CPP_SOURCES += [ + 'updatehelper.cpp', + 'uachelper.cpp', + 'pathhash.cpp', + ] + +CPP_SOURCES += [ + 'readstrings.cpp', + 'updatelogging.cpp', +] + diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in index 00091d7350a..b01aac72a21 100644 --- a/toolkit/mozapps/update/test/Makefile.in +++ b/toolkit/mozapps/update/test/Makefile.in @@ -26,12 +26,14 @@ DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE) endif ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS = \ +# TODO: Remove when SIMPLE_PROGRAMS is in moz.build +cppsrcs = \ TestAUSReadStrings.cpp \ TestAUSHelper.cpp \ $(NULL) -SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) +# TODO: Base off of CPP_SOURCES in moz.build +SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX)) INI_TEST_FILES = \ TestAUSReadStrings1.ini \ diff --git a/toolkit/mozapps/update/test/moz.build b/toolkit/mozapps/update/test/moz.build index 7e89689f3b2..991aa438a3b 100644 --- a/toolkit/mozapps/update/test/moz.build +++ b/toolkit/mozapps/update/test/moz.build @@ -6,5 +6,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': DIRS += ['chrome'] + CPP_SOURCES += [ + 'TestAUSReadStrings.cpp', + 'TestAUSHelper.cpp', + ] XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index e6d38c413ff..7c9b766340d 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -10,18 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - updater.cpp \ - bspatch.cpp \ - archivereader.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += \ - loaddlls.cpp \ - $(NULL) -endif - # Don't link the updater against libmozglue. See bug 687139 MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = @@ -39,12 +27,7 @@ LIBS += \ ifeq ($(OS_ARCH),WINNT) LIBS += $(DEPTH)/modules/libmar/verify/$(LIB_PREFIX)verifymar.$(LIB_SUFFIX) USE_STATIC_LIBS = 1 -HAVE_PROGRESSUI = 1 RCINCLUDE = updater.rc -CPPSRCS += \ - progressui_win.cpp \ - win_dirent.cpp \ - $(NULL) OS_LIBS += $(call EXPAND_LIBNAME,delayimp comctl32 ws2_32 shell32 shlwapi) DEFINES += -DUNICODE -D_UNICODE ifndef GNU_CC @@ -56,33 +39,22 @@ endif endif ifneq ($(MOZ_ENABLE_GTK2),) -HAVE_PROGRESSUI = 1 -CPPSRCS += \ - progressui_gtk.cpp \ - $(NULL) OS_CXXFLAGS += $(TK_CFLAGS) OS_LIBS += $(TK_LIBS) endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -HAVE_PROGRESSUI = 1 CMMSRCS += progressui_osx.mm launchchild_osx.mm OS_LIBS += -framework Cocoa endif ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{ -HAVE_PROGRESSUI = 1 STL_FLAGS = -CPPSRCS += progressui_gonk.cpp automounter_gonk.cpp OS_LIBS += -lcutils -lsysutils # clear out all the --wrap flags and remove dependency on mozglue for Gonk WRAP_LDFLAGS := endif #} -ifndef HAVE_PROGRESSUI -CPPSRCS += progressui_null.cpp -endif - ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG MOZ_WINCONSOLE = 1 diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index 43f8edcc08a..52e97e41494 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -6,3 +6,37 @@ PROGRAM = 'updater' +CPP_SOURCES += [ + 'archivereader.cpp', + 'bspatch.cpp', + 'updater.cpp', +] + +have_progressui = 0 +if CONFIG['OS_ARCH'] == 'WINNT': + have_progressui = 1 + CPP_SOURCES += [ + 'loaddlls.cpp', + 'progressui_win.cpp', + 'win_dirent.cpp', + ] + +if CONFIG['MOZ_ENABLE_GTK2']: + have_progressui = 1 + CPP_SOURCES += [ + 'progressui_gtk.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + have_progressui = 1 +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + have_progressui = 1 + CPP_SOURCES += [ + 'progressui_gonk.cpp', + 'automounter_gonk.cpp', + ] + +if have_progressui == 0: + CPP_SOURCES += [ + 'progressui_null.cpp', + ] diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index a5d99115e0e..cb07f8f57a1 100644 --- a/toolkit/profile/Makefile.in +++ b/toolkit/profile/Makefile.in @@ -14,11 +14,6 @@ LIBRARY_NAME = profile_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsProfileLock.cpp \ - nsToolkitProfileService.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../xre \ -I$(topsrcdir)/profile/dirserviceprovider/src \ diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build index 65fdee9126c..f0b30ad1991 100644 --- a/toolkit/profile/moz.build +++ b/toolkit/profile/moz.build @@ -16,3 +16,8 @@ XPIDL_MODULE = 'toolkitprofile' MODULE = 'xulapp' +CPP_SOURCES += [ + 'nsProfileLock.cpp', + 'nsToolkitProfileService.cpp', +] + diff --git a/toolkit/system/androidproxy/Makefile.in b/toolkit/system/androidproxy/Makefile.in index 1760de9dba5..3e61a11c364 100644 --- a/toolkit/system/androidproxy/Makefile.in +++ b/toolkit/system/androidproxy/Makefile.in @@ -17,8 +17,4 @@ MODULE_NAME = nsAndroidProxyModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsAndroidSystemProxySettings.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/androidproxy/moz.build b/toolkit/system/androidproxy/moz.build index 7a774ef493b..b6d5f6c8dc3 100644 --- a/toolkit/system/androidproxy/moz.build +++ b/toolkit/system/androidproxy/moz.build @@ -6,3 +6,7 @@ MODULE = 'androidproxy' +CPP_SOURCES += [ + 'nsAndroidSystemProxySettings.cpp', +] + diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in index 3b0890844b1..ddcf649ba22 100644 --- a/toolkit/system/dbus/Makefile.in +++ b/toolkit/system/dbus/Makefile.in @@ -21,12 +21,6 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_DBUS_GLIB_LIBS) \ $(NULL) -CPPSRCS = \ - nsDBusModule.cpp \ - nsDBusService.cpp \ - nsNetworkManagerListener.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) diff --git a/toolkit/system/dbus/moz.build b/toolkit/system/dbus/moz.build index df8503d41f5..9ed80eaf6d6 100644 --- a/toolkit/system/dbus/moz.build +++ b/toolkit/system/dbus/moz.build @@ -6,3 +6,9 @@ MODULE = 'dbus' +CPP_SOURCES += [ + 'nsDBusModule.cpp', + 'nsDBusService.cpp', + 'nsNetworkManagerListener.cpp', +] + diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in index 58577550a0c..d30c4426c85 100644 --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -14,30 +14,6 @@ FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 FAIL_ON_WARNINGS = 1 - -CPPSRCS = \ - nsGnomeModule.cpp \ - $(NULL) - -ifdef MOZ_ENABLE_GCONF -CPPSRCS += \ - nsGConfService.cpp \ - $(NULL) -endif - -ifdef MOZ_ENABLE_GNOMEVFS -CPPSRCS += \ - nsGnomeVFSService.cpp \ - $(NULL) -endif - -ifdef MOZ_ENABLE_GIO -CPPSRCS += \ - nsGIOService.cpp \ - nsGSettingsService.cpp \ - $(NULL) -endif - EXTRA_DSO_LDOPTS += \ $(XPCOM_GLUE_LDOPTS) \ $(XPCOM_FROZEN_LDOPTS) \ diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build index be5440f9755..891d78ee771 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -6,3 +6,22 @@ MODULE = 'mozgnome' +CPP_SOURCES += [ + 'nsGnomeModule.cpp', +] + +if CONFIG['MOZ_ENABLE_GCONF']: + CPP_SOURCES += [ + 'nsGConfService.cpp', + ] + +if CONFIG['MOZ_ENABLE_GNOMEVFS']: + CPP_SOURCES += [ + 'nsGnomeVFSService.cpp', + ] + +if CONFIG['MOZ_ENABLE_GIO']: + CPP_SOURCES += [ + 'nsGIOService.cpp', + 'nsGSettingsService.cpp', + ] diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in index 114466d916c..40a50ed5c2b 100644 --- a/toolkit/system/unixproxy/Makefile.in +++ b/toolkit/system/unixproxy/Makefile.in @@ -17,19 +17,7 @@ MODULE_NAME = nsUnixProxyModule LIBXUL_LIBRARY = 1 ifdef MOZ_ENABLE_LIBPROXY - -CPPSRCS = \ - nsLibProxySettings.cpp \ - $(NULL) - CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS) - -else # MOZ_ENABLE_LIBPROXY - -CPPSRCS = \ - nsUnixSystemProxySettings.cpp \ - $(NULL) - endif # MOZ_ENABLE_LIBPROXY include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/unixproxy/moz.build b/toolkit/system/unixproxy/moz.build index e1c1887f8e2..12649d16261 100644 --- a/toolkit/system/unixproxy/moz.build +++ b/toolkit/system/unixproxy/moz.build @@ -6,3 +6,11 @@ MODULE = 'unixproxy' +if CONFIG['MOZ_ENABLE_LIBPROXY']: + CPP_SOURCES += [ + 'nsLibProxySettings.cpp', + ] +else: + CPP_SOURCES += [ + 'nsUnixSystemProxySettings.cpp', + ] diff --git a/toolkit/system/windowsproxy/Makefile.in b/toolkit/system/windowsproxy/Makefile.in index 7b2a57a8ec5..64eca1e4abf 100644 --- a/toolkit/system/windowsproxy/Makefile.in +++ b/toolkit/system/windowsproxy/Makefile.in @@ -17,8 +17,4 @@ MODULE_NAME = nsWindowsProxyModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsWindowsSystemProxySettings.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/windowsproxy/moz.build b/toolkit/system/windowsproxy/moz.build index d471e3d452e..18cdbd56d85 100644 --- a/toolkit/system/windowsproxy/moz.build +++ b/toolkit/system/windowsproxy/moz.build @@ -6,3 +6,7 @@ MODULE = 'windowsproxy' +CPP_SOURCES += [ + 'nsWindowsSystemProxySettings.cpp', +] + diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 4d803c96bfc..42f06974ad4 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -23,24 +23,8 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -CPPSRCS = \ - nsAppRunner.cpp \ - nsConsoleWriter.cpp \ - nsXREDirProvider.cpp \ - nsNativeAppSupportBase.cpp \ - CreateAppData.cpp \ - nsSigHandlers.cpp \ - nsEmbedFunctions.cpp \ - ProfileReset.cpp \ - $(NULL) - ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX) DEFINES += -DUSE_GLX_TEST -CPPSRCS += glxtest.cpp -endif - -ifdef MOZ_INSTRUMENT_EVENT_LOOP -CPPSRCS += EventTracer.cpp endif DEFINES += -DIMPL_XREAPI \ @@ -49,35 +33,15 @@ DEFINES += -DIMPL_XREAPI \ ifdef MOZ_UPDATER ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += nsUpdateDriver.cpp DEFINES += -DMOZ_UPDATER endif endif ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += nsNativeAppSupportWin.cpp -CPPSRCS += nsWindowsDllBlocklist.cpp DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm -else -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) -CPPSRCS += nsNativeAppSupportOS2.cpp -else -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -CPPSRCS += nsNativeAppSupportUnix.cpp -else -ifeq ($(MOZ_WIDGET_TOOLKIT),qt) -MOCSRCS += moc_nsNativeAppSupportQt.cpp -CPPSRCS += $(MOCSRCS) -CPPSRCS += nsNativeAppSupportQt.cpp -CPPSRCS += nsQAppInstance.cpp -else -CPPSRCS += nsNativeAppSupportDefault.cpp -endif -endif -endif endif endif @@ -85,16 +49,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS += MacLaunchHelper.mm CMMSRCS += MacApplicationDelegate.mm CMMSRCS += MacAutoreleasePool.mm -CPPSRCS += nsCommandLineServiceMac.cpp ENABLE_CXX_EXCEPTIONS = 1 endif -ifdef MOZ_X11 -CPPSRCS += nsX11ErrorHandler.cpp -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),android) -CPPSRCS += nsAndroidStartup.cpp DEFINES += -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"' endif diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index 186976816e9..9d0abb34df8 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -22,7 +22,68 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']: if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += ['nsWindowsDllInterceptor.h'] + CPP_SOURCES += [ + 'nsNativeAppSupportWin.cpp', + 'nsWindowsDllBlocklist.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': EXPORTS += ['MacQuirks.h'] + CPP_SOURCES += [ + 'nsCommandLineServiceMac.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': EXPORTS += ['nsQAppInstance.h'] + CPP_SOURCES += [ + 'moc_nsNativeAppSupportQt.cpp', + 'nsNativeAppSupportQt.cpp', + 'nsQAppInstance.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': + CPP_SOURCES += [ + 'nsNativeAppSupportOS2.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'nsNativeAppSupportUnix.cpp', + ] +else: + CPP_SOURCES += [ + 'nsNativeAppSupportDefault.cpp', + ] + +if CONFIG['MOZ_X11']: + CPP_SOURCES += [ + 'nsX11ErrorHandler.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + CPP_SOURCES += [ + 'nsAndroidStartup.cpp', + ] + +CPP_SOURCES += [ + 'CreateAppData.cpp', + 'ProfileReset.cpp', + 'nsAppRunner.cpp', + 'nsConsoleWriter.cpp', + 'nsEmbedFunctions.cpp', + 'nsNativeAppSupportBase.cpp', + 'nsSigHandlers.cpp', + 'nsXREDirProvider.cpp', +] + +if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX': + CPP_SOURCES += [ + 'glxtest.cpp', + ] + +if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']: + CPP_SOURCES += [ + 'EventTracer.cpp', + ] + +if CONFIG['MOZ_UPDATER']: + if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': + CPP_SOURCES += [ + 'nsUpdateDriver.cpp', + ] diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in index e1b0e8ef02f..1d50be066c7 100644 --- a/toolkit/xre/test/win/Makefile.in +++ b/toolkit/xre/test/win/Makefile.in @@ -9,11 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - TestXREMakeCommandLineWin.cpp \ - TestDllInterceptor.cpp \ - $(NULL) - OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32) SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) diff --git a/toolkit/xre/test/win/moz.build b/toolkit/xre/test/win/moz.build index 5700b99833e..00bf28a2598 100644 --- a/toolkit/xre/test/win/moz.build +++ b/toolkit/xre/test/win/moz.build @@ -6,3 +6,8 @@ MODULE = 'test_xulapp' +CPP_SOURCES += [ + 'TestDllInterceptor.cpp', + 'TestXREMakeCommandLineWin.cpp', +] + diff --git a/tools/jprof/Makefile.in b/tools/jprof/Makefile.in index f77cd053155..ea6cb8e2e68 100644 --- a/tools/jprof/Makefile.in +++ b/tools/jprof/Makefile.in @@ -11,15 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - bfd.cpp \ - coff.cpp \ - elf.cpp \ - leaky.cpp \ - strset.cpp \ - intcnt.cpp \ - $(NULL) - OS_LIBS = \ -ldl \ -lbfd \ diff --git a/tools/jprof/moz.build b/tools/jprof/moz.build index 010aca0bb4c..cb9ad5d1b26 100644 --- a/tools/jprof/moz.build +++ b/tools/jprof/moz.build @@ -8,3 +8,11 @@ DIRS += ['stub'] PROGRAM = 'jprof' +CPP_SOURCES += [ + 'bfd.cpp', + 'coff.cpp', + 'elf.cpp', + 'intcnt.cpp', + 'leaky.cpp', + 'strset.cpp', +] diff --git a/tools/jprof/stub/Makefile.in b/tools/jprof/stub/Makefile.in index 8ea5bded36e..ea847a4fe79 100644 --- a/tools/jprof/stub/Makefile.in +++ b/tools/jprof/stub/Makefile.in @@ -18,10 +18,6 @@ FORCE_SHARED_LIB = 1 # override optimization MOZ_OPTIMIZE_FLAGS = -fno-omit-frame-pointer -CPPSRCS = \ - libmalloc.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_JPROF_API diff --git a/tools/jprof/stub/moz.build b/tools/jprof/stub/moz.build index c7ea5a7dcff..9a1bff78790 100644 --- a/tools/jprof/stub/moz.build +++ b/tools/jprof/stub/moz.build @@ -10,3 +10,7 @@ EXPORTS += [ 'jprof.h', ] +CPP_SOURCES += [ + 'libmalloc.cpp', +] + diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in index 6b4bbde8f13..7bb6ba9d032 100644 --- a/tools/profiler/Makefile.in +++ b/tools/profiler/Makefile.in @@ -35,47 +35,15 @@ endif # !_MSC_VER # Uncomment for better debugging in opt builds #MOZ_OPTIMIZE_FLAGS += -O0 -g -CPPSRCS = \ - platform.cpp \ - nsProfilerFactory.cpp \ - nsProfiler.cpp \ - TableTicker.cpp \ - SaveProfileTask.cpp \ - BreakpadSampler.cpp \ - UnwinderThread2.cpp \ - ProfileEntry.cpp \ - local_debug_info_symbolizer.cc \ - JSObjectBuilder.cpp \ - JSCustomObjectBuilder.cpp \ - $(NULL) - EXTRA_JS_MODULES = \ Profiler.jsm \ $(NULL) -ifneq (,$(filter Android Linux,$(OS_TARGET))) -CPPSRCS += \ - shared-libraries-linux.cc \ - platform-linux.cc \ - $(NULL) -endif - ifeq ($(OS_TARGET),Darwin) -CPPSRCS += \ - shared-libraries-macos.cc \ - platform-macos.cc \ - $(NULL) CMMSRCS += \ shim_mac_dump_syms.mm endif -ifeq ($(OS_TARGET),WINNT) -CPPSRCS += \ - shared-libraries-win32.cc \ - platform-win32.cc \ - $(NULL) -endif - endif include $(topsrcdir)/config/rules.mk diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index 8da7517cf2d..097faa68696 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -16,6 +16,35 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']: 'PseudoStack.h', 'shared-libraries.h', ] + CPP_SOURCES += [ + 'platform.cpp', + 'nsProfilerFactory.cpp', + 'nsProfiler.cpp', + 'TableTicker.cpp', + 'SaveProfileTask.cpp', + 'BreakpadSampler.cpp', + 'UnwinderThread2.cpp', + 'ProfileEntry.cpp', + 'local_debug_info_symbolizer.cc', + 'JSObjectBuilder.cpp', + 'JSCustomObjectBuilder.cpp', + ] + + if CONFIG['OS_TARGET'] in ('Android', 'Linux'): + CPP_SOURCES += [ + 'shared-libraries-linux.cc', + 'platform-linux.cc', + ] + elif CONFIG['OS_TARGET'] == 'Darwin': + CPP_SOURCES += [ + 'shared-libraries-macos.cc', + 'platform-macos.cc', + ] + elif CONFIG['OS_TARGET'] == 'WINNT': + CPP_SOURCES += [ + 'shared-libraries-win32.cc', + 'platform-win32.cc', + ] EXPORTS += [ 'GeckoProfiler.h', diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index ac61159a713..20f8ce21e40 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -41,8 +41,6 @@ PROGOBJS = $(PROGCSRCS:.c=.$(OBJ_SUFFIX)) endif CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS) -CPPSRCS = $(SIMPLECPPSRCS) $(EXTRACPPSRCS) - ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += -I$(topsrcdir)/config/os2 endif diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index 8547304b2e8..d0e950e5195 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -24,14 +24,6 @@ CSRCS = \ nsTraceMalloc.c \ $(NULL) -CPPSRCS = \ - nsTypeInfo.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += nsDebugHelpWin32.cpp nsWinTraceMalloc.cpp -endif - DEFINES += -DMOZ_NO_MOZALLOC ifdef WRAP_SYSTEM_INCLUDES diff --git a/tools/trace-malloc/lib/moz.build b/tools/trace-malloc/lib/moz.build index 06aeb0c7c76..671c029b06c 100644 --- a/tools/trace-malloc/lib/moz.build +++ b/tools/trace-malloc/lib/moz.build @@ -10,3 +10,12 @@ EXPORTS += [ 'nsTraceMalloc.h', ] +CPP_SOURCES += [ + 'nsTypeInfo.cpp', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'nsDebugHelpWin32.cpp', + 'nsWinTraceMalloc.cpp', + ] diff --git a/tools/trace-malloc/moz.build b/tools/trace-malloc/moz.build index 3dfb77c4783..c4fc5e83815 100644 --- a/tools/trace-malloc/moz.build +++ b/tools/trace-malloc/moz.build @@ -6,3 +6,8 @@ if not CONFIG['MOZ_PROFILE_GENERATE']: PROGRAM = 'spacetrace' + +CPP_SOURCES += [ + '$(EXTRACPPSRCS)', + '$(SIMPLECPPSRCS)', +] diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index 52999b2f113..ad9d3cb8c5d 100644 --- a/uriloader/base/Makefile.in +++ b/uriloader/base/Makefile.in @@ -15,12 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 - -CPPSRCS = \ - nsURILoader.cpp \ - nsDocLoader.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build index 7a52be0280e..3c6c3e11fc5 100644 --- a/uriloader/base/moz.build +++ b/uriloader/base/moz.build @@ -23,3 +23,8 @@ EXPORTS += [ 'nsURILoader.h', ] +CPP_SOURCES += [ + 'nsDocLoader.cpp', + 'nsURILoader.cpp', +] + diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 515d0118f20..6645f8848ce 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -44,8 +44,6 @@ CMMSRCS = nsOSHelperAppService.mm \ nsMIMEInfoMac.mm \ nsLocalHandlerAppMac.mm \ $(NULL) -else -OSHELPER = nsOSHelperAppService.cpp endif LOCAL_INCLUDES = -I$(srcdir) @@ -57,49 +55,15 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/netwerk/base/src \ -I$(topsrcdir)/netwerk/protocol/http -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -OSHELPER += nsGNOMERegistry.cpp -OSHELPER += nsMIMEInfoUnix.cpp -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),android) -OSHELPER += nsMIMEInfoAndroid.cpp -OSHELPER += nsAndroidHandlerApp.cpp -OSHELPER += nsExternalSharingAppService.cpp -OSHELPER += nsExternalURLHandlerService.cpp -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),qt) -OSHELPER += nsGNOMERegistry.cpp -OSHELPER += nsMIMEInfoUnix.cpp -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -OSHELPER += nsMIMEInfoWin.cpp LOCAL_INCLUDES += -I$(srcdir)/win endif -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) -OSHELPER += nsMIMEInfoOS2.cpp -endif - -CPPSRCS = \ - nsExternalHelperAppService.cpp \ - nsExternalProtocolHandler.cpp \ - nsMIMEInfoImpl.cpp \ - nsLocalHandlerApp.cpp \ - $(OSHELPER) \ - ExternalHelperAppChild.cpp \ - ExternalHelperAppParent.cpp \ - $(NULL) - ifdef MOZ_ENABLE_DBUS -CPPSRCS += nsDBusHandlerApp.cpp LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) endif ifdef MOZ_ENABLE_MEEGOTOUCHSHARE -OSHELPER += nsMeegoExternalSharingAppService.cpp LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) endif @@ -112,10 +76,6 @@ LOCAL_INCLUDES += $(MOZ_GIO_CFLAGS) endif endif -ifdef MOZ_ENABLE_CONTENTACTION -CPPSRCS += nsContentHandlerApp.cpp -endif - EXTRA_COMPONENTS = \ nsHandlerService.js \ nsHandlerService.manifest \ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 1eef81aa149..341c3e8b115 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -54,3 +54,60 @@ EXPORTS.mozilla.dom += [ 'ExternalHelperAppParent.h', ] +CPP_SOURCES += [ + 'ExternalHelperAppChild.cpp', + 'ExternalHelperAppParent.cpp', + 'nsExternalHelperAppService.cpp', + 'nsExternalProtocolHandler.cpp', + 'nsLocalHandlerApp.cpp', + 'nsMIMEInfoImpl.cpp', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + # TODO: CMMSRCS go here + pass +else: + CPP_SOURCES += [ + 'nsOSHelperAppService.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': + CPP_SOURCES += [ + 'nsGNOMERegistry.cpp', + 'nsMIMEInfoUnix.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + CPP_SOURCES += [ + 'nsMIMEInfoAndroid.cpp', + 'nsAndroidHandlerApp.cpp', + 'nsExternalSharingAppService.cpp', + 'nsExternalURLHandlerService.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': + CPP_SOURCES += [ + 'nsGNOMERegistry.cpp', + 'nsMIMEInfoUnix.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'nsMIMEInfoWin.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': + CPP_SOURCES += [ + 'nsMIMEInfoOS2.cpp', + ] + +if CONFIG['MOZ_ENABLE_DBUS']: + CPP_SOURCES += [ + 'nsDBusHandlerApp.cpp', + ] + +if CONFIG['MOZ_ENABLE_MEEGOTOUCHSHARE']: + CPP_SOURCES += [ + 'nsMeegoExternalSharingAppService.cpp', + ] + +if CONFIG['MOZ_ENABLE_CONTENTACTION']: + CPP_SOURCES += [ + 'nsContentHandlerApp.cpp', + ] diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in index 8e6d8d1babe..d757ac4b69b 100644 --- a/uriloader/exthandler/tests/Makefile.in +++ b/uriloader/exthandler/tests/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - WriteArgument.cpp \ - $(NULL) - SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/config.mk diff --git a/uriloader/exthandler/tests/moz.build b/uriloader/exthandler/tests/moz.build index 31d78d0e3e7..b9707821144 100644 --- a/uriloader/exthandler/tests/moz.build +++ b/uriloader/exthandler/tests/moz.build @@ -13,3 +13,7 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] #FIXME/bug 575918: out-of-process xpcshell is broken on OS X if CONFIG['OS_ARCH'] != 'Darwin': XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini'] + +CPP_SOURCES += [ + 'WriteArgument.cpp', +] diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index f0a15d5e386..63b87a59a6a 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -14,15 +14,6 @@ LIBRARY_NAME = prefetch_s LIBXUL_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -CPPSRCS = \ - nsPrefetchService.cpp \ - nsOfflineCacheUpdate.cpp \ - nsOfflineCacheUpdateService.cpp \ - OfflineCacheUpdateGlue.cpp \ - OfflineCacheUpdateChild.cpp \ - OfflineCacheUpdateParent.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build index 0e4ead3a9df..8c4e13a019e 100644 --- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -20,3 +20,12 @@ EXPORTS.mozilla.docshell += [ 'OfflineCacheUpdateParent.h', ] +CPP_SOURCES += [ + 'OfflineCacheUpdateChild.cpp', + 'OfflineCacheUpdateGlue.cpp', + 'OfflineCacheUpdateParent.cpp', + 'nsOfflineCacheUpdate.cpp', + 'nsOfflineCacheUpdateService.cpp', + 'nsPrefetchService.cpp', +] + diff --git a/view/src/Makefile.in b/view/src/Makefile.in index fd3ee4cc307..27e1b29c673 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -19,11 +19,6 @@ FAIL_ON_WARNINGS := 1 DEFINES += -D_IMPL_NS_LAYOUT -CPPSRCS = \ - nsView.cpp \ - nsViewManager.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/view/src/moz.build b/view/src/moz.build index dfd02c4412a..f07ed825097 100644 --- a/view/src/moz.build +++ b/view/src/moz.build @@ -6,3 +6,8 @@ MODULE = 'view' +CPP_SOURCES += [ + 'nsView.cpp', + 'nsViewManager.cpp', +] + diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in index 9e8f1495faf..969557ed3b2 100644 --- a/webapprt/gtk2/Makefile.in +++ b/webapprt/gtk2/Makefile.in @@ -10,9 +10,6 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk -# Build a binary bootstrapping with XRE_main -CPPSRCS = webapprt.cpp - LOCAL_INCLUDES += \ -I$(topsrcdir)/toolkit/xre \ -I$(topsrcdir)/xpcom/base \ diff --git a/webapprt/gtk2/moz.build b/webapprt/gtk2/moz.build index 7e67568325d..890b5961a69 100644 --- a/webapprt/gtk2/moz.build +++ b/webapprt/gtk2/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'webapprt-stub' +CPP_SOURCES += [ + 'webapprt.cpp', +] diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in index 497ca0bba26..c218d5ff1af 100644 --- a/webapprt/win/Makefile.in +++ b/webapprt/win/Makefile.in @@ -9,9 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -# Build a binary bootstrapping with XRE_main -CPPSRCS = webapprt.cpp - # Statically link against the CRT USE_STATIC_LIBS = 1 # Don't create a dependency on mozglue, which is impossible (difficult?) diff --git a/webapprt/win/moz.build b/webapprt/win/moz.build index 7e67568325d..890b5961a69 100644 --- a/webapprt/win/moz.build +++ b/webapprt/win/moz.build @@ -6,3 +6,6 @@ PROGRAM = 'webapprt-stub' +CPP_SOURCES += [ + 'webapprt.cpp', +] diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index 349e12f5026..36a1d00ebac 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -23,27 +23,6 @@ ifdef MOZ_WEBSMS_BACKEND DEFINES += -DMOZ_WEBSMS_BACKEND endif -CPPSRCS = \ - GfxInfo.cpp \ - nsWidgetFactory.cpp \ - nsAppShell.cpp \ - AndroidJavaWrappers.cpp \ - AndroidBridge.cpp \ - AndroidDirectTexture.cpp \ - AndroidGraphicBuffer.cpp \ - AndroidJNI.cpp \ - AndroidJNIWrapper.cpp \ - nsWindow.cpp \ - nsLookAndFeel.cpp \ - nsScreenManagerAndroid.cpp \ - nsIdleServiceAndroid.cpp \ - nsClipboard.cpp \ - nsFilePicker.cpp \ - nsIMEPicker.cpp \ - nsDeviceContextAndroid.cpp \ - nsPrintOptionsAndroid.cpp \ - $(NULL) - NOT_THERE_YET_CPPSRCS = \ nsQtKeyUtils.cpp \ nsBidiKeyboard.cpp \ diff --git a/widget/android/moz.build b/widget/android/moz.build index 0b9fdd8a478..4424d0f8f5a 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -18,3 +18,24 @@ EXPORTS += [ 'AndroidJavaWrappers.h', ] +CPP_SOURCES += [ + 'AndroidBridge.cpp', + 'AndroidDirectTexture.cpp', + 'AndroidGraphicBuffer.cpp', + 'AndroidJNI.cpp', + 'AndroidJNIWrapper.cpp', + 'AndroidJavaWrappers.cpp', + 'GfxInfo.cpp', + 'nsAppShell.cpp', + 'nsClipboard.cpp', + 'nsDeviceContextAndroid.cpp', + 'nsFilePicker.cpp', + 'nsIMEPicker.cpp', + 'nsIdleServiceAndroid.cpp', + 'nsLookAndFeel.cpp', + 'nsPrintOptionsAndroid.cpp', + 'nsScreenManagerAndroid.cpp', + 'nsWidgetFactory.cpp', + 'nsWindow.cpp', +] + diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index 276d5aaa325..2e18994c53f 100644 --- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -28,44 +28,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsWidgetGonkModule LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - Framebuffer.cpp \ - nsAppShell.cpp \ - nsWidgetFactory.cpp \ - nsWindow.cpp \ - nsLookAndFeel.cpp \ - nsIdleServiceGonk.cpp \ - OrientationObserver.cpp \ - EventHub.cpp \ - GonkMemoryPressureMonitoring.cpp \ - Input.cpp \ - InputApplication.cpp \ - InputDispatcher.cpp \ - InputListener.cpp \ - InputReader.cpp \ - InputTransport.cpp \ - InputWindow.cpp \ - Keyboard.cpp \ - KeyCharacterMap.cpp \ - KeyLayoutMap.cpp \ - PixelFormat.cpp \ - VirtualKeyMap.cpp \ - PointerController.cpp \ - SpriteController.cpp \ - PropertyMap.cpp \ - Unicode.cpp \ - Timers.cpp \ - Tokenizer.cpp \ - String8.cpp \ - String16.cpp \ - Static.cpp \ - $(NULL) - -ifeq (15,$(ANDROID_VERSION)) -CPPSRCS += HwcComposer2D.cpp -endif - SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk diff --git a/widget/gonk/libdisplay/Makefile.in b/widget/gonk/libdisplay/Makefile.in index 6877768784f..3b1693e71b7 100644 --- a/widget/gonk/libdisplay/Makefile.in +++ b/widget/gonk/libdisplay/Makefile.in @@ -25,20 +25,6 @@ LIBRARY_NAME = display FORCE_STATIC_LIB= 1 STL_FLAGS= -CPPSRCS = BootAnimation.cpp - -ifeq (17,$(ANDROID_VERSION)) -CPPSRCS += \ - FramebufferSurface.cpp \ - GraphicBufferAlloc.cpp \ - GonkDisplayJB.cpp \ - $(NULL) -else ifeq (15,$(ANDROID_VERSION)) -CPPSRCS += GonkDisplayICS.cpp -else -$(error Unsupported platform version: $(ANDROID_VERSION)) -endif - include $(topsrcdir)/config/rules.mk DEFINES += -DXPCOM_GLUE diff --git a/widget/gonk/libdisplay/moz.build b/widget/gonk/libdisplay/moz.build index 77e65e01c04..960c3d26adc 100644 --- a/widget/gonk/libdisplay/moz.build +++ b/widget/gonk/libdisplay/moz.build @@ -15,3 +15,20 @@ # limitations under the License. MODULE = 'display' + +CPP_SOURCES += [ + 'BootAnimation.cpp', +] + +if CONFIG['ANDROID_VERSION'] == '17': + CPP_SOURCES += [ + 'FramebufferSurface.cpp', + 'GraphicBufferAlloc.cpp', + 'GonkDisplayJB.cpp', + ] +elif CONFIG['ANDROID_VERSION'] == '15': + CPP_SOURCES += [ + 'GonkDisplayICS.cpp' + ] +else: + error('Unsupported platform version: %s' % (CONFIG['ANDROID_VERSION'])) diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index 4c9f0598bee..2331e632aa1 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -21,3 +21,41 @@ EXPORTS += [ ] DIRS += ['libdisplay'] + +CPP_SOURCES += [ + 'EventHub.cpp', + 'Framebuffer.cpp', + 'GonkMemoryPressureMonitoring.cpp', + 'Input.cpp', + 'InputApplication.cpp', + 'InputDispatcher.cpp', + 'InputListener.cpp', + 'InputReader.cpp', + 'InputTransport.cpp', + 'InputWindow.cpp', + 'KeyCharacterMap.cpp', + 'KeyLayoutMap.cpp', + 'Keyboard.cpp', + 'OrientationObserver.cpp', + 'PixelFormat.cpp', + 'PointerController.cpp', + 'PropertyMap.cpp', + 'SpriteController.cpp', + 'Static.cpp', + 'String16.cpp', + 'String8.cpp', + 'Timers.cpp', + 'Tokenizer.cpp', + 'Unicode.cpp', + 'VirtualKeyMap.cpp', + 'nsAppShell.cpp', + 'nsIdleServiceGonk.cpp', + 'nsLookAndFeel.cpp', + 'nsWidgetFactory.cpp', + 'nsWindow.cpp', +] + +if CONFIG['ANDROID_VERSION'] == '15': + CPP_SOURCES += [ + 'HwcComposer2D.cpp' + ] diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index 1abb0a2f3f7..5a0cdc2c37c 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -27,54 +27,12 @@ CSRCS = \ ifdef ACCESSIBILITY CSRCS += maiRedundantObjectFactory.c endif - -CPPSRCS = \ - nsWindow.cpp \ - nsAppShell.cpp \ - nsWidgetFactory.cpp \ - nsToolkit.cpp \ - nsBidiKeyboard.cpp \ - nsLookAndFeel.cpp \ - nsGtkKeyUtils.cpp \ - nsFilePicker.cpp \ - nsSound.cpp \ - nsNativeKeyBindings.cpp \ - nsScreenGtk.cpp \ - nsScreenManagerGtk.cpp \ - nsImageToPixbuf.cpp \ - nsGtkIMModule.cpp \ - WidgetTraceEvent.cpp \ - $(NULL) - -ifdef MOZ_X11 -CPPSRCS += nsIdleServiceGTK.cpp -endif - -ifdef NS_PRINTING -CPPSRCS += \ - nsDeviceContextSpecG.cpp \ - nsPrintOptionsGTK.cpp \ - nsPrintDialogGTK.cpp \ - nsPrintSettingsGTK.cpp \ - nsCUPSShim.cpp \ - nsPaperPS.cpp \ - nsPSPrinters.cpp \ - $(NULL) -endif - -ifdef MOZ_X11 -CPPSRCS += nsClipboard.cpp \ - nsDragService.cpp \ - $(NULL) -endif - # build our subdirs, too SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a ifdef NATIVE_THEME_SUPPORT CSRCS += gtk2drawing.c -CPPSRCS += nsNativeThemeGTK.cpp DEFINES += -DNATIVE_THEME_SUPPORT endif diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build index c64fe6cb4a1..6a7fea1d577 100644 --- a/widget/gtk2/moz.build +++ b/widget/gtk2/moz.build @@ -12,3 +12,46 @@ EXPORTS += [ 'nsIImageToPixbuf.h', ] +CPP_SOURCES += [ + 'WidgetTraceEvent.cpp', + 'nsAppShell.cpp', + 'nsBidiKeyboard.cpp', + 'nsFilePicker.cpp', + 'nsGtkIMModule.cpp', + 'nsGtkKeyUtils.cpp', + 'nsImageToPixbuf.cpp', + 'nsLookAndFeel.cpp', + 'nsNativeKeyBindings.cpp', + 'nsNativeThemeGTK.cpp', + 'nsScreenGtk.cpp', + 'nsScreenManagerGtk.cpp', + 'nsSound.cpp', + 'nsToolkit.cpp', + 'nsWidgetFactory.cpp', + 'nsWindow.cpp', +] + +if CONFIG['MOZ_X11']: + CPP_SOURCES += [ + 'nsIdleServiceGTK.cpp', + ] + +if CONFIG['NS_PRINTING']: + CPP_SOURCES += [ + 'nsDeviceContextSpecG.cpp', + 'nsPrintOptionsGTK.cpp', + 'nsPrintDialogGTK.cpp', + 'nsPrintSettingsGTK.cpp', + 'nsCUPSShim.cpp', + 'nsPaperPS.cpp', + 'nsPSPrinters.cpp', + ] + +if CONFIG['MOZ_X11']: + CPP_SOURCES += [ + 'nsClipboard.cpp', + 'nsDragService.cpp', + ] + +CPP_SOURCES += [ +] diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in index e618b755669..62218528254 100644 --- a/widget/os2/Makefile.in +++ b/widget/os2/Makefile.in @@ -18,27 +18,6 @@ MODULE_NAME = nsWidgetOS2Module LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsAppShell.cpp \ - nsBidiKeyboard.cpp \ - nsClipboard.cpp \ - nsFilePicker.cpp \ - os2FrameWindow.cpp \ - nsLookAndFeel.cpp \ - nsOS2Uni.cpp \ - nsPrintOS2.cpp \ - nsSound.cpp \ - nsWidgetFactory.cpp \ - nsWindow.cpp \ - nsDragService.cpp \ - nsScreenOS2.cpp \ - nsScreenManagerOS2.cpp \ - nsDeviceContextSpecOS2.cpp \ - nsPrintOptionsOS2.cpp \ - nsRwsService.cpp \ - nsIdleServiceOS2.cpp \ - $(NULL) - SHARED_LIBRARY_LIBS = \ ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/widget/os2/moz.build b/widget/os2/moz.build index 41a76827ca6..c3cc090995c 100644 --- a/widget/os2/moz.build +++ b/widget/os2/moz.build @@ -6,3 +6,24 @@ MODULE = 'widget' +CPP_SOURCES += [ + 'nsAppShell.cpp', + 'nsBidiKeyboard.cpp', + 'nsClipboard.cpp', + 'nsDeviceContextSpecOS2.cpp', + 'nsDragService.cpp', + 'nsFilePicker.cpp', + 'nsIdleServiceOS2.cpp', + 'nsLookAndFeel.cpp', + 'nsOS2Uni.cpp', + 'nsPrintOS2.cpp', + 'nsPrintOptionsOS2.cpp', + 'nsRwsService.cpp', + 'nsScreenManagerOS2.cpp', + 'nsScreenOS2.cpp', + 'nsSound.cpp', + 'nsWidgetFactory.cpp', + 'nsWindow.cpp', + 'os2FrameWindow.cpp', +] + diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index f9ae3f91e22..fb5c63e1449 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -16,50 +16,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsWidgetQtModule LIBXUL_LIBRARY = 1 - -MOCSRCS = \ - moc_moziqwidget.cpp \ - moc_mozqwidget.cpp \ - moc_nsAppShell.cpp \ - $(NULL) - -ifdef MOZ_ENABLE_CONTENTMANAGER -MOCSRCS += moc_nsMFilePicker.cpp \ - $(NULL) -CPPSRCS += nsMFilePicker.cpp \ - $(NULL) -endif - -CPPSRCS += \ - $(MOCSRCS) \ - nsAppShell.cpp \ - nsWidgetFactory.cpp \ - nsWindow.cpp \ - nsLookAndFeel.cpp \ - nsScreenQt.cpp \ - nsScreenManagerQt.cpp \ - nsQtKeyUtils.cpp \ - nsClipboard.cpp \ - nsBidiKeyboard.cpp \ - nsIdleServiceQt.cpp \ - nsDragService.cpp \ - nsNativeThemeQt.cpp \ - mozqwidget.cpp \ - mozSwipeGesture.cpp \ - nsSound.cpp \ - nsFilePicker.cpp \ - nsPrintOptionsQt.cpp \ - nsPrintSettingsQt.cpp \ - nsPrintDialogQt.cpp \ - nsDeviceContextSpecQt.cpp \ - mozqglwidgetwrapper.cpp \ - $(NULL) - -ifdef MOZ_ENABLE_QTMOBILITY -MOCSRCS += moc_mozqorientationsensorfilter.cpp -CPPSRCS += mozqorientationsensorfilter.cpp -endif - SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a # If not primary toolkit, install in secondary path diff --git a/widget/qt/faststartupqt/Makefile.in b/widget/qt/faststartupqt/Makefile.in index f355051562f..4539f6b11e2 100644 --- a/widget/qt/faststartupqt/Makefile.in +++ b/widget/qt/faststartupqt/Makefile.in @@ -36,24 +36,11 @@ GARBAGE += $(EXPORT_SOURCES) export:: $(EXPORT_SOURCES) $(INSTALL) $^ . -MOCSRCS = \ - moc_moziqwidget.cpp \ - moc_nsFastStartupQt.cpp \ - $(NULL) - LOCAL_INCLUDES += \ $(MOZ_QT_CFLAGS) \ $(MOZ_PLATFORM_MAEMO_CFLAGS) \ $(NULL) -CPPSRCS += \ - $(MOCSRCS) \ - mozqwidgetfast.cpp \ - nsFastStartupQt.cpp \ - nsQAppInstance.cpp \ - mozqglwidgetwrapper.cpp \ - $(NULL) - DEFINES += -DLIBRARY_FILENAME="$(SHARED_LIBRARY)" -DMOZ_NO_MOZALLOC -DXPCOM_GLUE include $(topsrcdir)/config/rules.mk diff --git a/widget/qt/faststartupqt/moz.build b/widget/qt/faststartupqt/moz.build index fe5f3cbfddb..2cbc1a11dda 100644 --- a/widget/qt/faststartupqt/moz.build +++ b/widget/qt/faststartupqt/moz.build @@ -6,3 +6,12 @@ MODULE = 'faststartupqt' +CPP_SOURCES += [ + 'moc_moziqwidget.cpp', + 'moc_nsFastStartupQt.cpp', + 'mozqglwidgetwrapper.cpp', + 'mozqwidgetfast.cpp', + 'nsFastStartupQt.cpp', + 'nsQAppInstance.cpp', +] + diff --git a/widget/qt/moz.build b/widget/qt/moz.build index a8ffc141375..ae33020d2c0 100644 --- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -12,3 +12,41 @@ EXPORTS += [ 'nsQtKeyUtils.h', ] +CPP_SOURCES += [ + 'moc_moziqwidget.cpp', + 'moc_mozqwidget.cpp', + 'moc_nsAppShell.cpp', + 'mozSwipeGesture.cpp', + 'mozqglwidgetwrapper.cpp', + 'mozqwidget.cpp', + 'nsAppShell.cpp', + 'nsBidiKeyboard.cpp', + 'nsClipboard.cpp', + 'nsDeviceContextSpecQt.cpp', + 'nsDragService.cpp', + 'nsFilePicker.cpp', + 'nsIdleServiceQt.cpp', + 'nsLookAndFeel.cpp', + 'nsNativeThemeQt.cpp', + 'nsPrintDialogQt.cpp', + 'nsPrintOptionsQt.cpp', + 'nsPrintSettingsQt.cpp', + 'nsQtKeyUtils.cpp', + 'nsScreenManagerQt.cpp', + 'nsScreenQt.cpp', + 'nsSound.cpp', + 'nsWidgetFactory.cpp', + 'nsWindow.cpp', +] + +if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: + CPP_SOURCES += [ + 'moc_nsMFilePicker.cpp', + 'nsMFilePicker.cpp', + ] + +if CONFIG[' MOZ_ENABLE_QTMOBILITY']: + CPP_SOURCES += [ + 'moc_mozqorientationsensorfilter.cpp', + 'mozqorientationsensorfilter.cpp', + ] diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 3b0af61ac03..8193cd68d3a 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -18,11 +18,6 @@ DEFINES += \ -D_IMPL_NS_WIDGET \ $(NULL) -CPPSRCS = \ - WidgetUtils.cpp \ - nsShmImage.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/widget/shared/moz.build b/widget/shared/moz.build index 3c1cc37ae18..9ea0dc4b4c3 100644 --- a/widget/shared/moz.build +++ b/widget/shared/moz.build @@ -9,3 +9,8 @@ if CONFIG['MOZ_X11']: MODULE = 'widget' +CPP_SOURCES += [ + 'WidgetUtils.cpp', + 'nsShmImage.cpp', +] + diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 61bc679a81d..89a67ab42f8 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -18,67 +18,6 @@ RESFILE = widget.res MODULE_NAME = nsWidgetWinModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsWindow.cpp \ - nsWindowGfx.cpp \ - nsWindowDbg.cpp \ - nsAppShell.cpp \ - nsToolkit.cpp \ - nsFilePicker.cpp \ - nsScreenWin.cpp \ - nsScreenManagerWin.cpp \ - nsLookAndFeel.cpp \ - nsUXThemeData.cpp \ - nsNativeThemeWin.cpp \ - nsWinGesture.cpp \ - nsIdleServiceWin.cpp \ - nsSound.cpp \ - nsIMM32Handler.cpp \ - WindowHook.cpp \ - WinTaskbar.cpp \ - TaskbarPreview.cpp \ - TaskbarTabPreview.cpp \ - TaskbarWindowPreview.cpp \ - TaskbarPreviewButton.cpp \ - JumpListBuilder.cpp \ - JumpListItem.cpp \ - GfxInfo.cpp \ - WidgetTraceEvent.cpp \ - AudioSession.cpp \ - nsWidgetFactory.cpp \ - WinUtils.cpp \ - WinMouseScrollHandler.cpp \ - WinIMEHandler.cpp \ - $(NULL) - -ifdef MOZ_CRASHREPORTER -CPPSRCS += LSPAnnotator.cpp -endif - -ifdef NS_PRINTING -CPPSRCS += \ - nsPrintOptionsWin.cpp \ - nsPrintSettingsWin.cpp \ - nsDeviceContextSpecWin.cpp \ - $(NULL) -endif - -CPPSRCS += \ - KeyboardLayout.cpp \ - IEnumFE.cpp \ - nsDataObj.cpp \ - nsDataObjCollection.cpp \ - nsNativeDragTarget.cpp \ - nsNativeDragSource.cpp \ - nsDragService.cpp \ - nsClipboard.cpp \ - nsImageClipboard.cpp \ - nsBidiKeyboard.cpp \ - $(NULL) -ifdef NS_ENABLE_TSF -CPPSRCS += nsTextStore.cpp -endif - DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE ifdef MOZ_ENABLE_D3D9_LAYER diff --git a/widget/windows/moz.build b/widget/windows/moz.build index d0b488960a6..2bbe4133910 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -21,3 +21,62 @@ EXPORTS.mozilla.widget += [ 'AudioSession.h', ] +CPP_SOURCES += [ + 'AudioSession.cpp', + 'GfxInfo.cpp', + 'IEnumFE.cpp', + 'JumpListBuilder.cpp', + 'JumpListItem.cpp', + 'KeyboardLayout.cpp', + 'TaskbarPreview.cpp', + 'TaskbarPreviewButton.cpp', + 'TaskbarTabPreview.cpp', + 'TaskbarWindowPreview.cpp', + 'WidgetTraceEvent.cpp', + 'WinIMEHandler.cpp', + 'WinMouseScrollHandler.cpp', + 'WinTaskbar.cpp', + 'WinUtils.cpp', + 'WindowHook.cpp', + 'nsAppShell.cpp', + 'nsBidiKeyboard.cpp', + 'nsClipboard.cpp', + 'nsDataObj.cpp', + 'nsDataObjCollection.cpp', + 'nsDragService.cpp', + 'nsFilePicker.cpp', + 'nsIMM32Handler.cpp', + 'nsIdleServiceWin.cpp', + 'nsImageClipboard.cpp', + 'nsLookAndFeel.cpp', + 'nsNativeDragSource.cpp', + 'nsNativeDragTarget.cpp', + 'nsNativeThemeWin.cpp', + 'nsScreenManagerWin.cpp', + 'nsScreenWin.cpp', + 'nsSound.cpp', + 'nsToolkit.cpp', + 'nsUXThemeData.cpp', + 'nsWidgetFactory.cpp', + 'nsWinGesture.cpp', + 'nsWindow.cpp', + 'nsWindowDbg.cpp', + 'nsWindowGfx.cpp', +] + +if CONFIG['MOZ_CRASHREPORTER']: + CPP_SOURCES += [ + 'LSPAnnotator.cpp', + ] + +if CONFIG['NS_PRINTING']: + CPP_SOURCES += [ + 'nsPrintOptionsWin.cpp', + 'nsPrintSettingsWin.cpp', + 'nsDeviceContextSpecWin.cpp', + ] + +if CONFIG['NS_ENABLE_TSF']: + CPP_SOURCES += [ + 'nsTextStore.cpp', + ] diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index 7aed0c3b81e..56bce753640 100644 --- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -15,21 +15,6 @@ IS_COMPONENT = 1 MODULE_NAME = WidgetWinRTModule LIBXUL_LIBRARY = 1 -CPPSRCS = \ - MetroApp.cpp \ - MetroWidget.cpp \ - MetroAppShell.cpp \ - MetroUtils.cpp \ - FrameworkView.cpp \ - FrameworkViewGfx.cpp \ - nsWinMetroUtils.cpp \ - MetroInput.cpp \ - UIABridge.cpp \ - UIAAccessibilityBridge.cpp \ - MetroContracts.cpp \ - nsMetroFilePicker.cpp \ - $(NULL) - DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE ifdef MOZ_ENABLE_D3D9_LAYER diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build index 41a76827ca6..f29e0947a75 100644 --- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -6,3 +6,18 @@ MODULE = 'widget' +CPP_SOURCES += [ + 'FrameworkView.cpp', + 'FrameworkViewGfx.cpp', + 'MetroApp.cpp', + 'MetroAppShell.cpp', + 'MetroContracts.cpp', + 'MetroInput.cpp', + 'MetroUtils.cpp', + 'MetroWidget.cpp', + 'UIAAccessibilityBridge.cpp', + 'UIABridge.cpp', + 'nsMetroFilePicker.cpp', + 'nsWinMetroUtils.cpp', +] + diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index 9dd970172f8..0c8065c4fa4 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -18,47 +18,6 @@ DEFINES += \ -D_IMPL_NS_WIDGET \ $(NULL) -CPPSRCS = \ - nsBaseAppShell.cpp \ - nsBaseScreen.cpp \ - nsBaseWidget.cpp \ - nsTransferable.cpp \ - nsHTMLFormatConverter.cpp \ - nsBaseDragService.cpp \ - nsPrimitiveHelpers.cpp \ - nsXPLookAndFeel.cpp \ - nsClipboardHelper.cpp \ - nsPrintOptionsImpl.cpp \ - nsPrintSettingsImpl.cpp \ - nsPrintSession.cpp \ - nsIdleService.cpp \ - nsClipboardPrivacyHandler.cpp \ - GfxInfoWebGL.cpp \ - GfxDriverInfo.cpp \ - GfxInfoBase.cpp \ - PuppetWidget.cpp \ - nsFilePickerProxy.cpp \ - WidgetUtils.cpp \ - InputData.cpp \ - $(NULL) - -ifdef MOZ_X11 -CPPSRCS += \ - GfxInfoX11.cpp -endif - -ifneq (,$(filter os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT))) -CPPSRCS += nsBaseClipboard.cpp -endif - -ifneq (,$(filter qt gtk2 os2 cocoa windows android gonk,$(MOZ_WIDGET_TOOLKIT))) -CPPSRCS += nsBaseFilePicker.cpp -endif - -ifneq (,$(filter qt gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT))) -CPPSRCS += nsNativeTheme.cpp -endif - SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX) ifdef MOZ_X11 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX) diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build index 8da27cbca9b..85ac69b6698 100644 --- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -10,3 +10,47 @@ EXPORTS += [ 'GfxInfoCollector.h', ] +CPP_SOURCES += [ + 'GfxDriverInfo.cpp', + 'GfxInfoBase.cpp', + 'GfxInfoWebGL.cpp', + 'InputData.cpp', + 'PuppetWidget.cpp', + 'WidgetUtils.cpp', + 'nsBaseAppShell.cpp', + 'nsBaseDragService.cpp', + 'nsBaseScreen.cpp', + 'nsBaseWidget.cpp', + 'nsClipboardHelper.cpp', + 'nsClipboardPrivacyHandler.cpp', + 'nsFilePickerProxy.cpp', + 'nsHTMLFormatConverter.cpp', + 'nsIdleService.cpp', + 'nsPrimitiveHelpers.cpp', + 'nsPrintOptionsImpl.cpp', + 'nsPrintSession.cpp', + 'nsPrintSettingsImpl.cpp', + 'nsTransferable.cpp', + 'nsXPLookAndFeel.cpp', +] + +if CONFIG['MOZ_X11']: + CPP_SOURCES += [ + 'GfxInfoX11.cpp' + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('os2', 'cocoa', 'windows'): + CPP_SOURCES += [ + 'nsBaseClipboard.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'os2', 'cocoa', 'windows', + 'android', 'gonk'): + CPP_SOURCES += [ + 'nsBaseFilePicker.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'windows', 'cocoa'): + CPP_SOURCES += [ + 'nsNativeTheme.cpp', + ] diff --git a/widget/xremoteclient/Makefile.in b/widget/xremoteclient/Makefile.in index d0deda98c78..433d13a2bd9 100644 --- a/widget/xremoteclient/Makefile.in +++ b/widget/xremoteclient/Makefile.in @@ -35,8 +35,6 @@ PROGCPPSRCS = \ PROGOBJS = $(PROGCPPSRCS:.cpp=.$(OBJ_SUFFIX)) -CPPSRCS = $(filter-out $(LIBCPPSRCS),$(PROGCPPSRCS)) $(LIBCPPSRCS) - LIBS = \ $(NSPR_LIBS) \ $(XLDFLAGS) $(XLIBS) diff --git a/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build index 69537384c61..9f95bed0303 100644 --- a/widget/xremoteclient/moz.build +++ b/widget/xremoteclient/moz.build @@ -8,3 +8,6 @@ MODULE = 'xremoteclient' PROGRAM = 'mozilla-xremote-client' +CPP_SOURCES += [ + '$(filter-out $(LIBCPPSRCS),$(PROGCPPSRCS)) $(LIBCPPSRCS)', +] diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 43e97a56c28..3a12f9751bf 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -20,46 +20,10 @@ ifeq ($(OS_ARCH),Linux) DEFINES += -DXP_LINUX endif -CPPSRCS = \ - nsVersionComparatorImpl.cpp \ - nsConsoleMessage.cpp \ - nsConsoleService.cpp \ - nsDebugImpl.cpp \ - nsErrorService.cpp \ - nsExceptionService.cpp \ - nsMemoryImpl.cpp \ - nsTraceRefcntImpl.cpp \ - nsInterfaceRequestorAgg.cpp \ - nsUUIDGenerator.cpp \ - nsSystemInfo.cpp \ - nsCycleCollector.cpp \ - nsStackWalk.cpp \ - nsMemoryReporterManager.cpp \ - ClearOnShutdown.cpp \ - VisualEventTracer.cpp \ - nsErrorAsserts.cpp \ - nsGZFileWriter.cpp \ - nsMemoryInfoDumper.cpp \ - nsMessageLoop.cpp \ - AvailableMemoryTracker.cpp \ - $(NULL) - -ifeq ($(OS_ARCH),Linux) -CPPSRCS += MapsMemoryReporter.cpp -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += nsMacUtilsImpl.cpp -endif - CSRCS = \ nsErrorAssertsC.c \ $(NULL) -ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) -CPPSRCS += nsCrashOnException.cpp -endif - ifeq ($(OS_ARCH),WINNT) ifdef MOZ_DEBUG diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index f3a0b42058e..5809e3f0d4e 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -70,3 +70,40 @@ EXPORTS.mozilla += [ 'nsMemoryInfoDumper.h', ] +CPP_SOURCES += [ + 'AvailableMemoryTracker.cpp', + 'ClearOnShutdown.cpp', + 'VisualEventTracer.cpp', + 'nsConsoleMessage.cpp', + 'nsConsoleService.cpp', + 'nsCycleCollector.cpp', + 'nsDebugImpl.cpp', + 'nsErrorAsserts.cpp', + 'nsErrorService.cpp', + 'nsExceptionService.cpp', + 'nsGZFileWriter.cpp', + 'nsInterfaceRequestorAgg.cpp', + 'nsMemoryImpl.cpp', + 'nsMemoryInfoDumper.cpp', + 'nsMemoryReporterManager.cpp', + 'nsMessageLoop.cpp', + 'nsStackWalk.cpp', + 'nsSystemInfo.cpp', + 'nsTraceRefcntImpl.cpp', + 'nsUUIDGenerator.cpp', + 'nsVersionComparatorImpl.cpp', +] + +if CONFIG['OS_ARCH'] == 'Linux': + CPP_SOURCES += [ + 'MapsMemoryReporter.cpp', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + CPP_SOURCES += [ + 'nsMacUtilsImpl.cpp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + CPP_SOURCES += [ + 'nsCrashOnException.cpp', + ] diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index cedbd7df97f..c82aae781af 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -29,29 +29,6 @@ ifeq (Darwin, $(OS_ARCH)) CSRCS = mach_override.c endif -CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - $(XPCOM_GLUENS_SRC_LCPPSRCS) \ - nsXPComInit.cpp \ - nsXPCOMStrings.cpp \ - Services.cpp \ - Omnijar.cpp \ - FileLocation.cpp \ - FrozenFunctions.cpp \ - $(NULL) - -ifeq (Darwin, $(OS_ARCH)) -CPPSRCS += mozPoisonWriteBase.cpp mozPoisonWriteMac.cpp -else ifeq ($(OS_ARCH),WINNT) -CPPSRCS += mozPoisonWriteBase.cpp mozPoisonWriteWin.cpp -else -CPPSRCS += mozPoisonWriteStub.cpp -endif - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += perfprobe.cpp -endif - SHARED_LIBRARY_LIBS = \ $(DEPTH)/chrome/src/$(LIB_PREFIX)chrome_s.$(LIB_SUFFIX) \ ../ds/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \ diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index 9da8c4f9f76..bcc61f23969 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -24,3 +24,29 @@ EXPORTS.mozilla += [ if CONFIG['OS_ARCH'] == 'WINNT': EXPORTS.mozilla += ['perfprobe.h'] + CPP_SOURCES += [ + 'mozPoisonWriteBase.cpp', + 'mozPoisonWriteWin.cpp', + 'perfprobe.cpp', + ] +elif CONFIG['OS_ARCH'] == 'Darwin': + CPP_SOURCES += [ + 'mozPoisonWriteBase.cpp', + 'mozPoisonWriteMac.cpp', + ] +else: + CPP_SOURCES += [ + 'mozPoisonWriteStub.cpp', + ] + +CPP_SOURCES += [ + '$(XPCOM_GLUENS_SRC_LCPPSRCS)', + '$(XPCOM_GLUE_SRC_LCPPSRCS)', + 'FileLocation.cpp', + 'FrozenFunctions.cpp', + 'Omnijar.cpp', + 'Services.cpp', + 'nsXPCOMStrings.cpp', + 'nsXPComInit.cpp', +] + diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 5787e60a8e0..c76be43b50c 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -15,13 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 -CPPSRCS = \ - nsCategoryManager.cpp \ - nsComponentManager.cpp \ - ManifestParser.cpp \ - nsNativeComponentLoader.cpp \ - $(NULL) - LOCAL_INCLUDES = \ -I$(srcdir)/../reflect/xptinfo/src \ -I$(srcdir)/../base \ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index 814f4efe1e5..733e038b74c 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -28,3 +28,10 @@ EXPORTS.mozilla += [ 'ModuleUtils.h', ] +CPP_SOURCES += [ + 'ManifestParser.cpp', + 'nsCategoryManager.cpp', + 'nsComponentManager.cpp', + 'nsNativeComponentLoader.cpp', +] + diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index c572655ac6f..3f2ecbc8baa 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -15,43 +15,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 - -CPPSRCS = \ - nsArray.cpp \ - nsAtomTable.cpp \ - nsAtomService.cpp \ - nsByteBuffer.cpp \ - nsCRT.cpp \ - nsHashPropertyBag.cpp \ - nsHashtable.cpp \ - nsINIParserImpl.cpp \ - nsObserverList.cpp \ - nsObserverService.cpp \ - nsProperties.cpp \ - nsPersistentProperties.cpp \ - nsStaticNameTable.cpp \ - nsStringEnumerator.cpp \ - nsSupportsArray.cpp \ - nsSupportsArrayEnumerator.cpp \ - nsSupportsPrimitives.cpp \ - nsUnicharBuffer.cpp \ - nsVariant.cpp \ - $(NULL) - -ifdef HAVE_CLOCK_MONOTONIC -CPPSRCS += TimeStamp_posix.cpp -else ifeq ($(OS_ARCH),Darwin) -CPPSRCS += TimeStamp_darwin.cpp -else ifeq ($(OS_ARCH),WINNT) -CPPSRCS += TimeStamp_windows.cpp -else -$(error No TimeStamp implementation on this platform. Build will not succeed) -endif - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += nsWindowsRegKey.cpp -endif - EXTRA_COMPONENTS = \ nsINIProcessor.js \ nsINIProcessor.manifest \ diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build index da921558fcd..54f405515a1 100644 --- a/xpcom/ds/moz.build +++ b/xpcom/ds/moz.build @@ -37,6 +37,9 @@ if CONFIG['OS_ARCH'] == 'WINNT': ] EXPORTS += ['nsWindowsRegKey.h'] EXPORTS.mozilla += ['TimeStamp_windows.h'] + CPP_SOURCES += [ + 'nsWindowsRegKey.cpp' + ] XPIDL_MODULE = 'xpcom_ds' @@ -72,3 +75,39 @@ EXPORTS.mozilla += [ 'TimeStamp.h', ] +CPP_SOURCES += [ + 'nsArray.cpp', + 'nsAtomService.cpp', + 'nsAtomTable.cpp', + 'nsByteBuffer.cpp', + 'nsCRT.cpp', + 'nsHashPropertyBag.cpp', + 'nsHashtable.cpp', + 'nsINIParserImpl.cpp', + 'nsObserverList.cpp', + 'nsObserverService.cpp', + 'nsPersistentProperties.cpp', + 'nsProperties.cpp', + 'nsStaticNameTable.cpp', + 'nsStringEnumerator.cpp', + 'nsSupportsArray.cpp', + 'nsSupportsArrayEnumerator.cpp', + 'nsSupportsPrimitives.cpp', + 'nsUnicharBuffer.cpp', + 'nsVariant.cpp', +] + +if CONFIG['HAVE_CLOCK_MONOTONIC']: + CPP_SOURCES += [ + 'TimeStamp_posix.cpp', + ] +elif CONFIG['OS_ARCH'] == 'Darwin': + CPP_SOURCES += [ + 'TimeStamp_darwin.cpp', + ] +elif CONFIG['OS_ARCH'] == 'WINNT': + CPP_SOURCES += [ + 'TimeStamp_windows.cpp', + ] +else: + error('No TimeStamp implementation on this platform. Build will not succeed') diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in index 5bb5a06a24a..31679d60686 100644 --- a/xpcom/glue/Makefile.in +++ b/xpcom/glue/Makefile.in @@ -20,13 +20,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(NULL) -CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - $(XPCOM_GLUENS_SRC_LCPPSRCS) \ - nsStringAPI.cpp \ - GenericModule.cpp \ - $(NULL) - SDK_HEADERS = \ nsArrayEnumerator.h \ nsArrayUtils.h \ diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build index 9c341b6eadf..6732d23363a 100644 --- a/xpcom/glue/moz.build +++ b/xpcom/glue/moz.build @@ -46,3 +46,10 @@ EXPORTS.mozilla.threads += [ 'nsThreadIDs.h', ] +CPP_SOURCES += [ + '$(XPCOM_GLUENS_SRC_LCPPSRCS)', + '$(XPCOM_GLUE_SRC_LCPPSRCS)', + 'GenericModule.cpp', + 'nsStringAPI.cpp', +] + diff --git a/xpcom/glue/nomozalloc/Makefile.in b/xpcom/glue/nomozalloc/Makefile.in index 467eb01f558..40036357883 100644 --- a/xpcom/glue/nomozalloc/Makefile.in +++ b/xpcom/glue/nomozalloc/Makefile.in @@ -20,13 +20,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../build \ $(NULL) -CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - $(XPCOM_GLUENS_SRC_LCPPSRCS) \ - nsStringAPI.cpp \ - GenericModule.cpp \ - $(NULL) - SDK_LIBRARY = \ $(LIB_PREFIX)xpcomglue_s_nomozalloc.$(LIB_SUFFIX) \ $(NULL) diff --git a/xpcom/glue/nomozalloc/moz.build b/xpcom/glue/nomozalloc/moz.build index 6834f25b09e..02f9de5b5e8 100644 --- a/xpcom/glue/nomozalloc/moz.build +++ b/xpcom/glue/nomozalloc/moz.build @@ -6,3 +6,10 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + '$(XPCOM_GLUENS_SRC_LCPPSRCS)', + '$(XPCOM_GLUE_SRC_LCPPSRCS)', + 'GenericModule.cpp', + 'nsStringAPI.cpp', +] + diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in index d9cfc9303d9..b876ef3656f 100644 --- a/xpcom/glue/standalone/Makefile.in +++ b/xpcom/glue/standalone/Makefile.in @@ -20,13 +20,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../build \ $(NULL) -CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - nsStringAPI.cpp \ - nsXPCOMGlue.cpp \ - $(LINKSRC) \ - $(NULL) - SDK_HEADERS = \ nsXPCOMGlue.h \ $(NULL) diff --git a/xpcom/glue/standalone/moz.build b/xpcom/glue/standalone/moz.build index 1feb35fad86..19711539493 100644 --- a/xpcom/glue/standalone/moz.build +++ b/xpcom/glue/standalone/moz.build @@ -11,3 +11,9 @@ if CONFIG['OS_ARCH'] == 'WINNT': MODULE = 'xpcom' +CPP_SOURCES += [ + '$(XPCOM_GLUE_SRC_LCPPSRCS)', + 'nsStringAPI.cpp', + 'nsXPCOMGlue.cpp', +] + diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in index f4683f7cda1..a1f0289fbd4 100644 --- a/xpcom/glue/standalone/staticruntime/Makefile.in +++ b/xpcom/glue/standalone/staticruntime/Makefile.in @@ -19,12 +19,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../../build \ $(NULL) -CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - nsXPCOMGlue.cpp \ - nsStringAPI.cpp \ - $(NULL) - SDK_LIBRARY = \ $(LIB_PREFIX)xpcomglue_staticruntime.$(LIB_SUFFIX) \ $(NULL) diff --git a/xpcom/glue/standalone/staticruntime/moz.build b/xpcom/glue/standalone/staticruntime/moz.build index 6834f25b09e..a3e456b439c 100644 --- a/xpcom/glue/standalone/staticruntime/moz.build +++ b/xpcom/glue/standalone/staticruntime/moz.build @@ -6,3 +6,9 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + '$(XPCOM_GLUE_SRC_LCPPSRCS)', + 'nsStringAPI.cpp', + 'nsXPCOMGlue.cpp', +] + diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in index ca03df4e7b9..804d8bf6553 100644 --- a/xpcom/glue/staticruntime/Makefile.in +++ b/xpcom/glue/staticruntime/Makefile.in @@ -20,13 +20,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../build \ $(NULL) -CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - $(XPCOM_GLUENS_SRC_LCPPSRCS) \ - nsStringAPI.cpp \ - GenericModule.cpp \ - $(NULL) - SDK_LIBRARY = \ $(LIB_PREFIX)xpcomglue_staticruntime_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build index 6834f25b09e..02f9de5b5e8 100644 --- a/xpcom/glue/staticruntime/moz.build +++ b/xpcom/glue/staticruntime/moz.build @@ -6,3 +6,10 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + '$(XPCOM_GLUENS_SRC_LCPPSRCS)', + '$(XPCOM_GLUE_SRC_LCPPSRCS)', + 'GenericModule.cpp', + 'nsStringAPI.cpp', +] + diff --git a/xpcom/glue/tests/gtest/Makefile.in b/xpcom/glue/tests/gtest/Makefile.in index bc5dbd0ebbf..0192674f366 100644 --- a/xpcom/glue/tests/gtest/Makefile.in +++ b/xpcom/glue/tests/gtest/Makefile.in @@ -20,8 +20,4 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../.. \ $(NULL) -CPPSRCS = \ - TestFileUtils.cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build index 7ab3078665b..c46e4b9e07e 100644 --- a/xpcom/glue/tests/gtest/moz.build +++ b/xpcom/glue/tests/gtest/moz.build @@ -5,3 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MODULE = 'xpcom_glue_gtest' + +CPP_SOURCES += [ + 'TestFileUtils.cpp', +] diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 83ed2bfb692..f8fc45e887e 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -22,47 +22,12 @@ MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_FLAGS) -fno-strict-aliasing endif endif -CPPSRCS = \ - Base64.cpp \ - nsAnonymousTemporaryFile.cpp \ - nsAppFileLocationProvider.cpp \ - nsBinaryStream.cpp \ - nsDirectoryService.cpp \ - nsEscape.cpp \ - nsInputStreamTee.cpp \ - nsLinebreakConverter.cpp \ - nsLocalFileCommon.cpp \ - nsMultiplexInputStream.cpp \ - nsNativeCharsetUtils.cpp \ - nsPipe3.cpp \ - nsStreamUtils.cpp \ - nsScriptableInputStream.cpp \ - nsScriptableBase64Encoder.cpp \ - nsSegmentedBuffer.cpp \ - nsStorageStream.cpp \ - nsStringStream.cpp \ - nsUnicharInputStream.cpp \ - nsIOUtil.cpp \ - nsWildCard.cpp \ - SpecialSystemDirectory.cpp \ - $(NULL) - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) CMMSRCS += \ CocoaFileUtils.mm \ $(NULL) endif -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) -CPPSRCS += nsLocalFileOS2.cpp -else -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -CPPSRCS += nsLocalFileWin.cpp -else -CPPSRCS += nsLocalFileUnix.cpp -endif # windows -endif # OS2 - SDK_HEADERS = \ nsDirectoryServiceDefs.h \ nsDirectoryServiceUtils.h \ diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index eb7747795ab..3cb5e2ba78d 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -49,10 +49,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': EXPORTS += ['nsLocalFileOS2.h'] + CPP_SOURCES += [ + 'nsLocalFileOS2.cpp', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXPORTS += ['nsLocalFileWin.h'] + CPP_SOURCES += [ + 'nsLocalFileWin.cpp', + ] else: EXPORTS += ['nsLocalFileUnix.h'] + CPP_SOURCES += [ + 'nsLocalFileUnix.cpp', + ] XPIDL_MODULE = 'xpcom_io' @@ -81,3 +90,28 @@ EXPORTS.mozilla += [ 'Base64.h', ] +CPP_SOURCES += [ + 'Base64.cpp', + 'SpecialSystemDirectory.cpp', + 'nsAnonymousTemporaryFile.cpp', + 'nsAppFileLocationProvider.cpp', + 'nsBinaryStream.cpp', + 'nsDirectoryService.cpp', + 'nsEscape.cpp', + 'nsIOUtil.cpp', + 'nsInputStreamTee.cpp', + 'nsLinebreakConverter.cpp', + 'nsLocalFileCommon.cpp', + 'nsMultiplexInputStream.cpp', + 'nsNativeCharsetUtils.cpp', + 'nsPipe3.cpp', + 'nsScriptableBase64Encoder.cpp', + 'nsScriptableInputStream.cpp', + 'nsSegmentedBuffer.cpp', + 'nsStorageStream.cpp', + 'nsStreamUtils.cpp', + 'nsStringStream.cpp', + 'nsUnicharInputStream.cpp', + 'nsWildCard.cpp', +] + diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in index 97bd681dbaa..c66a2043def 100644 --- a/xpcom/reflect/xptcall/src/Makefile.in +++ b/xpcom/reflect/xptcall/src/Makefile.in @@ -14,8 +14,6 @@ LIBRARY_NAME = xptcall MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 -CPPSRCS = xptcall.cpp - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in index 6cc268b8a2d..4af5766d07a 100644 --- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in @@ -14,10 +14,6 @@ LIBRARY_NAME = xptcmd EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 -CPPSRCS = \ - ../unix/xptcinvoke_gcc_x86_unix.cpp \ - xptcstubs_gcc_x86_os2.cpp \ - $(NULL) LOCAL_INCLUDES = \ -I$(srcdir)/../unix \ -I$(srcdir)/../../../../xptinfo/src \ diff --git a/xpcom/reflect/xptcall/src/md/os2/moz.build b/xpcom/reflect/xptcall/src/md/os2/moz.build index 6834f25b09e..42a5b890831 100644 --- a/xpcom/reflect/xptcall/src/md/os2/moz.build +++ b/xpcom/reflect/xptcall/src/md/os2/moz.build @@ -6,3 +6,8 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + '../unix/xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_os2.cpp', +] + diff --git a/xpcom/reflect/xptcall/src/md/test/Makefile.in b/xpcom/reflect/xptcall/src/md/test/Makefile.in index f4473e5a714..17b9584baff 100644 --- a/xpcom/reflect/xptcall/src/md/test/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/test/Makefile.in @@ -10,8 +10,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = stub_test.cpp #invoke_test.cpp -SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) +SIMPLE_PROGRAMS = stub_test include $(topsrcdir)/config/rules.mk diff --git a/xpcom/reflect/xptcall/src/md/test/moz.build b/xpcom/reflect/xptcall/src/md/test/moz.build index 6834f25b09e..aa8d34d20ce 100644 --- a/xpcom/reflect/xptcall/src/md/test/moz.build +++ b/xpcom/reflect/xptcall/src/md/test/moz.build @@ -6,3 +6,7 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + 'stub_test.cpp', +] + diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index a114605ddd0..6290bdc687d 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -18,9 +18,6 @@ MOZILLA_INTERNAL_API = 1 # # The default is this buildable, but non-functioning code. # -CPPSRCS = $(error XPTCall not implemented on this platform!) - - ifeq ($(OS_ARCH),SunOS) ifneq (86,$(findstring 86,$(OS_TEST))) # disable PGO for this directory with Sun Studio on SPARC because @@ -41,58 +38,23 @@ include $(topsrcdir)/config/config.mk ifeq (Darwin,$(OS_ARCH)) ifeq (86,$(findstring 86,$(OS_TEST))) ifeq (x86_64,$(OS_TEST)) -CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_darwin.cpp else DEFINES += -DMOZ_NEED_LEADING_UNDERSCORE -CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp endif endif endif -ifneq (,$(filter NetBSD OpenBSD GNU,$(OS_ARCH))) -ifeq (86,$(findstring 86,$(OS_TEST))) -CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp -endif -endif -# -# New code for Linux, et. al., with gcc -# Migrate other platforms here after testing -# -ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH))) -# Linux/x86-64 -ifeq (x86_64,$(OS_TEST)) -CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp -else -ifeq (86,$(findstring 86,$(OS_TEST))) -CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp -endif -endif -endif # IA64 Linux ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) ifneq (,$(findstring ia64,$(OS_TEST))) -CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s endif endif # -# OpenBSD/amd64 -# -ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) -CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -endif -# # Neutrino/Intel (uses the same unixish_x86 code) # ifeq ($(OS_TARGET),NTO) -ifeq ($(OS_TEST),x86) -CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp -endif -ifeq ($(OS_TEST),arm) -CPPSRCS := xptcinvoke_nto_arm.cpp xptcstubs_nto_arm.cpp -endif ifeq ($(OS_TEST),sh) -CPPSRCS := xptcinvoke_nto_shle.cpp xptcstubs_nto_shle.cpp ASFILES := xptcstubs_asm_shle.s endif endif @@ -107,40 +69,18 @@ endif ifeq ($(OS_ARCH),SunOS) ifeq (x86_64,$(OS_TEST)) ifndef GNU_CC -CPPSRCS := xptcstubs_x86_64_solaris.cpp xptcinvoke_x86_64_solaris.cpp ASFILES := xptcstubs_asm_x86_64_solaris_SUNW.s -else -CPPSRCS := xptcstubs_x86_64_linux.cpp xptcinvoke_x86_64_unix.cpp endif else ifeq (86,$(findstring 86,$(OS_TEST))) # 28817: if Solaris Intel OS, and native compiler, always build optimised. ifndef GNU_CC -CPPSRCS := xptcinvoke_x86_solaris.cpp xptcstubs_x86_solaris.cpp ASFILES := xptcinvoke_asm_x86_solaris_SUNW.s xptcstubs_asm_x86_solaris_SUNW.s -else -CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp endif endif endif endif -###################################################################### -# Alpha -###################################################################### -# -# Linux/Alpha -# -ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp -endif -# -# OpenBSD/Alpha -# -ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDalpha) -CPPSRCS := xptcinvoke_alpha_openbsd.cpp xptcstubs_alpha_openbsd.cpp -endif - ###################################################################### # ARM ###################################################################### @@ -149,24 +89,9 @@ endif # ifeq ($(OS_ARCH),Linux) ifneq (,$(filter arm% sa110,$(OS_TEST))) -CPPSRCS := xptcinvoke_arm.cpp xptcstubs_arm.cpp CXXFLAGS += -O2 endif endif -# -# NetBSD/ARM -# -ifeq ($(OS_ARCH),NetBSD) -ifneq (,$(filter arm% sa110,$(OS_TEST))) -CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp -endif -endif -# -# OpenBSD/ARM -# -ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDarm) -CPPSRCS := xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp -endif ###################################################################### # HPPA @@ -178,10 +103,8 @@ endif ifeq ($(OS_ARCH),HP-UX) ifneq ($(CC),gcc) ifneq ($(OS_TEST),ia64) -CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp ASFILES := xptcstubs_asm_pa32.s xptcinvoke_asm_pa32.s else -CPPSRCS := xptcinvoke_ipf32.cpp xptcstubs_ipf32.cpp ASFILES := xptcstubs_asm_ipf32.s xptcinvoke_asm_ipf32.s endif @@ -196,9 +119,7 @@ endif ifeq ($(OS_ARCH),Linux) ifneq (,$(filter hppa hppa2.0 hppa1.1,$(OS_TEST))) ifndef GNU_CXX -$(error Unknown C++ compiler, xptcall assembly will probably be incorrect.) else -CPPSRCS := xptcinvoke_pa32.cpp xptcstubs_pa32.cpp ASFILES := xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s # #434190 optimized builds crash CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) @@ -210,31 +131,12 @@ endif ###################################################################### # M68k ###################################################################### -# -# NetBSD/m68k -# -ifeq ($(OS_ARCH),NetBSD) -ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) -CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp -endif -endif - -# -# Linux/m68k -# -ifeq ($(OS_ARCH),Linux) -ifeq ($(OS_TEST),m68k) -CPPSRCS := xptcinvoke_linux_m68k.cpp xptcstubs_linux_m68k.cpp -endif -endif ifeq ($(OS_ARCH),Linux) ifneq (,$(findstring mips, $(OS_TEST))) ifneq (,$(findstring mips64, $(OS_TEST))) -CPPSRCS := xptcinvoke_mips64.cpp xptcstubs_mips64.cpp ASFILES := xptcinvoke_asm_mips64.s xptcstubs_asm_mips64.s else -CPPSRCS := xptcinvoke_mips.cpp xptcstubs_mips.cpp ASFILES := xptcinvoke_asm_mips.s xptcstubs_asm_mips.s endif ASFLAGS += -I$(DIST)/include -x assembler-with-cpp @@ -249,14 +151,11 @@ endif # ifeq ($(OS_ARCH),AIX) ifdef HAVE_64BIT_OS -CPPSRCS := xptcinvoke_ppc_aix64.cpp xptcstubs_ppc_aix64.cpp ASFILES := xptcinvoke_asm_ppc_aix64.s xptcstubs_asm_ppc_aix64.s else ifeq ($(AIX_OBJMODEL),ibm) -CPPSRCS := xptcinvoke_ppc_aix.cpp xptcstubs_ppc_aix.cpp ASFILES := xptcinvoke_asm_ppc_ibmobj_aix.s xptcstubs_asm_ppc_aix.s else -CPPSRCS := xptcinvoke_ppc_aix.cpp xptcstubs_ppc_aix.cpp ASFILES := xptcinvoke_asm_ppc_aix.s xptcstubs_asm_ppc_aix.s endif endif @@ -269,7 +168,6 @@ endif # Linux/PPC # ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) -CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp endif @@ -278,7 +176,6 @@ endif # Linux/PPC64 # ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) -CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp endif @@ -287,7 +184,6 @@ endif # NetBSD/PPC # ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) -CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s endif @@ -295,7 +191,6 @@ endif # OpenBSD/PPC # ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc) -CPPSRCS := xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp ASFILES := xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s AS := $(CC) -c -x assembler-with-cpp endif @@ -306,7 +201,6 @@ endif ifeq ($(OS_ARCH),Darwin) ifeq ($(TARGET_CPU), powerpc) ASFLAGS += -x assembler-with-cpp # assumes $(AS) == $(CC) -CPPSRCS := xptcinvoke_ppc_rhapsody.cpp xptcstubs_ppc_rhapsody.cpp ASFILES := xptcinvoke_asm_ppc_rhapsody.s xptcstubs_asm_ppc_darwin.s endif endif @@ -319,7 +213,6 @@ endif # ifeq ($(OS_ARCH),Linux) ifneq (,$(findstring sparc,$(OS_TEST))) -CPPSRCS := xptcinvoke_sparc_solaris.cpp xptcstubs_sparc_solaris.cpp ASFILES := xptcinvoke_asm_sparc_linux_GCC3.s xptcstubs_asm_sparc_solaris.s endif endif @@ -327,21 +220,18 @@ endif # NetBSD/SPARC # ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) -CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # # OpenBSD/SPARC # ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) -CPPSRCS := xptcinvoke_sparc_openbsd.cpp xptcstubs_sparc_openbsd.cpp ASFILES := xptcinvoke_asm_sparc_openbsd.s xptcstubs_asm_sparc_openbsd.s endif # # OpenBSD/SPARC64 # ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) -CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s endif # @@ -351,9 +241,6 @@ ifeq ($(OS_ARCH),SunOS) ifneq (86,$(findstring 86,$(OS_TEST))) ifdef HAVE_64BIT_OS ASFLAGS += -xarch=v9 -CPPSRCS := xptcinvoke_sparcv9_solaris.cpp xptcstubs_sparcv9_solaris.cpp -else -CPPSRCS := xptcinvoke_sparc_solaris.cpp xptcstubs_sparc_solaris.cpp endif ifeq ($(GNU_CC),1) @@ -377,12 +264,10 @@ endif # Linux for S/390 # ifeq ($(OS_ARCH)$(OS_TEST),Linuxs390) -CPPSRCS := xptcinvoke_linux_s390.cpp xptcstubs_linux_s390.cpp CXXFLAGS += -fno-strict-aliasing -fno-inline -fomit-frame-pointer -mbackchain endif ifeq ($(OS_ARCH)$(OS_TEST),Linuxs390x) -CPPSRCS := xptcinvoke_linux_s390x.cpp xptcstubs_linux_s390x.cpp CXXFLAGS += -fno-strict-aliasing -fno-inline -fomit-frame-pointer -mbackchain endif diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build index 6834f25b09e..ea0c3bf83ea 100644 --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -6,3 +6,261 @@ MODULE = 'xpcom' +if CONFIG['OS_ARCH'] == 'Darwin': + if CONFIG['OS_TEST'].find('86') != -1: + if CONFIG['OS_TEST'] == 'x86_64': + CPP_SOURCES += [ + 'xptcinvoke_x86_64_unix.cpp', + 'xptcstubs_x86_64_darwin.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_unix.cpp', + ] + +if CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD', 'GNU'): + if CONFIG['OS_TEST'].find('86') != -1: + CPP_SOURCES += [ + 'xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_unix.cpp' + ] + +if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD') or \ + CONFIG['OS_ARCH'].startswith('GNU_'): + if CONFIG['OS_TEST'] == 'x86_64': + CPP_SOURCES += [ + 'xptcinvoke_x86_64_unix.cpp', + 'xptcstubs_x86_64_linux.cpp', + ] + elif CONFIG['OS_TEST'].find('86') != -1: + CPP_SOURCES += [ + 'xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_unix.cpp' + ] + +if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'): + if CONFIG['OS_TEST'].find('ia64') != -1: + CPP_SOURCES += [ + 'xptcinvoke_ipf64.cpp', + 'xptcstubs_ipf64.cpp' + ] + +if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'x86_64': + CPP_SOURCES += [ + 'xptcinvoke_amd64_openbsd.cpp', + 'xptcstubs_amd64_openbsd.cpp' + ] + +if CONFIG['OS_TARGET'] == 'NTO': + if CONFIG['OS_TEST'] == 'x86': + CPP_SOURCES += [ + 'xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_unix.cpp', + ] + elif CONFIG['OS_TEST'] == 'arm': + CPP_SOURCES += [ + 'xptcinvoke_nto_arm.cpp', + 'xptcstubs_nto_arm.cpp', + ] + elif CONFIG['OS_TEST'] == 'sh': + CPP_SOURCES += [ + 'xptcinvoke_nto_shle.cpp', + 'xptcstubs_nto_shle.cpp' + ] + +if CONFIG['OS_ARCH'] == 'SunOS': + if CONFIG['OS_TEST'] == 'x86_64': + if CONFIG['GNU_CC']: + CPP_SOURCES += [ + 'xptcstubs_x86_64_linux.cpp', + 'xptcinvoke_x86_64_unix.cpp' + ] + else: + CPP_SOURCES += [ + 'xptcstubs_x86_64_solaris.cpp', + 'xptcinvoke_x86_64_solaris.cpp', + ] + elif CONFIG['OS_TEST'].find('86') != -1: + if CONFIG['GNU_CC']: + CPP_SOURCES += [ + 'xptcinvoke_gcc_x86_unix.cpp', + 'xptcstubs_gcc_x86_unix.cpp' + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_x86_solaris.cpp', + 'xptcstubs_x86_solaris.cpp' + ] + +if CONFIG['OS_TEST'] == 'alpha': + if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD'): + CPP_SOURCES += [ + 'xptcinvoke_linux_alpha.cpp', + 'xptcstubs_linux_alpha.cpp', + ] + elif CONFIG['OS_ARCH'] == 'OpenBSD': + CPP_SOURCES += [ + 'xptcinvoke_alpha_openbsd.cpp', + 'xptcstubs_alpha_openbsd.cpp', + ] + +if CONFIG['OS_TEST'].startswith('arm') or CONFIG['OS_TEST'] == 'sa110': + if CONFIG['OS_ARCH'] == 'Linux': + CPP_SOURCES += [ + 'xptcinvoke_arm.cpp', + 'xptcstubs_arm.cpp' + ] + elif CONFIG['OS_ARCH'] == 'NetBSD': + CPP_SOURCES += [ + 'xptcinvoke_arm_netbsd.cpp', + 'xptcstubs_arm_netbsd.cpp', + ] + +if CONFIG['OS_TEST'] == 'arm' and CONFIG['OS_ARCH'] == 'OpenBSD': + CPP_SOURCES += [ + 'xptcinvoke_arm_openbsd.cpp', + 'xptcstubs_arm_openbsd.cpp', + ] + +if CONFIG['OS_ARCH'] == 'HP-UX': + if CONFIG['CC'] != 'gcc': + if CONFIG['OS_TEST'] == 'ia64': + CPP_SOURCES += [ + 'xptcinvoke_ipf32.cpp', + 'xptcstubs_ipf32.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_pa32.cpp', + 'xptcstubs_pa32.cpp' + ] + +if CONFIG['OS_ARCH'] == 'Linux': + if CONFIG['OS_TEST'] in ('hppa', 'hppa2.0', 'hppa1.1'): + if CONFIG['GNU_CXX']: + CPP_SOURCES += [ + 'xptcinvoke_pa32.cpp', + 'xptcstubs_pa32.cpp', + ] + else: + error('Unknown C++ compiler, xptcall assembly will probably be incorrect.') + +if CONFIG['OS_ARCH'] == 'NetBSD': + if CONFIG['OS_TEST'] in ('amiga', 'atari', 'hp300', 'mac68k', 'mvme68k', + 'next68k', 'sun3', 'sun3x', 'x68k'): + CPP_SOURCES += [ + 'xptcinvoke_netbsd_m68k.cpp', + 'xptcstubs_netbsd_m68k.cpp' + ] + +if CONFIG['OS_ARCH'] == 'Linux': + if CONFIG['OS_TEST'] == 'm68k': + CPP_SOURCES += [ + 'xptcinvoke_linux_m68k.cpp', + 'xptcstubs_linux_m68k.cpp', + ] + if CONFIG['OS_TEST'].find('mips') != -1: + if CONFIG['OS_TEST'].find('mips64') != -1: + CPP_SOURCES += [ + 'xptcinvoke_mips64.cpp', + 'xptcstubs_mips64.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_mips.cpp', + 'xptcstubs_mips.cpp', + ] + +if CONFIG['OS_ARCH'] == 'AIX': + if CONFIG['HAVE_64BIT_OS']: + CPP_SOURCES += [ + 'xptcinvoke_ppc_aix64.cpp', + 'xptcstubs_ppc_aix64.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_ppc_aix.cpp', + 'xptcstubs_ppc_aix.cpp', + ] + +if CONFIG['OS_TEST'] == 'powerpc': + if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'): + CPP_SOURCES += [ + 'xptcinvoke_ppc_linux.cpp', + 'xptcstubs_ppc_linux.cpp', + ] + +if CONFIG['OS_TEST'] == 'powerpc64': + if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'): + CPP_SOURCES += [ + 'xptcinvoke_ppc64_linux.cpp', + 'xptcstubs_ppc64_linux.cpp', + ] + +if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'): + if CONFIG['OS_ARCH'] == 'NetBSD': + CPP_SOURCES += [ + 'xptcinvoke_ppc_netbsd.cpp', + 'xptcstubs_ppc_netbsd.cpp', + ] + +if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'powerpc': + CPP_SOURCES += [ + 'xptcinvoke_ppc_openbsd.cpp', + 'xptcstubs_ppc_openbsd.cpp', + ] + +if CONFIG['OS_ARCH'] == 'Darwin' and CONFIG['TARGET_CPU'] == 'powerpc': + CPP_SOURCES += [ + 'xptcinvoke_ppc_rhapsody.cpp', + 'xptcstubs_ppc_rhapsody.cpp', + ] + +if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TEST'].find('sparc') != -1: + CPP_SOURCES += [ + 'xptcinvoke_sparc_solaris.cpp', + 'xptcstubs_sparc_solaris.cpp', + ] + +if CONFIG['OS_ARCH'] == 'NetBSD' and CONFIG['OS_TEST'] == 'sparc': + CPP_SOURCES += [ + 'xptcinvoke_sparc_netbsd.cpp', + 'xptcstubs_sparc_netbsd.cpp', + ] + +if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc': + CPP_SOURCES += [ + 'xptcinvoke_sparc_openbsd.cpp', + 'xptcstubs_sparc_openbsd.cpp', + ] + +if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc64': + CPP_SOURCES += [ + 'xptcinvoke_sparc64_openbsd.cpp', + 'xptcstubs_sparc64_openbsd.cpp', + ] + +if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1: + if CONFIG['HAVE_64BIT_OS']: + CPP_SOURCES += [ + 'xptcinvoke_sparcv9_solaris.cpp', + 'xptcstubs_sparcv9_solaris.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_sparc_solaris.cpp', + 'xptcstubs_sparc_solaris.cpp', + ] + +if CONFIG['OS_ARCH'] == 'Linux': + if CONFIG['OS_TEST'] == 's390': + CPP_SOURCES += [ + 'xptcinvoke_linux_s390.cpp', + 'xptcstubs_linux_s390.cpp', + ] + elif CONFIG['OS_TEST'] == 's390x': + CPP_SOURCES += [ + 'xptcinvoke_linux_s390x.cpp', + 'xptcstubs_linux_s390x.cpp', + ] diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index 2385146866d..4e810766868 100644 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -20,25 +20,10 @@ LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src include $(topsrcdir)/config/config.mk ifneq ($(TARGET_CPU),x86_64) - ifndef GNU_CXX # FIXME: bug 413019 OS_COMPILE_CXXFLAGS += -GL- -CPPSRCS := xptcinvoke.cpp xptcstubs.cpp -else #!GNU_CXX -CPPSRCS := xptcinvoke_x86_gnu.cpp xptcstubs.cpp endif #!GNU_CXX - -else # !x86_64 - -ifndef GNU_CXX -CPPSRCS := xptcinvoke_x86_64.cpp xptcstubs_x86_64.cpp -ASFILES := xptcinvoke_asm_x86_64.asm xptcstubs_asm_x86_64.asm -else #!GNU_CXX -CPPSRCS := xptcinvoke_x86_64.cpp xptcstubs_x86_64_gnu.cpp -ASFILES := xptcinvoke_asm_x86_64_gnu.s -endif #!GNU_CXX - endif #!x86_64 # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/xpcom/reflect/xptcall/src/md/win32/moz.build b/xpcom/reflect/xptcall/src/md/win32/moz.build index 6834f25b09e..a2e00af0e95 100644 --- a/xpcom/reflect/xptcall/src/md/win32/moz.build +++ b/xpcom/reflect/xptcall/src/md/win32/moz.build @@ -6,3 +6,25 @@ MODULE = 'xpcom' +if CONFIG['TARGET_CPU'] == 'x86_64': + if CONFIG['GNU_CXX']: + CPP_SOURCES += [ + 'xptcinvoke_x86_64.cpp', + 'xptcstubs_x86_64_gnu.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke_x86_64.cpp', + 'xptcstubs_x86_64.cpp' + ] +else: + if CONFIG['GNU_CXX']: + CPP_SOURCES += [ + 'xptcinvoke_x86_gnu.cpp', + 'xptcstubs.cpp', + ] + else: + CPP_SOURCES += [ + 'xptcinvoke.cpp', + 'xptcstubs.cpp', + ] diff --git a/xpcom/reflect/xptcall/src/moz.build b/xpcom/reflect/xptcall/src/moz.build index b43ef207d23..74cfc8f2145 100644 --- a/xpcom/reflect/xptcall/src/moz.build +++ b/xpcom/reflect/xptcall/src/moz.build @@ -8,3 +8,7 @@ DIRS += ['md'] MODULE = 'xpcom' +CPP_SOURCES += [ + 'xptcall.cpp', +] + diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in index 3f7380229a5..fa3a321a372 100644 --- a/xpcom/reflect/xptcall/tests/Makefile.in +++ b/xpcom/reflect/xptcall/tests/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk SIMPLE_PROGRAMS = TestXPTCInvoke$(BIN_SUFFIX) -CPPSRCS = TestXPTCInvoke.cpp - LIBS = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ diff --git a/xpcom/reflect/xptcall/tests/moz.build b/xpcom/reflect/xptcall/tests/moz.build index 80d50d80051..aec51c0486f 100644 --- a/xpcom/reflect/xptcall/tests/moz.build +++ b/xpcom/reflect/xptcall/tests/moz.build @@ -6,3 +6,7 @@ MODULE = 'TestXPTC' +CPP_SOURCES += [ + 'TestXPTCInvoke.cpp', +] + diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in index 32db1475166..3d50fdd8602 100644 --- a/xpcom/reflect/xptinfo/src/Makefile.in +++ b/xpcom/reflect/xptinfo/src/Makefile.in @@ -14,14 +14,6 @@ LIBRARY_NAME = xptinfo MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 - -CPPSRCS = \ - xptiInterfaceInfo.cpp \ - xptiInterfaceInfoManager.cpp \ - xptiTypelibGuts.cpp \ - xptiWorkingSet.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/xpcom/reflect/xptinfo/src/moz.build b/xpcom/reflect/xptinfo/src/moz.build index 6834f25b09e..ef1b12f78a0 100644 --- a/xpcom/reflect/xptinfo/src/moz.build +++ b/xpcom/reflect/xptinfo/src/moz.build @@ -6,3 +6,10 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + 'xptiInterfaceInfo.cpp', + 'xptiInterfaceInfoManager.cpp', + 'xptiTypelibGuts.cpp', + 'xptiWorkingSet.cpp', +] + diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in index bcfee49c853..f403e5429c0 100644 --- a/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/xpcom/reflect/xptinfo/tests/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk SIMPLE_PROGRAMS = TestInterfaceInfo$(BIN_SUFFIX) -CPPSRCS = TestInterfaceInfo.cpp - LIBS = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ diff --git a/xpcom/reflect/xptinfo/tests/moz.build b/xpcom/reflect/xptinfo/tests/moz.build index 6834f25b09e..fc2afe98019 100644 --- a/xpcom/reflect/xptinfo/tests/moz.build +++ b/xpcom/reflect/xptinfo/tests/moz.build @@ -6,3 +6,7 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + 'TestInterfaceInfo.cpp', +] + diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in index f90904ff855..c986f22ded2 100644 --- a/xpcom/sample/Makefile.in +++ b/xpcom/sample/Makefile.in @@ -26,11 +26,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsSampleModule # CPPSRCS specifies C++ files to be built into a library. -CPPSRCS = \ - nsSample.cpp \ - nsSampleModule.cpp \ - $(NULL) - include $(topsrcdir)/config/config.mk # EXTRA_COMPONENTS installs components written JavaScript to diff --git a/xpcom/sample/moz.build b/xpcom/sample/moz.build index 7c13087278f..95fed80d632 100644 --- a/xpcom/sample/moz.build +++ b/xpcom/sample/moz.build @@ -12,3 +12,8 @@ XPIDL_SOURCES += ['nsISample.idl'] MODULE = 'xpcomsample' +CPP_SOURCES += [ + 'nsSample.cpp', + 'nsSampleModule.cpp', +] + diff --git a/xpcom/sample/program/Makefile.in b/xpcom/sample/program/Makefile.in index 84c42a1bc55..cbc5da718fa 100644 --- a/xpcom/sample/program/Makefile.in +++ b/xpcom/sample/program/Makefile.in @@ -10,10 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -# We must specify CPPSRCS in order to link using the proper c++ linker -# on certain platforms. -CPPSRCS = nsTestSample.cpp - # SIMPLE_PROGRAMS compiles a single .cpp file into an executable SIMPLE_PROGRAMS = nsTestSample$(BIN_SUFFIX) diff --git a/xpcom/sample/program/moz.build b/xpcom/sample/program/moz.build index 25406391c08..2535315b70e 100644 --- a/xpcom/sample/program/moz.build +++ b/xpcom/sample/program/moz.build @@ -6,3 +6,9 @@ MODULE = 'xpcomsample' +# We must specify CPP_SOURCES in order to link using the proper c++ linker +# on certain platforms. +CPP_SOURCES += [ + 'nsTestSample.cpp', +] + diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index a72e61846c6..4d65ac077da 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/string/src/Makefile.in @@ -15,30 +15,10 @@ LIBRARY_NAME = string_s MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 - -CPPSRCS = \ - nsDependentString.cpp \ - nsDependentSubstring.cpp \ - nsPromiseFlatString.cpp \ - nsReadableUtils.cpp \ - nsSubstring.cpp \ - nsSubstringTuple.cpp \ - nsString.cpp \ - nsStringComparator.cpp \ - nsStringObsolete.cpp \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 - -# Are we targeting x86 or x86-64? If so, compile the SSE2 functions for -# nsUTF8Utils.cpp. -ifneq (,$(INTEL_ARCHITECTURE)) -CPPSRCS += nsUTF8UtilsSSE2.cpp -endif - include $(topsrcdir)/config/rules.mk ifneq (,$(INTEL_ARCHITECTURE)) diff --git a/xpcom/string/src/moz.build b/xpcom/string/src/moz.build index 7810e69deea..610cb2b3ca5 100644 --- a/xpcom/string/src/moz.build +++ b/xpcom/string/src/moz.build @@ -6,3 +6,21 @@ MODULE = 'string' +CPP_SOURCES += [ + 'nsDependentString.cpp', + 'nsDependentSubstring.cpp', + 'nsPromiseFlatString.cpp', + 'nsReadableUtils.cpp', + 'nsString.cpp', + 'nsStringComparator.cpp', + 'nsStringObsolete.cpp', + 'nsSubstring.cpp', + 'nsSubstringTuple.cpp', +] + +# Are we targeting x86 or x86-64? If so, compile the SSE2 functions for +# nsUTF8Utils.cpp. +if CONFIG['INTEL_ARCHITECTURE']: + CPP_SOURCES += [ + 'nsUTF8UtilsSSE2.cpp', + ] diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index fb8c582dc83..c159c082fb4 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -14,7 +14,8 @@ FAIL_ON_WARNINGS = 1 VPATH += $(topsrcdir)/build -CPPSRCS = \ +# This can be deleted when SIMPLE_PROGRAMS is in moz.build +cppsrcs = \ nsIFileEnumerator.cpp \ TestCallTemplates.cpp \ TestINIParser.cpp \ @@ -27,18 +28,20 @@ CPPSRCS = \ TestQuickReturn.cpp \ TestArguments.cpp \ TestUnicodeArguments.cpp \ - $(STDCPPFLAGS) \ $(NULL) +# This can be deleted when SIMPLE_PROGRAMS is in moz.build ifeq ($(OS_TARGET),WINNT) -CPPSRCS += TestBase64.cpp +cppsrcs += TestBase64.cpp endif +# This can be deleted when SIMPLE_PROGRAMS is in moz.build ifdef WRAP_STL_INCLUDES -CPPSRCS += TestSTLWrappers.cpp +cppsrcs += TestSTLWrappers.cpp endif -SIMPLE_PROGRAMS := $(CPPSRCS:.cpp=$(BIN_SUFFIX)) +# TODO: Use CPPSRCS from moz.build +SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX)) CPP_UNIT_TESTS = \ ShowAlignments.cpp \ diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in index 1fd1bf6be2e..397f34c7f81 100644 --- a/xpcom/tests/bug656331_component/Makefile.in +++ b/xpcom/tests/bug656331_component/Makefile.in @@ -14,7 +14,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = test656331 IS_COMPONENT = 1 -CPPSRCS = TestComponent.cpp NO_DIST_INSTALL = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/bug656331_component/moz.build b/xpcom/tests/bug656331_component/moz.build index 895d11993cf..ea08641bb9c 100644 --- a/xpcom/tests/bug656331_component/moz.build +++ b/xpcom/tests/bug656331_component/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'TestComponent.cpp', +] + diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in index 9c970edfe57..8d67c1fb1e6 100644 --- a/xpcom/tests/component/Makefile.in +++ b/xpcom/tests/component/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = testcomponent IS_COMPONENT = 1 -CPPSRCS = TestComponent.cpp NO_DIST_INSTALL = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/component/moz.build b/xpcom/tests/component/moz.build index 895d11993cf..ea08641bb9c 100644 --- a/xpcom/tests/component/moz.build +++ b/xpcom/tests/component/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'TestComponent.cpp', +] + diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in index 5488c170cb2..3c7c29c39c2 100644 --- a/xpcom/tests/component_no_aslr/Makefile.in +++ b/xpcom/tests/component_no_aslr/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = testcompnoaslr IS_COMPONENT = 1 -CPPSRCS = TestComponent.cpp NO_DIST_INSTALL = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/component_no_aslr/moz.build b/xpcom/tests/component_no_aslr/moz.build index 895d11993cf..ea08641bb9c 100644 --- a/xpcom/tests/component_no_aslr/moz.build +++ b/xpcom/tests/component_no_aslr/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'TestComponent.cpp', +] + diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in index 0e55760cf17..444831f8aa6 100644 --- a/xpcom/tests/external/Makefile.in +++ b/xpcom/tests/external/Makefile.in @@ -9,10 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - TestMinStringAPI.cpp \ - $(NULL) - SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/rules.mk diff --git a/xpcom/tests/external/moz.build b/xpcom/tests/external/moz.build index 6834f25b09e..2322c4c0e68 100644 --- a/xpcom/tests/external/moz.build +++ b/xpcom/tests/external/moz.build @@ -6,3 +6,7 @@ MODULE = 'xpcom' +CPP_SOURCES += [ + 'TestMinStringAPI.cpp', +] + diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build index 7a4ac343952..ea3f5a2c62c 100644 --- a/xpcom/tests/moz.build +++ b/xpcom/tests/moz.build @@ -14,9 +14,34 @@ DIRS += [ if CONFIG['OS_ARCH'] == 'WINNT': DIRS += ['windows'] +if CONFIG['OS_TARGET'] == 'WINNT': + CPP_SOURCES += [ + 'TestBase64.cpp', + ] + +if CONFIG['WRAP_STL_INCLUDES']: + CPP_SOURCES += [ + 'TestSTLWrappers.cpp', + ] + if CONFIG['DEHYDRA_PATH']: DIRS += ['static-checker'] MODULE = 'xpcom' XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +CPP_SOURCES += [ + 'TestArguments.cpp', + 'TestBlockingProcess.cpp', + 'TestCallTemplates.cpp', + 'TestINIParser.cpp', + 'TestPRIntN.cpp', + 'TestQuickReturn.cpp', + 'TestRacingServiceManager.cpp', + 'TestRegistrationOrder.cpp', + 'TestThreadPoolListener.cpp', + 'TestTimers.cpp', + 'TestUnicodeArguments.cpp', + 'nsIFileEnumerator.cpp', +] diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index fefce898d55..25213f131e8 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -15,19 +15,6 @@ MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1 -CPPSRCS = \ - nsEventQueue.cpp \ - nsEnvironment.cpp \ - nsThread.cpp \ - nsThreadManager.cpp \ - nsThreadPool.cpp \ - nsProcessCommon.cpp \ - nsTimerImpl.cpp \ - TimerThread.cpp \ - HangMonitor.cpp \ - LazyIdleThread.cpp \ - $(NULL) - LOCAL_INCLUDES = -I$(srcdir)/../components # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build index 93f83cbc937..a2add854967 100644 --- a/xpcom/threads/moz.build +++ b/xpcom/threads/moz.build @@ -34,3 +34,16 @@ EXPORTS.mozilla += [ 'SyncRunnable.h', ] +CPP_SOURCES += [ + 'HangMonitor.cpp', + 'LazyIdleThread.cpp', + 'TimerThread.cpp', + 'nsEnvironment.cpp', + 'nsEventQueue.cpp', + 'nsProcessCommon.cpp', + 'nsThread.cpp', + 'nsThreadManager.cpp', + 'nsThreadPool.cpp', + 'nsTimerImpl.cpp', +] + diff --git a/xpcom/windbgdlg/Makefile.in b/xpcom/windbgdlg/Makefile.in index 66f3b78b2df..84ba53e9f4c 100644 --- a/xpcom/windbgdlg/Makefile.in +++ b/xpcom/windbgdlg/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk SIMPLE_PROGRAMS = windbgdlg$(BIN_SUFFIX) -CPPSRCS = windbgdlg.cpp - MOZ_WINCONSOLE = 0 include $(topsrcdir)/config/rules.mk diff --git a/xpcom/windbgdlg/moz.build b/xpcom/windbgdlg/moz.build index 895d11993cf..636b15baeef 100644 --- a/xpcom/windbgdlg/moz.build +++ b/xpcom/windbgdlg/moz.build @@ -4,3 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +CPP_SOURCES += [ + 'windbgdlg.cpp', +] + diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 945647569a5..26e00c1e6bc 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -17,18 +17,6 @@ MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 - -CPPSRCS = \ - nsChromeTreeOwner.cpp \ - nsContentTreeOwner.cpp \ - nsXULWindow.cpp \ - nsAppShellService.cpp \ - nsAppShellWindowEnumerator.cpp \ - nsWebShellWindow.cpp \ - nsWindowMediator.cpp \ - nsAppShellFactory.cpp \ - $(NULL) - LOCAL_INCLUDES += -I$(topsrcdir)/dom/base include $(topsrcdir)/config/rules.mk diff --git a/xpfe/appshell/src/moz.build b/xpfe/appshell/src/moz.build index 5a8c8ba4b40..2f28ba64eb3 100644 --- a/xpfe/appshell/src/moz.build +++ b/xpfe/appshell/src/moz.build @@ -8,3 +8,14 @@ PARALLEL_DIRS += ['test'] MODULE = 'appshell' +CPP_SOURCES += [ + 'nsAppShellFactory.cpp', + 'nsAppShellService.cpp', + 'nsAppShellWindowEnumerator.cpp', + 'nsChromeTreeOwner.cpp', + 'nsContentTreeOwner.cpp', + 'nsWebShellWindow.cpp', + 'nsWindowMediator.cpp', + 'nsXULWindow.cpp', +] + diff --git a/xpfe/components/autocomplete/src/Makefile.in b/xpfe/components/autocomplete/src/Makefile.in index 190554bbf73..50f34e47e7c 100644 --- a/xpfe/components/autocomplete/src/Makefile.in +++ b/xpfe/components/autocomplete/src/Makefile.in @@ -16,6 +16,4 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 -CPPSRCS = nsAutoComplete.cpp - include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/autocomplete/src/moz.build b/xpfe/components/autocomplete/src/moz.build index 7a0dc1af86b..818e194dfbd 100644 --- a/xpfe/components/autocomplete/src/moz.build +++ b/xpfe/components/autocomplete/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'appcomps' +CPP_SOURCES += [ + 'nsAutoComplete.cpp', +] + diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index 7e02dc33c81..1b9ad6cbe90 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -17,8 +17,6 @@ MODULE_NAME = application LIBXUL_LIBRARY = 1 -CPPSRCS = nsModule.cpp - include $(topsrcdir)/config/config.mk # General includes diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build index 7a0dc1af86b..d8dc7b191cf 100644 --- a/xpfe/components/build/moz.build +++ b/xpfe/components/build/moz.build @@ -6,3 +6,7 @@ MODULE = 'appcomps' +CPP_SOURCES += [ + 'nsModule.cpp', +] + diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in index 20ae59b573b..1d517273057 100644 --- a/xpfe/components/directory/Makefile.in +++ b/xpfe/components/directory/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = directory_s LIBXUL_LIBRARY = 1 -CPPSRCS = nsDirectoryViewer.cpp - # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 diff --git a/xpfe/components/directory/moz.build b/xpfe/components/directory/moz.build index 44090a37d33..0dfa763de14 100644 --- a/xpfe/components/directory/moz.build +++ b/xpfe/components/directory/moz.build @@ -12,3 +12,7 @@ XPIDL_MODULE = 'directory' MODULE = 'appcomps' +CPP_SOURCES += [ + 'nsDirectoryViewer.cpp', +] + diff --git a/xpfe/components/windowds/Makefile.in b/xpfe/components/windowds/Makefile.in index 8763d335050..e71f36c9a18 100644 --- a/xpfe/components/windowds/Makefile.in +++ b/xpfe/components/windowds/Makefile.in @@ -17,6 +17,4 @@ IS_COMPONENT = 1 EXPORT_LIBRARY = 1 -CPPSRCS = nsWindowDataSource.cpp - include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/windowds/moz.build b/xpfe/components/windowds/moz.build index c0588770209..dd92bb79069 100644 --- a/xpfe/components/windowds/moz.build +++ b/xpfe/components/windowds/moz.build @@ -12,3 +12,7 @@ XPIDL_MODULE = 'windowds' MODULE = 'appcomps' +CPP_SOURCES += [ + 'nsWindowDataSource.cpp', +] + diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index 682c0f7ed86..261c59b8797 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -24,8 +24,6 @@ endif DEFINES += -DXPCOM_GLUE STL_FLAGS= -CPPSRCS = nsXULRunnerApp.cpp - LOCAL_INCLUDES += \ -I$(topsrcdir)/toolkit/xre \ -I$(topsrcdir)/toolkit/profile \ diff --git a/xulrunner/app/moz.build b/xulrunner/app/moz.build index e04698d04a5..899371b313c 100644 --- a/xulrunner/app/moz.build +++ b/xulrunner/app/moz.build @@ -8,3 +8,6 @@ DIRS += ['profile'] PROGRAM = 'xulrunner' +CPP_SOURCES += [ + 'nsXULRunnerApp.cpp', +] diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in index 4e5dfa376b7..42828eb9151 100644 --- a/xulrunner/examples/simple/components/src/Makefile.in +++ b/xulrunner/examples/simple/components/src/Makefile.in @@ -15,8 +15,6 @@ LIBRARY_NAME = simpletest SHORT_LIBNAME = simpltst IS_COMPONENT = 1 -CPPSRCS = SimpleTest.cpp - EXTRA_DSO_LDOPTS = \ $(XPCOM_GLUE_LDOPTS) \ $(NSPR_LIBS) \ diff --git a/xulrunner/examples/simple/components/src/moz.build b/xulrunner/examples/simple/components/src/moz.build index 9b0b10f4630..c7d8893a482 100644 --- a/xulrunner/examples/simple/components/src/moz.build +++ b/xulrunner/examples/simple/components/src/moz.build @@ -6,3 +6,7 @@ MODULE = 'simple' +CPP_SOURCES += [ + 'SimpleTest.cpp', +] + diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in index 9a986de4a2f..512d81f001f 100644 --- a/xulrunner/stub/Makefile.in +++ b/xulrunner/stub/Makefile.in @@ -14,8 +14,6 @@ USE_STATIC_LIBS = 1 # Don't create a dependency on mozglue MOZ_GLUE_LDFLAGS = -CPPSRCS = nsXULStub.cpp - LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/build \ -I$(topsrcdir)/xpcom/base \ diff --git a/xulrunner/stub/moz.build b/xulrunner/stub/moz.build index fa5010a619c..09ade215127 100644 --- a/xulrunner/stub/moz.build +++ b/xulrunner/stub/moz.build @@ -12,3 +12,6 @@ MODULE = 'xulrunner' # for Mac OS X and 'xulrunner-stub' for all other platforms. PROGRAM = CONFIG['XULRUNNER_STUB_NAME'] +CPP_SOURCES += [ + 'nsXULStub.cpp', +] diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in index 059bf89c6d9..e4829273248 100644 --- a/xulrunner/tools/redit/Makefile.in +++ b/xulrunner/tools/redit/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifeq ($(OS_ARCH),WINNT) -CPPSRCS = redit.cpp SDK_BINARY = \ $(PROGRAM) \ diff --git a/xulrunner/tools/redit/moz.build b/xulrunner/tools/redit/moz.build index f72e38e3e81..390a21a030c 100644 --- a/xulrunner/tools/redit/moz.build +++ b/xulrunner/tools/redit/moz.build @@ -8,3 +8,6 @@ MODULE = 'redit' if CONFIG['OS_ARCH'] == 'WINNT': PROGRAM = 'redit' + CPP_SOURCES += [ + 'redit.cpp', + ]