From ccea9f9d5ed18d74c55a4742624948589e5793f7 Mon Sep 17 00:00:00 2001 From: Joey Armstrong Date: Tue, 11 Jun 2013 11:31:11 -0400 Subject: [PATCH] bug 875549: move HOST_CSRCS to mozbuild (file batch #1). r=mshal --- config/Makefile.in | 2 +- config/moz.build | 5 +++++ js/src/config/Makefile.in | 2 +- js/src/config/moz.build | 6 ++++++ media/libvpx/Makefile.in | 2 +- media/libvpx/moz.build | 5 +++++ modules/libbz2/src/Makefile.in | 2 +- modules/libbz2/src/moz.build | 12 ++++++++++++ modules/libmar/src/Makefile.in | 2 +- modules/libmar/src/moz.build | 5 +++++ modules/libmar/tool/Makefile.in | 2 +- modules/libmar/tool/moz.build | 5 ++--- other-licenses/bsdiff/Makefile.in | 2 +- other-licenses/bsdiff/moz.build | 3 +++ .../google-breakpad/src/common/Makefile.in | 2 +- .../google-breakpad/src/common/moz.build | 3 +++ 16 files changed, 49 insertions(+), 11 deletions(-) diff --git a/config/Makefile.in b/config/Makefile.in index 5f6e8b153964..e2f9b8d811f6 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -21,7 +21,7 @@ STDCXX_COMPAT = ifneq (WINNT,$(HOST_OS_ARCH)) HOST_PROGRAM = nsinstall_real$(HOST_BIN_SUFFIX) -HOST_CSRCS = nsinstall.c pathsub.c +DISABLED_HOST_CSRCS = nsinstall.c pathsub.c endif ifndef CROSS_COMPILE diff --git a/config/moz.build b/config/moz.build index 7e3b46dc24c7..d27812047525 100644 --- a/config/moz.build +++ b/config/moz.build @@ -13,3 +13,8 @@ CONFIGURE_SUBST_FILES += [ 'tests/src-simple/Makefile', ] +if CONFIG['HOST_OS_ARCH'] != 'WINNT': + HOST_CSRCS += [ + 'nsinstall.c', + 'pathsub.c', + ] diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in index e537a73edd03..128f226eb9d8 100644 --- a/js/src/config/Makefile.in +++ b/js/src/config/Makefile.in @@ -16,7 +16,7 @@ VISIBILITY_FLAGS = ifneq (WINNT,$(HOST_OS_ARCH)) HOST_PROGRAM = nsinstall_real$(HOST_BIN_SUFFIX) -HOST_CSRCS = nsinstall.c pathsub.c +DISABLED_HOST_CSRCS = nsinstall.c pathsub.c endif # IMPORTANT: Disable NSBUILDROOT for this directory only, otherwise we have diff --git a/js/src/config/moz.build b/js/src/config/moz.build index 895d11993cfb..45dc9ae1fb65 100644 --- a/js/src/config/moz.build +++ b/js/src/config/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/. + +if CONFIG['HOST_OS_ARCH'] != 'WINNT': + HOST_CSRCS += [ + 'nsinstall.c', + 'pathsub.c', + ] diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index b4ce8c4bae58..7e5bf15afdb0 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -410,7 +410,7 @@ else VPX_OIE_FORMAT := gas endif -HOST_CSRCS = obj_int_extract.c +DISABLED_HOST_CSRCS = obj_int_extract.c HOST_PROGRAM = host_obj_int_extract$(HOST_BIN_SUFFIX) CSRCS += asm_com_offsets.c diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 63efae6521b9..745c9cfc7a22 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -31,3 +31,8 @@ EXPORTS.vpx += [ 'yv12extend.h', ] + +if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']: + HOST_CSRCS += [ + 'obj_int_extract.c', + ] diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in index 679086e6e6d0..ad386bcca5b1 100644 --- a/modules/libbz2/src/Makefile.in +++ b/modules/libbz2/src/Makefile.in @@ -34,7 +34,7 @@ CSRCS = \ randtable.c \ $(NULL) -HOST_CSRCS = $(CSRCS) +DISABLED_HOST_CSRCS = $(CSRCS) include $(topsrcdir)/config/rules.mk diff --git a/modules/libbz2/src/moz.build b/modules/libbz2/src/moz.build index 9c9e19527d67..8ec0f6b5ea44 100644 --- a/modules/libbz2/src/moz.build +++ b/modules/libbz2/src/moz.build @@ -10,4 +10,16 @@ EXPORTS += [ 'bzlib.h', ] +# Placeholder for CSRCS= conversion. +csrcs = [ + 'blocksort.c', + 'bzlib.c', + 'compress.c', + 'crctable.c', + 'decompress.c', + 'huffman.c', + 'randtable.c', +] + +HOST_CSRCS += csrcs HOST_LIBRARY_NAME = 'hostbz2' diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in index 3fd687ef64ae..c4665be3f1df 100644 --- a/modules/libmar/src/Makefile.in +++ b/modules/libmar/src/Makefile.in @@ -21,7 +21,7 @@ endif # This makefile just builds support for reading archives. -HOST_CSRCS = \ +DISABLED_HOST_CSRCS = \ mar_create.c \ mar_extract.c \ mar_read.c \ diff --git a/modules/libmar/src/moz.build b/modules/libmar/src/moz.build index ea12adddabc2..eb2ee9a29b05 100644 --- a/modules/libmar/src/moz.build +++ b/modules/libmar/src/moz.build @@ -11,4 +11,9 @@ EXPORTS += [ 'mar_cmdline.h', ] +HOST_CSRCS += [ + 'mar_create.c', + 'mar_extract.c', + 'mar_read.c', +] HOST_LIBRARY_NAME = 'hostmar' diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index af8df0080dc3..2ff70b2a0b30 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -40,7 +40,7 @@ HOST_CFLAGS += \ $(DEFINES) \ $(NULL) -HOST_CSRCS = \ +DISABLED_HOST_CSRCS = \ mar.c \ $(NULL) DISABLED_CSRCS = $(HOST_CSRCS) diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index be56ae70cdf5..7778cef1c146 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -9,8 +9,7 @@ MODULE = 'mar' if CONFIG['MOZ_ENABLE_SIGNMAR']: PROGRAM = 'signmar' -# bug 875549: Temporarly break dep on HOST_CSRCS= so CSRCS can convert. -host_csrcs = [ +CSRCS = [ 'mar.c', ] -CSRCS += host_csrcs +HOST_CSRCS += CSRCS diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in index 1254b02967aa..b6617028732b 100644 --- a/other-licenses/bsdiff/Makefile.in +++ b/other-licenses/bsdiff/Makefile.in @@ -32,7 +32,7 @@ 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) -HOST_CSRCS = bsdiff.c +DISABLED_HOST_CSRCS = bsdiff.c ifdef MOZ_NATIVE_BZ2 HOST_LIBS += $(MOZ_BZ2_LIBS) diff --git a/other-licenses/bsdiff/moz.build b/other-licenses/bsdiff/moz.build index 895d11993cfb..34d51348f5b9 100644 --- a/other-licenses/bsdiff/moz.build +++ b/other-licenses/bsdiff/moz.build @@ -4,3 +4,6 @@ # 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/. +HOST_CSRCS += [ + 'bsdiff.c', +] diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index 940d43708526..c607793f423b 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -77,7 +77,7 @@ endif ifneq (WINNT,$(OS_TARGET)) ifdef MOZ_CRASHREPORTER -HOST_CSRCS = $(CSRCS) +DISABLED_HOST_CSRCS = $(CSRCS) endif endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build index 00221ae09b68..7412aae93c2c 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -48,6 +48,9 @@ else: 'stabs_reader.cc', ] +if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_CRASHREPORTER']: + HOST_CSRCS += CSRCS + if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_CRASHREPORTER']: HOST_LIBRARY_NAME = 'host_breakpad_common_s'