Bug 875013 - Remove VPATH in gfx/; r=joey
authorMike Shal <mshal@mozilla.com>
Tue, 07 Jan 2014 17:50:44 -0500
changeset 179713 5d2f31fdc4d458c77eeeedc3a8767acd4520f395
parent 179712 970946268be4c6d5e98a3f84ce4cd757670f9780
child 179714 4fcc5b6e4f23a238642c7d87703d0ef31f111a09
push id462
push userraliiev@mozilla.com
push dateTue, 22 Apr 2014 00:22:30 +0000
treeherdermozilla-release@ac5db8c74ac0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs875013
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 875013 - Remove VPATH in gfx/; r=joey
gfx/2d/Makefile.in
gfx/angle/Makefile.in
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libGLESv2/Makefile.in
gfx/layers/Makefile.in
gfx/skia/Makefile.in
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -1,15 +1,13 @@
 #
 # 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) $(srcdir)/unittest
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those
 # macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -1,28 +1,12 @@
 # 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/.
 
-# The below is a rough translation of build_angle.gypi:
-# Target: 'preprocessor'
-# src/compiler/preprocessor:
-VPATH += $(srcdir)/src/compiler/preprocessor
-
-# Target: 'translator_common'
-#   Requires: 'preprocessor'
-VPATH += $(srcdir)/src/compiler
-VPATH += $(srcdir)/src/compiler/depgraph
-VPATH += $(srcdir)/src/compiler/timing
-VPATH += $(srcdir)/src/third_party/compiler
-VPATH += $(srcdir)/src/third_party/murmurhash
-
-# Target: 'translator_glsl'
-#   Requires: 'translator_common'
-# src/compiler:
 ifdef MOZ_ANGLE_RENDERER
 
 libs::
 ifdef MOZ_D3DCOMPILER_CAB
 	expand '$(MOZ_D3DCOMPILER_CAB)' -F:$(MOZ_D3DCOMPILER_DLL) '$(DIST)/bin'
 endif
 
 endif
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -8,20 +8,16 @@ STL_FLAGS =
 ifndef GNU_CC
 # Enable unwind semantics for exception handlers in response to warning C4530.
 OS_CPPFLAGS += -EHsc
 endif
 
 # Below is a transcription of the EGL target from build_angle.gypi.
 # Target: 'libEGL'
 #   Links with: 'libGLESv2'
-# src/common:
-VPATH += $(srcdir)/../common
-# src/libEGL:
-VPATH += $(srcdir)/../libEGL
 DEFFILE = $(srcdir)/libEGL.def
 RCFILE  = $(srcdir)/libEGL.rc
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -I'$(MOZ_DIRECTX_SDK_PATH)/include'
 
 #OS_LIBS += $(call EXPAND_LIBNAME,dwmapi)
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -5,37 +5,16 @@
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =
 
 ifndef GNU_CC
 # Enable unwind semantics for exception handlers in response to warning C4530.
 OS_CPPFLAGS += -EHsc
 endif
 
-# The below is a rough translation of build_angle.gypi,
-# copied from src/Makefile.in.
-
-# Target: 'preprocessor'
-# src/compiler/preprocessor:
-VPATH += $(srcdir)/../compiler/preprocessor
-
-# Target: 'translator_common'
-#   Requires: 'preprocessor'
-VPATH += $(srcdir)/renderer
-VPATH += $(srcdir)/..
-VPATH += $(srcdir)/../compiler
-VPATH += $(srcdir)/../compiler/depgraph
-VPATH += $(srcdir)/../compiler/timing
-VPATH += $(srcdir)/../third_party/compiler
-VPATH += $(srcdir)/../third_party/murmurhash
-
-# Above should match the relevant targets from angle/Makefile.in.
-
-VPATH += $(srcdir)/../common
-# src/common:
 DEFFILE = $(srcdir)/libGLESv2.def
 RCFILE  = $(srcdir)/libGLESv2.rc
 
 # End build_angle.gypi transcription.
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -I'$(MOZ_DIRECTX_SDK_PATH)/include'
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -1,25 +1,13 @@
 #
 # 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) \
-  $(srcdir)/basic \
-  $(srcdir)/client \
-  $(srcdir)/composite \
-  $(srcdir)/opengl \
-  $(srcdir)/d3d9 \
-  $(srcdir)/d3d10 \
-  $(srcdir)/d3d11 \
-  $(srcdir)/ipc \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \
         -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright \
         -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
         -I$(ANDROID_SOURCE)/frameworks/av/include/media/stagefright \
         -I$(ANDROID_SOURCE)/frameworks/native/include/media/openmax \
         $(NULL)
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -1,32 +1,13 @@
 # 
 # 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)/src/core \
-	$(srcdir)/src/gpu \
-	$(srcdir)/src/gpu/effects \
-	$(srcdir)/src/gpu/gl \
-	$(srcdir)/src/image \
-	$(srcdir)/src/images \
-	$(srcdir)/src/lazy \
-	$(srcdir)/src/pipe \
-	$(srcdir)/src/ports \
-	$(srcdir)/src/opts \
-	$(srcdir)/src/effects \
-	$(srcdir)/src/effects/gradients \
-	$(srcdir)/src/utils \
-	$(srcdir)/src/utils/android \
-	$(srcdir)/src/utils/mac \
-	$(srcdir)/src/sfnt \
-	$(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gonk))
 OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
 endif
 
 ifdef MOZ_WIDGET_GTK
 OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
 endif