Bug 906619 - Part a: Move unconditional CSRCS to moz.build; r=mshal
authorMs2ger <ms2ger@gmail.com>
Thu, 22 Aug 2013 08:56:02 +0200
changeset 156683 884ced1e6cb7f056c5b8fd14cacae37a553e23f0
parent 156682 4a66e5d6386ba624a7a621517dd9b6f070819cf8
child 156684 169e13a5298583917e430398c8adcd593d814ca5
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs906619
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 906619 - Part a: Move unconditional CSRCS to moz.build; r=mshal
build/unix/elfhack/Makefile.in
build/unix/elfhack/moz.build
db/sqlite3/src/Makefile.in
db/sqlite3/src/moz.build
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/cairo/src/moz.build
gfx/cairo/libpixman/src/Makefile.in
gfx/cairo/libpixman/src/moz.build
gfx/qcms/Makefile.in
gfx/qcms/moz.build
image/decoders/Makefile.in
image/decoders/moz.build
intl/hyphenation/src/Makefile.in
intl/hyphenation/src/moz.build
intl/uconv/util/Makefile.in
intl/uconv/util/moz.build
intl/unicharutil/tools/Makefile.in
intl/unicharutil/tools/moz.build
js/src/editline/Makefile.in
js/src/editline/moz.build
media/libspeex_resampler/src/Makefile.in
media/libspeex_resampler/src/moz.build
media/libtheora/lib/Makefile.in
media/libtheora/lib/moz.build
media/libtremor/lib/Makefile.in
media/libtremor/lib/moz.build
media/libvorbis/lib/Makefile.in
media/libvorbis/lib/moz.build
media/libvpx/Makefile.in
media/libvpx/moz.build
modules/libbz2/src/Makefile.in
modules/libbz2/src/moz.build
modules/libmar/sign/Makefile.in
modules/libmar/sign/moz.build
modules/libmar/src/Makefile.in
modules/libmar/src/moz.build
modules/libmar/verify/Makefile.in
modules/libmar/verify/moz.build
other-licenses/android/Makefile.in
other-licenses/android/moz.build
parser/expat/lib/Makefile.in
parser/expat/lib/moz.build
security/manager/ssl/src/Makefile.in
security/manager/ssl/src/moz.build
widget/gtk2/Makefile.in
widget/gtk2/moz.build
widget/shared/x11/Makefile.in
widget/shared/x11/moz.build
xpcom/base/Makefile.in
xpcom/base/moz.build
xpcom/typelib/xpt/src/Makefile.in
xpcom/typelib/xpt/src/moz.build
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -19,21 +19,16 @@ VPATH += $(topsrcdir)/build
 
 HOST_CPPSRCS = \
   elf.cpp \
   elfhack.cpp \
   $(NULL)
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 
-CSRCS := \
-  test-ctors.c \
-  test-array.c \
-  $(NULL)
-
 ifndef CROSS_COMPILE
 CSRCS += dummy.c
 endif
 
 WRAP_LDFLAGS=
 
 include $(topsrcdir)/config/rules.mk
 
--- a/build/unix/elfhack/moz.build
+++ b/build/unix/elfhack/moz.build
@@ -1,8 +1,14 @@
 # -*- 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/.
 
 NO_DIST_INSTALL = True
 DIRS += ['inject']
+
+CSRCS += [
+    'test-array.c',
+    'test-ctors.c',
+]
+
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -55,20 +55,16 @@ MODULE_OPTIMIZE_FLAGS = -O2
 endif
 
 # Force /O2 optimisation on Windows because using the default /O1 causes
 # crashes with MSVC2005 and PGO. See bug 719584.
 ifeq ($(OS_ARCH),WINNT)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 
-CSRCS = \
-  sqlite3.c \
-  $(NULL)
-
 # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
 # don't have to vacuum to make sure the data is not visible in the file.
 # -DSQLITE_ENABLE_FTS3=1 enables the full-text index module.
 # -DSQLITE_CORE=1 statically links that module into the SQLite library.
 # -DSQLITE_DEFAULT_PAGE_SIZE=32768 and SQLITE_MAX_DEFAULT_PAGE_SIZE=32768
 # increases the page size from 1k, see bug 416330.  It must be kept in sync with
 # the value of PREF_TS_PAGESIZE_DEFAULT in mozStorageService.cpp.  The value can
 # be overridden on a per-platform basis through the use of the PREF_TS_PAGESIZE
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -7,8 +7,12 @@
 MODULE = 'sqlite3'
 
 EXPORTS += [
     'sqlite3.h',
 ]
 
 LIBRARY_NAME = 'mozsqlite3'
 
+CSRCS += [
+    'sqlite3.c',
+]
+
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -11,89 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 ifdef GNU_CC
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif
 
 
-CSRCS   = \
-        cairo.c \
-        cairo-analysis-surface.c \
-        cairo-arc.c \
-        cairo-array.c \
-	cairo-atomic.c \
-        cairo-base64-stream.c \
-        cairo-bentley-ottmann.c \
-	cairo-bentley-ottmann-rectilinear.c \
-	cairo-bentley-ottmann-rectangular.c \
-	cairo-botor-scan-converter.c \
-	cairo-boxes.c \
-	cairo-cache.c \
-        cairo-clip.c \
-        cairo-color.c \
-	cairo-composite-rectangles.c \
-        cairo-debug.c \
-	cairo-device.c \
-        cairo-fixed.c \
-	cairo-font-face.c \
-	cairo-font-face-twin.c \
-	cairo-font-face-twin-data.c \
-        cairo-font-options.c \
-	cairo-freed-pool.c \
-        cairo-freelist.c \
-        cairo-gstate.c \
-        cairo-hash.c \
-        cairo-hull.c \
-	cairo-image-info.c \
-        cairo-image-surface.c \
-        cairo-lzw.c \
-        cairo-matrix.c \
-	cairo-misc.c \
-	cairo-mutex.c \
-	cairo-observer.c \
-        cairo-output-stream.c \
-        cairo-paginated-surface.c \
-        cairo-path.c \
-        cairo-path-bounds.c \
-        cairo-path-fill.c \
-        cairo-path-fixed.c \
-        cairo-path-in-fill.c \
-        cairo-path-stroke.c \
-        cairo-pattern.c \
-        cairo-pen.c \
-        cairo-polygon.c \
-	cairo-recording-surface.c \
-        cairo-rectangle.c \
-	cairo-rectangular-scan-converter.c \
-        cairo-region.c \
-        cairo-scaled-font.c \
-        cairo-scaled-font-subsets.c \
-        cairo-slope.c \
-        cairo-spans.c \
-        cairo-spline.c \
-        cairo-stroke-style.c \
-        cairo-surface.c \
-	cairo-surface-clipper.c \
-        cairo-surface-fallback.c \
-	cairo-surface-offset.c \
-	cairo-surface-snapshot.c \
-	cairo-surface-subsurface.c \
-	cairo-surface-wrapper.c \
-	cairo-tee-surface.c \
-        cairo-tor-scan-converter.c \
-        cairo-toy-font-face.c \
-        cairo-traps.c \
-        cairo-unicode.c \
-	cairo-user-font.c \
-	cairo-version.c \
-        cairo-wideint.c \
-        $(NULL)
-
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CSRCS += cairo-deflate-stream.c
 endif
 
 # cairo-type1-subset.c should be here, but it's only supported on freetype platforms
 
 PSPDF_BASE_CSRCS = \
 	cairo-base85-stream.c \
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -77,10 +77,83 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     EXPORTS.cairo += [
         'cairo-ft.h',
     ]
 
 LIBRARY_NAME = 'mozcairo'
 
 LIBXUL_LIBRARY = True
 
+CSRCS += [
+    'cairo-analysis-surface.c',
+    'cairo-arc.c',
+    'cairo-array.c',
+    'cairo-atomic.c',
+    'cairo-base64-stream.c',
+    'cairo-bentley-ottmann-rectangular.c',
+    'cairo-bentley-ottmann-rectilinear.c',
+    'cairo-bentley-ottmann.c',
+    'cairo-botor-scan-converter.c',
+    'cairo-boxes.c',
+    'cairo-cache.c',
+    'cairo-clip.c',
+    'cairo-color.c',
+    'cairo-composite-rectangles.c',
+    'cairo-debug.c',
+    'cairo-device.c',
+    'cairo-fixed.c',
+    'cairo-font-face-twin-data.c',
+    'cairo-font-face-twin.c',
+    'cairo-font-face.c',
+    'cairo-font-options.c',
+    'cairo-freed-pool.c',
+    'cairo-freelist.c',
+    'cairo-gstate.c',
+    'cairo-hash.c',
+    'cairo-hull.c',
+    'cairo-image-info.c',
+    'cairo-image-surface.c',
+    'cairo-lzw.c',
+    'cairo-matrix.c',
+    'cairo-misc.c',
+    'cairo-mutex.c',
+    'cairo-observer.c',
+    'cairo-output-stream.c',
+    'cairo-paginated-surface.c',
+    'cairo-path-bounds.c',
+    'cairo-path-fill.c',
+    'cairo-path-fixed.c',
+    'cairo-path-in-fill.c',
+    'cairo-path-stroke.c',
+    'cairo-path.c',
+    'cairo-pattern.c',
+    'cairo-pen.c',
+    'cairo-polygon.c',
+    'cairo-recording-surface.c',
+    'cairo-rectangle.c',
+    'cairo-rectangular-scan-converter.c',
+    'cairo-region.c',
+    'cairo-scaled-font-subsets.c',
+    'cairo-scaled-font.c',
+    'cairo-slope.c',
+    'cairo-spans.c',
+    'cairo-spline.c',
+    'cairo-stroke-style.c',
+    'cairo-surface-clipper.c',
+    'cairo-surface-fallback.c',
+    'cairo-surface-offset.c',
+    'cairo-surface-snapshot.c',
+    'cairo-surface-subsurface.c',
+    'cairo-surface-wrapper.c',
+    'cairo-surface.c',
+    'cairo-tee-surface.c',
+    'cairo-tor-scan-converter.c',
+    'cairo-toy-font-face.c',
+    'cairo-traps.c',
+    'cairo-unicode.c',
+    'cairo-user-font.c',
+    'cairo-version.c',
+    'cairo-wideint.c',
+    'cairo.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -78,49 +78,16 @@ ifdef HAVE_ARM_NEON
 USE_ARM_NEON_GCC=1
 endif
 endif
 endif
 
 endif
 
 
-CSRCS	= \
-	pixman-access.c \
-	pixman-access-accessors.c \
-	pixman-arm.c \
-	pixman-bits-image.c \
-	pixman.c \
-	pixman-combine16.c \
-	pixman-combine32.c \
-	pixman-combine-float.c \
-	pixman-conical-gradient.c \
-	pixman-edge.c \
-	pixman-edge-accessors.c \
-	pixman-fast-path.c \
-	pixman-filter.c \
-	pixman-general.c \
-	pixman-gradient-walker.c \
-	pixman-glyph.c \
-	pixman-image.c \
-	pixman-implementation.c \
-	pixman-linear-gradient.c \
-	pixman-matrix.c \
-	pixman-mips.c \
-	pixman-noop.c \
-	pixman-ppc.c \
-	pixman-radial-gradient.c \
-	pixman-region16.c \
-	pixman-region32.c \
-	pixman-solid-fill.c \
-	pixman-trap.c \
-	pixman-utils.c \
-	pixman-x86.c \
-	$(NULL)
-
 ifdef USE_MMX
 CSRCS += pixman-mmx.c
 DEFINES += -DUSE_MMX
 endif
 
 ifdef USE_SSE2
 CSRCS += pixman-sse2.c
 DEFINES += -DUSE_SSE -DUSE_SSE2
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -24,10 +24,43 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CON
     if CONFIG['HAVE_ARM_SIMD']:
         SSRCS += [
             'pixman-arm-simd-asm-scaled.S',
             'pixman-arm-simd-asm.S',
         ]
 
 LIBXUL_LIBRARY = True
 
+CSRCS += [
+    'pixman-access-accessors.c',
+    'pixman-access.c',
+    'pixman-arm.c',
+    'pixman-bits-image.c',
+    'pixman-combine-float.c',
+    'pixman-combine16.c',
+    'pixman-combine32.c',
+    'pixman-conical-gradient.c',
+    'pixman-edge-accessors.c',
+    'pixman-edge.c',
+    'pixman-fast-path.c',
+    'pixman-filter.c',
+    'pixman-general.c',
+    'pixman-glyph.c',
+    'pixman-gradient-walker.c',
+    'pixman-image.c',
+    'pixman-implementation.c',
+    'pixman-linear-gradient.c',
+    'pixman-matrix.c',
+    'pixman-mips.c',
+    'pixman-noop.c',
+    'pixman-ppc.c',
+    'pixman-radial-gradient.c',
+    'pixman-region16.c',
+    'pixman-region32.c',
+    'pixman-solid-fill.c',
+    'pixman-trap.c',
+    'pixman-utils.c',
+    'pixman-x86.c',
+    'pixman.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -4,24 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS = \
-  chain.c \
-  iccread.c \
-  matrix.c \
-  transform.c \
-  transform_util.c \
-  $(NULL)
-
 ifeq (86,$(findstring 86,$(OS_TEST)))
 CSRCS += transform-sse2.c
 ifdef _MSC_VER
 ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64)
 	CSRCS += transform-sse1.c
 endif
 else
 	CSRCS += transform-sse1.c
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -10,10 +10,18 @@ EXPORTS += [
     'qcms.h',
     'qcmstypes.h',
 ]
 
 LIBRARY_NAME = 'mozqcms'
 
 LIBXUL_LIBRARY = True
 
+CSRCS += [
+    'chain.c',
+    'iccread.c',
+    'matrix.c',
+    'transform.c',
+    'transform_util.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -5,19 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS   = iccjpeg.c \
-          $(NULL)
-
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 # PNG read/write stuff
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
 
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -35,8 +35,12 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'imgdecoders_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+CSRCS += [
+    'iccjpeg.c',
+]
+
deleted file mode 100644
--- a/intl/hyphenation/src/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-CSRCS            = hyphen.c \
-                   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -11,10 +11,14 @@ CPP_SOURCES += [
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
 LIBRARY_NAME = 'hyphenation_s'
 
 LIBXUL_LIBRARY = True
 
+CSRCS += [
+    'hyphen.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -6,16 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-CSRCS		= \
-		ugen.c \
-		uscan.c \
-		umap.c \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/util/moz.build
+++ b/intl/uconv/util/moz.build
@@ -12,10 +12,16 @@ CPP_SOURCES += [
     'nsUnicodeDecodeHelper.cpp',
     'nsUnicodeEncodeHelper.cpp',
 ]
 
 LIBRARY_NAME = 'ucvutil_s'
 
 LIBXUL_LIBRARY = True
 
+CSRCS += [
+    'ugen.c',
+    'umap.c',
+    'uscan.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/intl/unicharutil/tools/Makefile.in
+++ b/intl/unicharutil/tools/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS		= ucgendat.c
-
 # XXX need configure test
 EX_LIBS		= $(shell $(GLIB_CONFIG) --libs)
 
 include $(topsrcdir)/config/rules.mk
 
 # XXX replace with proper configure test for glib
 CFLAGS		+= $(shell $(GLIB_CONFIG) --cflags)
 
--- a/intl/unicharutil/tools/moz.build
+++ b/intl/unicharutil/tools/moz.build
@@ -3,8 +3,12 @@
 # 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/.
 
 MODULE = 'ucgendat'
 
 PROGRAM = 'ucgendat'
 
+CSRCS += [
+    'ucgendat.c',
+]
+
--- a/js/src/editline/Makefile.in
+++ b/js/src/editline/Makefile.in
@@ -8,14 +8,12 @@ DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 
-CSRCS = editline.c sysunix.c
-
 DEFINES += -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX \
 	-DHAVE_STDLIB -DUNIQUE_HISTORY
 
 include $(topsrcdir)/config/rules.mk
--- a/js/src/editline/moz.build
+++ b/js/src/editline/moz.build
@@ -1,8 +1,13 @@
 # -*- 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/.
 
 LIBRARY_NAME = 'editline'
 
+CSRCS += [
+    'editline.c',
+    'sysunix.c',
+]
+
--- a/media/libspeex_resampler/src/Makefile.in
+++ b/media/libspeex_resampler/src/Makefile.in
@@ -20,20 +20,16 @@ DEFINES += -DRANDOM_PREFIX=speex
 DEFINES += -DSPX_RESAMPLE_EXPORT=
 
 ifeq ($(OS_TARGET),Android)
 DEFINES += -DFIXED_POINT
 else
 DEFINES += -DFLOATING_POINT
 endif
 
-CSRCS = \
-    resample.c \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 # Only use SSE code when using floating point samples, and on x86
 ifneq (,$(INTEL_ARCHITECTURE))
 ifneq ($(OS_TARGET),Android)
 DEFINES += -D_USE_SSE -D_USE_SSE2
 ifdef GNU_CC
 resample.$(OBJ_SUFFIX): CFLAGS+=-msse2
--- a/media/libspeex_resampler/src/moz.build
+++ b/media/libspeex_resampler/src/moz.build
@@ -13,10 +13,14 @@ EXPORTS.speex += [
 ]
 
 CPP_SOURCES += [
   'sse_detect.cpp',
 ]
 
 LIBRARY_NAME = 'speex_resampler'
 
+CSRCS += [
+    'resample.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -24,32 +24,16 @@ ifeq (64,$(findstring 64,$(OS_TEST)))
 DEFINES += -DOC_X86_64_ASM
 endif
 endif
 endif
 endif
 
 VPATH := $(srcdir)
 
-CSRCS = \
-  apiwrapper.c \
-  bitpack.c \
-  decapiwrapper.c \
-  decinfo.c \
-  decode.c \
-  dequant.c \
-  fragment.c \
-  huffdec.c \
-  idct.c \
-  info.c \
-  internal.c \
-  quant.c \
-  state.c \
-  $(NULL)
-
 ifeq ($(findstring 86,$(OS_TEST)), 86)
 ifdef _MSC_VER
 ifneq (64,$(findstring 64,$(OS_TEST)))
 VPATH += $(srcdir)/x86_vc
 
 CSRCS += \
   mmxidct.c \
   mmxfrag.c \
--- a/media/libtheora/lib/moz.build
+++ b/media/libtheora/lib/moz.build
@@ -3,10 +3,26 @@
 # 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/.
 
 MODULE = 'theora'
 
 LIBRARY_NAME = 'theora'
 
+CSRCS += [
+    'apiwrapper.c',
+    'bitpack.c',
+    'decapiwrapper.c',
+    'decinfo.c',
+    'decode.c',
+    'dequant.c',
+    'fragment.c',
+    'huffdec.c',
+    'idct.c',
+    'info.c',
+    'internal.c',
+    'quant.c',
+    'state.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/media/libtremor/lib/Makefile.in
+++ b/media/libtremor/lib/Makefile.in
@@ -7,31 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir  = @srcdir@
 VPATH  = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB= 1
 LOCAL_INCLUDES += -I$(topsrcdir)/media/libtremor/include/tremor
 
-CSRCS  = \
-  tremor_block.c \
-  tremor_codebook.c \
-  tremor_floor1.c \
-  tremor_floor0.c \
-  tremor_info.c \
-  tremor_mapping0.c \
-  tremor_mdct.c \
-  tremor_registry.c \
-  tremor_res012.c \
-  tremor_sharedbook.c \
-  tremor_synthesis.c \
-  tremor_window.c \
-  $(NULL) 
-
 ifeq ($(OS_ARCH),AIX)
 DEFINES += -Dalloca=__alloca
 endif
 
 ifeq (arm_1_, $(TARGET_CPU)_$(GNU_CC)_$(MOZ_THUMB2))
 DEFINES += -D_ARM_ASSEM_
 endif
 
--- a/media/libtremor/lib/moz.build
+++ b/media/libtremor/lib/moz.build
@@ -3,8 +3,23 @@
 # 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/.
 
 MODULE = 'tremor'
 
 LIBRARY_NAME = 'tremor'
 
+CSRCS += [
+    'tremor_block.c',
+    'tremor_codebook.c',
+    'tremor_floor0.c',
+    'tremor_floor1.c',
+    'tremor_info.c',
+    'tremor_mapping0.c',
+    'tremor_mdct.c',
+    'tremor_registry.c',
+    'tremor_res012.c',
+    'tremor_sharedbook.c',
+    'tremor_synthesis.c',
+    'tremor_window.c',
+]
+
--- a/media/libvorbis/lib/Makefile.in
+++ b/media/libvorbis/lib/Makefile.in
@@ -9,36 +9,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
-CSRCS		= \
-		vorbis_mdct.c \
-		vorbis_smallft.c \
-		vorbis_block.c \
-		vorbis_info.c \
-		vorbis_envelope.c \
-		vorbis_window.c \
-		vorbis_lsp.c \
-		vorbis_lpc.c \
-		vorbis_analysis.c \
-		vorbis_synthesis.c \
-		vorbis_psy.c \
-		vorbis_floor1.c \
-		vorbis_floor0.c \
-		vorbis_res0.c \
-		vorbis_mapping0.c \
-		vorbis_registry.c \
-		vorbis_codebook.c \
-		vorbis_sharedbook.c \
-		vorbis_lookup.c \
-		vorbis_bitrate.c \
-		$(NULL)
-
 ifeq ($(OS_ARCH),AIX)
 DEFINES += -Dalloca=__alloca
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/media/libvorbis/lib/moz.build
+++ b/media/libvorbis/lib/moz.build
@@ -3,10 +3,33 @@
 # 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/.
 
 MODULE = 'vorbis'
 
 LIBRARY_NAME = 'vorbis'
 
+CSRCS += [
+    'vorbis_analysis.c',
+    'vorbis_bitrate.c',
+    'vorbis_block.c',
+    'vorbis_codebook.c',
+    'vorbis_envelope.c',
+    'vorbis_floor0.c',
+    'vorbis_floor1.c',
+    'vorbis_info.c',
+    'vorbis_lookup.c',
+    'vorbis_lpc.c',
+    'vorbis_lsp.c',
+    'vorbis_mapping0.c',
+    'vorbis_mdct.c',
+    'vorbis_psy.c',
+    'vorbis_registry.c',
+    'vorbis_res0.c',
+    'vorbis_sharedbook.c',
+    'vorbis_smallft.c',
+    'vorbis_synthesis.c',
+    'vorbis_window.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -61,68 +61,16 @@ VPATH += \
   $(NULL)
 
 #Setup the libvpx assembler config.
 AS=$(VPX_AS)
 ASFLAGS=$(VPX_ASFLAGS) -I. -I$(topsrcdir)/media/libvpx/ -I$(topsrcdir)/media/libvpx/vpx_ports/
 AS_DASH_C_FLAG=$(VPX_DASH_C_FLAG)
 ASM_SUFFIX=$(VPX_ASM_SUFFIX)
 
-CSRCS += \
-  vpx_config_c.c \
-  vp8_dx_iface.c \
-  alloccommon.c \
-  blockd.c \
-  debugmodes.c \
-  dequantize.c \
-  entropy.c \
-  entropymode.c \
-  entropymv.c \
-  extend.c \
-  filter.c \
-  findnearmv.c \
-  idct_blk.c \
-  idctllm.c \
-  loopfilter.c \
-  loopfilter_filters.c \
-  mbpitch.c \
-  modecont.c \
-  modecontext.c \
-  postproc.c \
-  quant_common.c \
-  reconinter.c \
-  reconintra.c \
-  reconintra4x4.c \
-  sad_c.c \
-  setupintrarecon.c \
-  swapyv12buffer.c \
-  treecoder.c \
-  variance_c.c \
-  systemdependent.c \
-  dboolhuff.c \
-  decodemv.c \
-  decodframe.c \
-  detokenize.c \
-  reconintra_mt.c \
-  onyxd_if.c \
-  threading.c \
-  dsystemdependent.c \
-  vpx_codec.c \
-  vpx_decoder.c \
-  vpx_decoder_compat.c \
-  vpx_encoder.c \
-  vpx_image.c \
-  vpx_mem.c \
-  gen_scalers.c \
-  vpxscale.c \
-  scalesystemdependent.c \
-  yv12config.c \
-  yv12extend.c \
-  $(NULL)
-
 ifdef MOZ_VP8_ERROR_CONCEALMENT
 CSRCS += \
   error_concealment.c \
   $(NULL)
 endif
 
 ifdef MOZ_VP8_ENCODER
 VPATH += \
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -33,10 +33,62 @@ EXPORTS.vpx += [
 
 if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:
     HOST_CSRCS += [
         'obj_int_extract.c',
     ]
 
 LIBRARY_NAME = 'vpx'
 
+CSRCS += [
+    'alloccommon.c',
+    'blockd.c',
+    'dboolhuff.c',
+    'debugmodes.c',
+    'decodemv.c',
+    'decodframe.c',
+    'dequantize.c',
+    'detokenize.c',
+    'dsystemdependent.c',
+    'entropy.c',
+    'entropymode.c',
+    'entropymv.c',
+    'extend.c',
+    'filter.c',
+    'findnearmv.c',
+    'gen_scalers.c',
+    'idct_blk.c',
+    'idctllm.c',
+    'loopfilter.c',
+    'loopfilter_filters.c',
+    'mbpitch.c',
+    'modecont.c',
+    'modecontext.c',
+    'onyxd_if.c',
+    'postproc.c',
+    'quant_common.c',
+    'reconinter.c',
+    'reconintra.c',
+    'reconintra4x4.c',
+    'reconintra_mt.c',
+    'sad_c.c',
+    'scalesystemdependent.c',
+    'setupintrarecon.c',
+    'swapyv12buffer.c',
+    'systemdependent.c',
+    'threading.c',
+    'treecoder.c',
+    'variance_c.c',
+    'vp8_dx_iface.c',
+    'vpx_codec.c',
+    'vpx_config_c.c',
+    'vpx_decoder.c',
+    'vpx_decoder_compat.c',
+    'vpx_encoder.c',
+    'vpx_image.c',
+    'vpx_mem.c',
+    'vpxscale.c',
+    'yv12config.c',
+    'yv12extend.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -17,25 +17,14 @@ USE_STATIC_LIBS = 1
 endif
 
 # This is defined by the bzip2-1.0.3 Makefile.  It appears to be used to
 # configure GLIBC to support large files.  This isn't something we care about
 # at this stage, since we're only interested in the streaming API, but we
 # define it here anyways for consistency.
 DEFINES	+= -D_FILE_OFFSET_BITS=64
 
-CSRCS		= \
-		blocksort.c \
-		bzlib.c \
-		compress.c \
-		crctable.c \
-		decompress.c \
-		huffman.c \
-		randtable.c \
-		$(NULL)
-
-
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
 
--- a/modules/libbz2/src/moz.build
+++ b/modules/libbz2/src/moz.build
@@ -21,8 +21,18 @@ csrcs = [
     'randtable.c',
 ]
 
 HOST_CSRCS += csrcs
 HOST_LIBRARY_NAME = 'hostbz2'
 
 LIBRARY_NAME = 'bz2'
 
+CSRCS += [
+    'blocksort.c',
+    'bzlib.c',
+    'compress.c',
+    'crctable.c',
+    'decompress.c',
+    'huffman.c',
+    'randtable.c',
+]
+
--- a/modules/libmar/sign/Makefile.in
+++ b/modules/libmar/sign/Makefile.in
@@ -10,21 +10,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
-CSRCS = \
-  mar_sign.c \
-  nss_secutil.c \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(srcdir)/../src \
   -I$(srcdir)/../verify \
   -I$(topsrcdir)/dist/include \
   $(NULL)
 
 CFLAGS += -DMAR_NSS
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/libmar/sign/moz.build
+++ b/modules/libmar/sign/moz.build
@@ -3,8 +3,13 @@
 # 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/.
 
 MODULE = 'signmar'
 
 LIBRARY_NAME = 'signmar'
 
+CSRCS += [
+    'mar_sign.c',
+    'nss_secutil.c',
+]
+
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -13,19 +13,13 @@ include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
 
-CSRCS = \
-    mar_create.c \
-    mar_extract.c \
-    mar_read.c \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
--- a/modules/libmar/src/moz.build
+++ b/modules/libmar/src/moz.build
@@ -15,8 +15,14 @@ HOST_CSRCS += [
     'mar_create.c',
     'mar_extract.c',
     'mar_read.c',
 ]
 HOST_LIBRARY_NAME = 'hostmar'
 
 LIBRARY_NAME = 'mar'
 
+CSRCS += [
+    'mar_create.c',
+    'mar_extract.c',
+    'mar_read.c',
+]
+
--- a/modules/libmar/verify/Makefile.in
+++ b/modules/libmar/verify/Makefile.in
@@ -10,21 +10,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
-CSRCS	= \
-  mar_verify.c \
-  cryptox.c \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 ifneq ($(OS_ARCH),WINNT)
 DEFINES += -DMAR_NSS
 LOCAL_INCLUDES += -I$(srcdir)/../sign
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/libmar/verify/moz.build
+++ b/modules/libmar/verify/moz.build
@@ -3,8 +3,13 @@
 # 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/.
 
 MODULE = 'verifymar'
 
 LIBRARY_NAME = 'verifymar'
 
+CSRCS += [
+    'cryptox.c',
+    'mar_verify.c',
+]
+
--- a/other-licenses/android/Makefile.in
+++ b/other-licenses/android/Makefile.in
@@ -6,28 +6,9 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 
-CSRCS = \
-  ev_streams.c \
-  ev_timers.c \
-  getaddrinfo.c \
-  ns_name.c \
-  ns_netint.c \
-  ns_parse.c \
-  ns_print.c \
-  ns_samedomain.c \
-  ns_ttl.c \
-  res_comp.c \
-  res_data.c \
-  res_debug.c \
-  res_init.c \
-  res_mkquery.c \
-  res_send.c \
-  res_state.c \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/other-licenses/android/moz.build
+++ b/other-licenses/android/moz.build
@@ -3,8 +3,27 @@
 # 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/.
 
 MODULE = 'android'
 
 LIBRARY_NAME = 'android'
 
+CSRCS += [
+    'ev_streams.c',
+    'ev_timers.c',
+    'getaddrinfo.c',
+    'ns_name.c',
+    'ns_netint.c',
+    'ns_parse.c',
+    'ns_print.c',
+    'ns_samedomain.c',
+    'ns_ttl.c',
+    'res_comp.c',
+    'res_data.c',
+    'res_debug.c',
+    'res_init.c',
+    'res_mkquery.c',
+    'res_send.c',
+    'res_state.c',
+]
+
--- a/parser/expat/lib/Makefile.in
+++ b/parser/expat/lib/Makefile.in
@@ -4,22 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS		= \
-		xmlparse.c \
-		xmlrole.c \
-		xmltok.c \
-		$(NULL)
-
 # We want only the static lib, not the shared lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 xmltok.$(OBJ_SUFFIX): moz_extensions.c
 
 DEFINES += -DHAVE_EXPAT_CONFIG_H
--- a/parser/expat/lib/moz.build
+++ b/parser/expat/lib/moz.build
@@ -8,10 +8,16 @@ MODULE = 'expat'
 
 EXPORTS += [
     'expat.h',
     'expat_external.h',
 ]
 
 LIBRARY_NAME = 'mozexpat_s'
 
+CSRCS += [
+    'xmlparse.c',
+    'xmlrole.c',
+    'xmltok.c',
+]
+
 MSVC_ENABLE_PGO = True
 
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -7,18 +7,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
-CSRCS += md4.c
-
 DEFINES += \
   -DNSS_ENABLE_ECC \
   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -80,10 +80,14 @@ if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY'
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsCertTree.cpp',
     ]
 
 LIBRARY_NAME = 'pipnss'
 
+CSRCS += [
+    'md4.c',
+]
+
 LIBXUL_LIBRARY = True
 
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -16,20 +16,16 @@ else
 LIBRARY_NAME	= widget_gtk3
 endif
 
 EXPORT_LIBRARY	= 1
 NATIVE_THEME_SUPPORT = 1
 
 
 
-CSRCS		= \
-		mozcontainer.c \
-		$(NULL)
-
 ifdef ACCESSIBILITY
 CSRCS += maiRedundantObjectFactory.c
 endif
 # build our subdirs, too
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 ifdef NATIVE_THEME_SUPPORT
--- a/widget/gtk2/moz.build
+++ b/widget/gtk2/moz.build
@@ -51,10 +51,14 @@ if CONFIG['NS_PRINTING']:
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsClipboard.cpp',
         'nsDragService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
+CSRCS += [
+    'mozcontainer.c',
+]
+
 LIBXUL_LIBRARY = True
 
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -6,15 +6,11 @@
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = widget_shared_x11
-CSRCS      = \
-       keysym2ucs.c \
-       $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS   += $(TK_CFLAGS)
--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -1,10 +1,14 @@
 # -*- 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/.
 
 MODULE = 'widget'
 
+CSRCS += [
+    'keysym2ucs.c',
+]
+
 LIBXUL_LIBRARY = True
 
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -7,20 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xpcombase_s
 MOZILLA_INTERNAL_API =1
-CSRCS = \
-		nsErrorAssertsC.c \
-		$(NULL)
-
 ifeq ($(OS_ARCH),WINNT)
 
 ifdef MOZ_DEBUG
 CSRCS		+= pure_api.c
 endif
 
 endif #if OS_ARCH == WINNT
 
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -121,12 +121,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     CPP_SOURCES += [
         'nsMacUtilsImpl.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'nsCrashOnException.cpp',
     ]
 
+CSRCS += [
+    'nsErrorAssertsC.c',
+]
+
+
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIST_INSTALL	= 1
 USE_STATIC_LIBS = 1
 
-CSRCS		= xpt_arena.c xpt_struct.c xpt_xdr.c
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER
 OS_COMPILE_CFLAGS += -Zl
 endif
 
 LOCAL_INCLUDES += \
                 -I../../../ \
--- a/xpcom/typelib/xpt/src/moz.build
+++ b/xpcom/typelib/xpt/src/moz.build
@@ -3,10 +3,16 @@
 # 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/.
 
 MODULE = 'xpcom'
 
 LIBRARY_NAME = 'xpt'
 
+CSRCS += [
+    'xpt_arena.c',
+    'xpt_struct.c',
+    'xpt_xdr.c',
+]
+
 LIBXUL_LIBRARY = True