Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 875013 - VPATH removals in build, roboextender, crashreporter; r=ted

Browse Source
This commit is contained in:
Mike Shal 2014-01-21 18:01:22 -05:00
parent 6dab4aa4c1
commit 7338071654
18 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/unix/elfhack/Makefile.in
View File

@ -5,8 +5,6 @@
INTERNAL_TOOLS = 1
VPATH += $(topsrcdir)/build
OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
WRAP_LDFLAGS=

5
testing/mochitest/roboextender/Makefile.in
View File

@ -3,11 +3,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/.
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = testing/mochitest/roboextender
TESTPATH = $(topsrcdir)/mobile/android/base/tests/roboextender
include $(DEPTH)/config/autoconf.mk

21
toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
View File

@ -3,24 +3,3 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
STL_FLAGS =
LOCAL_INCLUDES = -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mk
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
VPATH += \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/sender \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation \
$(NULL)
CPPSRCS += \
$(objs_common) \
$(objs_crash_generation) \
$(objs_handler) \
$(objs_sender) \
$(NULL)

14
toolkit/crashreporter/breakpad-windows-libxul/moz.build
View File

@ -14,3 +14,17 @@ FINAL_LIBRARY = 'xulapp_s'
for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
DEFINES[var] = True
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src',
]
include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
include('/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild')
include('/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mozbuild')
include('/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild')
SOURCES += objs_common
SOURCES += objs_crash_generation
SOURCES += objs_handler
SOURCES += objs_sender

18
toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
View File

@ -6,21 +6,3 @@ USE_STATIC_LIBS = 1
MOZ_GLUE_LDFLAGS =
STL_FLAGS =
LOCAL_INCLUDES = -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
VPATH += \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler \
$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation \
$(NULL)
CPPSRCS += \
$(objs_common) \
$(objs_crash_generation) \
$(objs_handler) \
$(NULL)

12
toolkit/crashreporter/breakpad-windows-standalone/moz.build
View File

@ -8,3 +8,15 @@ FINAL_LIBRARY = 'breakpadinjector'
for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
DEFINES[var] = True
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src',
]
include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
include('/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild')
include('/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild')
SOURCES += objs_common
SOURCES += objs_crash_generation
SOURCES += objs_handler

2
toolkit/crashreporter/client/Makefile.in
View File

@ -17,8 +17,6 @@ endif
LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
VPATH += $(topsrcdir)/build/
ifeq ($(OS_ARCH),WINNT)
LIBS += \
$(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX)

2
toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
View File

@ -16,8 +16,6 @@ OS_CXXFLAGS += -fomit-frame-pointer
MOZ_FRAMEPTR_FLAGS := -fomit-frame-pointer
endif #}
VPATH += $(srcdir)/../log
LOCAL_INCLUDES = \
-I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
$(NULL)

6
toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
View File

@ -1,6 +0,0 @@
objs_crash_generation = \
client_info.cc \
crash_generation_client.cc \
crash_generation_server.cc \
minidump_generator.cc \
$(NULL)

17
toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild Normal file
View File

@ -0,0 +1,17 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
lobjs_crash_generation = [
'client_info.cc',
'crash_generation_client.cc',
'crash_generation_server.cc',
'minidump_generator.cc',
]
subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation'
objs_crash_generation = [
'%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_crash_generation
]

1
toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
View File

@ -1 +0,0 @@
objs_handler = exception_handler.cc

14
toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild Normal file
View File

@ -0,0 +1,14 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
lobjs_handler = [
'exception_handler.cc',
]
subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/handler'
objs_handler = [
'%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_handler
]

1
toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mk
View File

@ -1 +0,0 @@
objs_sender = crash_report_sender.cc

14
toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mozbuild Normal file
View File

@ -0,0 +1,14 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
lobjs_sender = [
'crash_report_sender.cc',
]
subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/sender'
objs_sender = [
'%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_sender
]

1
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
View File

@ -10,7 +10,6 @@ endif
LOCAL_INCLUDES = -I$(srcdir)/..
ifeq ($(OS_TARGET),Android)
VPATH += $(srcdir)/android
TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
endif

4
toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
View File

@ -1,4 +0,0 @@
objs_common = \
guid_string.cc \
string_utils.cc \
$(NULL)

15
toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild Normal file
View File

@ -0,0 +1,15 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
lobjs_common = [
'guid_string.cc',
'string_utils.cc',
]
subdir = 'toolkit/crashreporter/google-breakpad/src/common/windows'
objs_common = [
'%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_common
]

6
toolkit/crashreporter/test/Makefile.in
View File

@ -3,12 +3,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/.
VPATH += \
$(srcdir)/../google-breakpad/src/processor/ \
$(srcdir)/../google-breakpad/src/common/ \
$(topsrcdir)/build/ \
$(NULL)
LOCAL_INCLUDES += \
-I$(srcdir)/../google-breakpad/src/ \
$(NULL)