зеркало из https://github.com/mozilla/gecko-dev.git
bug 875549: move HOST_CSRCS to mozbuild (file batch #1). r=mshal
This commit is contained in:
Родитель
005881eed6
Коммит
ccea9f9d5e
|
@ -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
|
||||
|
|
|
@ -13,3 +13,8 @@ CONFIGURE_SUBST_FILES += [
|
|||
'tests/src-simple/Makefile',
|
||||
]
|
||||
|
||||
if CONFIG['HOST_OS_ARCH'] != 'WINNT':
|
||||
HOST_CSRCS += [
|
||||
'nsinstall.c',
|
||||
'pathsub.c',
|
||||
]
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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',
|
||||
]
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -31,3 +31,8 @@ EXPORTS.vpx += [
|
|||
'yv12extend.h',
|
||||
]
|
||||
|
||||
|
||||
if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:
|
||||
HOST_CSRCS += [
|
||||
'obj_int_extract.c',
|
||||
]
|
||||
|
|
|
@ -34,7 +34,7 @@ CSRCS = \
|
|||
randtable.c \
|
||||
$(NULL)
|
||||
|
||||
HOST_CSRCS = $(CSRCS)
|
||||
DISABLED_HOST_CSRCS = $(CSRCS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -11,4 +11,9 @@ EXPORTS += [
|
|||
'mar_cmdline.h',
|
||||
]
|
||||
|
||||
HOST_CSRCS += [
|
||||
'mar_create.c',
|
||||
'mar_extract.c',
|
||||
'mar_read.c',
|
||||
]
|
||||
HOST_LIBRARY_NAME = 'hostmar'
|
||||
|
|
|
@ -40,7 +40,7 @@ HOST_CFLAGS += \
|
|||
$(DEFINES) \
|
||||
$(NULL)
|
||||
|
||||
HOST_CSRCS = \
|
||||
DISABLED_HOST_CSRCS = \
|
||||
mar.c \
|
||||
$(NULL)
|
||||
DISABLED_CSRCS = $(HOST_CSRCS)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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',
|
||||
]
|
||||
|
|
|
@ -77,7 +77,7 @@ endif
|
|||
|
||||
ifneq (WINNT,$(OS_TARGET))
|
||||
ifdef MOZ_CRASHREPORTER
|
||||
HOST_CSRCS = $(CSRCS)
|
||||
DISABLED_HOST_CSRCS = $(CSRCS)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
@ -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'
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче