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

Bug 875013 - Remove VPATH; r=glandium

Browse Source
This commit is contained in:
Mike Shal 2013-11-21 14:57:06 -05:00
parent 1c770cae96
commit ddecae52a4
19 changed files with 6 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/bluetooth/Makefile.in
View File

@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
VPATH += $(srcdir)/ipc
ifneq (,$(MOZ_B2G_BT))
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
@ -27,9 +25,4 @@ CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) -DHAVE_PTHREADS
endif #MOZ_ENABLE_DBUS
endif #MOZ_WIDGET_TOOLKIT
# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
# subdirectory.
LOCAL_INCLUDES += $(VPATH:%=-I%)
endif #MOZ_B2G_BT

4
dom/bluetooth/moz.build
View File

@ -72,6 +72,10 @@ if CONFIG['MOZ_B2G_BT']:
FINAL_LIBRARY = 'gklayout'
LOCAL_INCLUDES += [
'ipc',
]
EXPORTS.mozilla.dom.bluetooth.ipc += [
'ipc/BluetoothMessageUtils.h',
]

5
dom/contacts/Makefile.in
View File

@ -1,5 +0,0 @@
# 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/.
VPATH += $(srcdir)/fallback

4
dom/contacts/moz.build
View File

@ -14,10 +14,10 @@ EXTRA_COMPONENTS += [
]
EXTRA_JS_MODULES += [
'ContactDB.jsm',
'fallback/ContactDB.jsm',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
EXTRA_JS_MODULES += [
'ContactService.jsm'
'fallback/ContactService.jsm'
]

2
dom/plugins/test/testplugin/testplugin.mk
View File

@ -9,8 +9,6 @@ STL_FLAGS =
# must link statically with the CRT; nptest isn't Gecko code
USE_STATIC_LIBS = 1
VPATH += $(topsrcdir)/build
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
include $(topsrcdir)/config/config.mk
CXXFLAGS += $(MOZ_QT_CFLAGS)

68
js/src/Makefile.in
View File

@ -22,69 +22,7 @@ LIBS = $(NSPR_LIBS)
DIST_INSTALL = 1
VPATH += \
$(srcdir) \
$(srcdir)/builtin \
$(srcdir)/devtools \
$(srcdir)/ds \
$(srcdir)/frontend \
$(srcdir)/gc \
$(srcdir)/vm \
$(NULL)
######################################################
# BEGIN include exported headers from the JS engine
#
# Ultimately, after cleansing EXPORTS,
# these will be the ONLY headers exported by
# the js engine
#
VPATH += \
$(srcdir)/../public \
$(NULL)
###############################################
# BEGIN enable non-releasable features
#
# Ion
ifdef ENABLE_ION
VPATH += $(srcdir)/jit
VPATH += $(srcdir)/jit/shared
ifeq (86, $(findstring 86,$(TARGET_CPU)))
ifeq (x86_64, $(TARGET_CPU))
VPATH += $(srcdir)/jit/x64
else
VPATH += $(srcdir)/jit/x86
endif
endif
ifeq (arm, $(findstring arm, $(TARGET_CPU)))
VPATH += $(srcdir)/jit/arm
endif
endif #ENABLE_ION
###############################################
# BEGIN include sources for the Nitro assembler
#
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \
$(srcdir)/yarr \
$(NONE)
ifneq (,$(ENABLE_ION)$(ENABLE_YARR_JIT))
VPATH += $(srcdir)/assembler/assembler \
$(NONE)
endif
#
# END include sources for the Nitro assembler
#############################################
ifdef JS_HAS_CTYPES
VPATH += $(srcdir)/ctypes
ifdef MOZ_NATIVE_FFI
LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
else
@ -107,12 +45,6 @@ endif
endif # JS_HAS_CTYPES
# PerfMeasurement is available regardless of low-level support for it;
# it just doesn't necessarily do anything useful. There is one
# implementation source file per supported operating system, plus a stub
# for unsupported OSes, plus the Javascript wrapper.
VPATH += $(srcdir)/perf
DASH_R = -r
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))

2
js/src/devtools/rootAnalysis/Makefile.in
View File

@ -14,8 +14,6 @@
include $(topsrcdir)/config/config.mk
VPATH += $(srcdir)
# Tree to build and analyze, defaulting to the current tree
TARGET_JSOBJDIR ?= $(MOZ_BUILD_ROOT)

2
js/src/gdb/Makefile.in
View File

@ -4,8 +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/.
VPATH = @srcdir@ @srcdir@/tests
LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
LOCAL_INCLUDES += -I$(topsrcdir) -I..

2
memory/jemalloc/Makefile.in
View File

@ -2,8 +2,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) $(srcdir)/src/src
ifdef MOZ_GLUE_PROGRAM_LDFLAGS
SDK_LIBRARY = $(REAL_LIBRARY)
DIST_INSTALL = 1

2
memory/replace/jemalloc/Makefile.in
View File

@ -8,7 +8,5 @@ ifdef _MSC_VER
LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include/msvc_compat
endif
VPATH += $(topsrcdir)/memory/build
MOZ_GLUE_LDFLAGS = # Don't link against mozglue
WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap

6
netwerk/sctp/src/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@ \
@srcdir@/netinet \
@srcdir@/netinet6 \
$(NULL)
NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
ifeq ($(OS_TARGET),Darwin)

12
netwerk/srtp/src/Makefile.in
View File

@ -3,18 +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@ \
@srcdir@/srtp \
@srcdir@/crypto \
@srcdir@/crypto/cipher \
@srcdir@/crypto/hash \
@srcdir@/crypto/kernel \
@srcdir@/crypto/math \
@srcdir@/crypto/replay \
@srcdir@/crypto/rng \
$(NULL)
include $(topsrcdir)/config/rules.mk
ifdef GNU_CC

9
other-licenses/snappy/Makefile.in
View File

@ -1,9 +0,0 @@
# 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/.
VPATH = \
@srcdir@ \
$(topsrcdir)/other-licenses/snappy/src
$(NULL)

7
testing/gtest/Makefile.in
View File

@ -5,13 +5,6 @@
# Avoid recursive make to avoid having to add files to the gtest/ subdirectory
# (which is third-party code), and to make the build faster.
VPATH = \
$(srcdir) \
$(srcdir)/gtest/src \
$(srcdir)/mozilla \
$(srcdir)/gmock/src \
$(NULL)
LOCAL_INCLUDES += \
-I$(srcdir)/gtest \
-I$(srcdir)/gtest/include \

11
toolkit/components/protobuf/Makefile.in
View File

@ -3,17 +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@ \
@srcdir@/google/protobuf \
@srcdir@/google/protobuf/io \
@srcdir@/google/protobuf/stubs \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir) \
$(NULL)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI

2
toolkit/library/Makefile.in
View File

@ -14,8 +14,6 @@ SHARED_LIBRARY_NAME=XUL
MAKE_FRAMEWORK=1
endif
VPATH += $(topsrcdir)/build/
ifdef MOZ_CONTENT_SANDBOX
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(srcdir)/../sandboxbroker

25
uriloader/exthandler/Makefile.in
View File

@ -3,31 +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/.
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
OSDIR = os2
else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
OSDIR = win
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
OSDIR = mac
else
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
OSDIR = android
else
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
OSDIR = gonk
else
OSDIR = unix
endif
endif
endif
endif
endif
VPATH := $(srcdir) $(srcdir)/$(OSDIR)
LOCAL_INCLUDES = -I$(srcdir)
LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \

5
widget/gonk/Makefile.in
View File

@ -12,11 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
VPATH = \
$(srcdir) \
$(srcdir)/libui \
$(NULL)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += \

2
xpcom/tests/Makefile.in
View File

@ -2,8 +2,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 += $(topsrcdir)/build
LIBS += $(XPCOM_LIBS)
# Make sure we have symbols in case we need to debug these.