bug 875549: mozbuild cleanup for HOST_CSRCS. r=gps
authorJoey Armstrong <joey@mozilla.com>
Tue, 18 Jun 2013 09:10:50 -0400
changeset 135470 045aa030111ec8dc9629361b6117d519782c46c5
parent 135469 0eca15d14c2a2eeea515f48c76964c28ba0ac781
child 135471 35bf7e6dbf9001248158283ab7ce7e1652845019
child 135511 d3da96f774b36e34d900f584b5b82936fe5a72d5
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgps
bugs875549
milestone24.0a1
bug 875549: mozbuild cleanup for HOST_CSRCS. r=gps
config/Makefile.in
config/rules.mk
js/src/config/Makefile.in
js/src/config/rules.mk
media/libvpx/Makefile.in
modules/libbz2/src/Makefile.in
modules/libmar/src/Makefile.in
modules/libmar/tool/Makefile.in
other-licenses/bsdiff/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -16,17 +16,16 @@ include $(DEPTH)/config/autoconf.mk
 VISIBILITY_FLAGS =
 
 # STDCXX_COMPAT is not needed here, and will actually fail because
 # libstdc++-compat is not built yet.
 STDCXX_COMPAT =
 
 ifneq (WINNT,$(HOST_OS_ARCH))
 HOST_PROGRAM	= nsinstall_real$(HOST_BIN_SUFFIX)
-DISABLED_HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 export:: elf-dynstr-gc
 endif
 endif
 
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -11,16 +11,17 @@ ifndef topsrcdir
 endif
 
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  HOST_CSRCS \
   MODULE \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
   XPIDL_MODULE \
   $(NULL)
 
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -11,17 +11,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
 
 ifneq (WINNT,$(HOST_OS_ARCH))
 HOST_PROGRAM	= nsinstall_real$(HOST_BIN_SUFFIX)
-DISABLED_HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 # IMPORTANT: Disable NSBUILDROOT for this directory only, otherwise we have
 # a recursive rule for finding nsinstall and the Perl scripts.
 ifdef NSBUILDROOT
 override NSBUILDROOT :=
 endif
 
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -11,16 +11,17 @@ ifndef topsrcdir
 endif
 
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  HOST_CSRCS \
   MODULE \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
   XPIDL_MODULE \
   $(NULL)
 
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -405,17 +405,16 @@ ifdef VPX_NEED_OBJ_INT_EXTRACT
 # parse that format, and so only has limited support for cross-compilation.
 
 ifdef VPX_ARM_ASM
 VPX_OIE_FORMAT := rvds
 else
 VPX_OIE_FORMAT := gas
 endif
 
-DISABLED_HOST_CSRCS = obj_int_extract.c
 HOST_PROGRAM = host_obj_int_extract$(HOST_BIN_SUFFIX)
 
 CSRCS += asm_com_offsets.c
 
 GARBAGE += asm_com_offsets.$(OBJ_SUFFIX) asm_com_offsets.asm
 
 ifdef MOZ_VP8_ENCODER
 CSRCS += asm_enc_offsets.c
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -29,16 +29,15 @@ CSRCS		= \
 		bzlib.c \
 		compress.c \
 		crctable.c \
 		decompress.c \
 		huffman.c \
 		randtable.c \
 		$(NULL)
 
-DISABLED_HOST_CSRCS	= $(CSRCS)
 
 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/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -15,24 +15,19 @@ LIBRARY_NAME	= mar
 DISABLED_HOST_LIBRARY_NAME = hostmar
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
 
-
-DISABLED_HOST_CSRCS	= \
-		mar_create.c \
-		mar_extract.c \
-		mar_read.c \
-		$(NULL)
-
-CSRCS		= \
-		$(HOST_CSRCS) \
-		$(NULL)
+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/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@@ -35,19 +35,16 @@ DEFINES += \
   $(NULL)
 endif
 
 HOST_CFLAGS += \
   -DNO_SIGN_VERIFY \
   $(DEFINES) \
   $(NULL)
 
-DISABLED_HOST_CSRCS = \
-  mar.c \
-  $(NULL)
 DISABLED_CSRCS = $(HOST_CSRCS)
 
 HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)
 LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX)
 
 ifdef MOZ_ENABLE_SIGNMAR
 LIBS += \
   $(DEPTH)/modules/libmar/sign/$(LIB_PREFIX)signmar.$(LIB_SUFFIX) \
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -27,17 +27,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # This program is output to dist/host/bin because it is only needed by the
 # build system and is not intended to be included in Mozilla distributions.
 HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
-DISABLED_HOST_CSRCS = bsdiff.c
 
 ifdef MOZ_NATIVE_BZ2
 HOST_LIBS += $(MOZ_BZ2_LIBS)
 else
 HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
 endif
 
 ifeq ($(HOST_OS_ARCH),WINNT)
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -74,17 +74,16 @@ OS_CXXFLAGS += -DHAVE_A_OUT_H
 endif
 ifeq (Darwin,$(OS_ARCH))
 HOST_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 OS_CXXFLAGS += -DHAVE_MACH_O_NLIST_H
 endif
 
 ifneq (WINNT,$(OS_TARGET))
 ifdef MOZ_CRASHREPORTER
-DISABLED_HOST_CSRCS = $(CSRCS)
 endif
 endif
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk