bug 875549: mozbuild cleanup for HOST_CSRCS. r=gps

mozilla-spidermonkey · Jun 18, 2013 · 68f84d6 · 68f84d6
1 parent 4dfe5a4
commit 68f84d6
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 19 deletions.
diff --git a/config/Makefile.in b/config/Makefile.in
@@ -21,7 +21,6 @@ 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

diff --git a/config/rules.mk b/config/rules.mk
@@ -16,6 +16,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  HOST_CSRCS \
   MODULE \
   PARALLEL_DIRS \
   TEST_DIRS \

diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
@@ -16,7 +16,6 @@ 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

diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
@@ -16,6 +16,7 @@ endif
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  HOST_CSRCS \
   MODULE \
   PARALLEL_DIRS \
   TEST_DIRS \

diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
@@ -410,7 +410,6 @@ 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

diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in
@@ -34,7 +34,6 @@ CSRCS		= \
 		randtable.c \
 		$(NULL)
 
-DISABLED_HOST_CSRCS	= $(CSRCS)
 
 include $(topsrcdir)/config/rules.mk
 

diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in
@@ -20,16 +20,11 @@ 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
 

diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in
@@ -40,9 +40,6 @@ HOST_CFLAGS += \
   $(DEFINES) \
   $(NULL)
 
-DISABLED_HOST_CSRCS = \
-  mar.c \
-  $(NULL)
 DISABLED_CSRCS = $(HOST_CSRCS)
 
 HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)

diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
@@ -32,7 +32,6 @@ 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)

diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -79,7 +79,6 @@ endif
 
 ifneq (WINNT,$(OS_TARGET))
 ifdef MOZ_CRASHREPORTER
-DISABLED_HOST_CSRCS = $(CSRCS)
 endif
 endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ CSRCS = \ @@
     		randtable.c \
     		$(NULL)
-    DISABLED_HOST_CSRCS	= $(CSRCS)
     include $(topsrcdir)/config/rules.mk
@@ Expand Down @@