bug 870406: move CSRCS to mozbuild - patch #4. r=mshal

build/unix/elfhack/Makefile.in

@@ -12,10 +12,6 @@ VPATH += $(topsrcdir)/build
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 
-ifndef CROSS_COMPILE
-CSRCS += dummy.c
-endif
-
 WRAP_LDFLAGS=
 
 include $(topsrcdir)/config/rules.mk

build/unix/elfhack/inject/Makefile.in

@@ -16,11 +16,6 @@ CPU := $(TARGET_CPU)
 endif
 endif
 
-CSRCS := \
-  $(CPU).c \
-  $(CPU)-noinit.c \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 export:: $(CSRCS:.c=.$(OBJ_SUFFIX))

build/unix/elfhack/inject/moz.build

@@ -5,3 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 NO_DIST_INSTALL = True
+
+
+if CONFIG['TARGET_CPU'].endswith('86'):
+    cpu = 'x86'
+elif CONFIG['TARGET_CPU'].startswith('arm'):
+    cpu = 'arm'
+else:
+    cpu = CONFIG['TARGET_CPU']
+
+CSRCS += [
+    "%s-noinit.c" % (cpu),
+    "%s.c" % (cpu),
+]

build/unix/elfhack/moz.build

@@ -12,6 +12,11 @@ CSRCS += [
     'test-ctors.c',
 ]
 
+if not CONFIG['CROSS_COMPILE']:
+    CSRCS += [
+        'dummy.c',
+    ]
+
 HOST_CPPSRCS += [
     'elf.cpp',
     'elfhack.cpp',

modules/zlib/src/Makefile.in

@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(srcdir)/objs.mk
-
-CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)

modules/zlib/src/moz.build

@@ -14,3 +14,20 @@ EXPORTS += [
 
 LIBRARY_NAME = 'mozz'
 
+CSRCS += [
+    'adler32.c',
+    'compress.c',
+    'crc32.c',
+    'deflate.c',
+    'gzclose.c',
+    'gzlib.c',
+    'gzread.c',
+    'gzwrite.c',
+    'infback.c',
+    'inffast.c',
+    'inflate.c',
+    'inftrees.c',
+    'trees.c',
+    'uncompr.c',
+    'zutil.c',
+]

modules/zlib/src/objs.mk

@@ -1,24 +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/.
-
-MODULES_ZLIB_SRC_LCSRCS = \
-		adler32.c \
-		compress.c \
-		crc32.c \
-		deflate.c \
-		gzclose.c \
-		gzlib.c \
-		gzread.c \
-		gzwrite.c \
-		infback.c \
-		inffast.c \
-		inflate.c \
-		inftrees.c \
-		trees.c \
-		uncompr.c \
-		zutil.c \
-		$(NULL)
-
-MODULES_ZLIB_SRC_CSRCS := $(addprefix $(topsrcdir)/modules/zlib/src/, $(MODULES_ZLIB_SRC_LCSRCS))
-