Bug 875013 - Remove VPATH; r=glandium

calixteman · Nov 21, 2013 · ddecae5 · ddecae5
1 parent 1c770ca
commit ddecae5
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 171 deletions.
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
@@ -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
diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
@@ -72,6 +72,10 @@ if CONFIG['MOZ_B2G_BT']:
 
     FINAL_LIBRARY = 'gklayout'
 
+    LOCAL_INCLUDES += [
+        'ipc',
+    ]
+
 EXPORTS.mozilla.dom.bluetooth.ipc += [
     'ipc/BluetoothMessageUtils.h',
 ]

diff --git a/dom/contacts/Makefile.in b/dom/contacts/Makefile.in
diff --git a/dom/contacts/moz.build b/dom/contacts/moz.build
@@ -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'
     ]
diff --git a/dom/plugins/test/testplugin/testplugin.mk b/dom/plugins/test/testplugin/testplugin.mk
@@ -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)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
@@ -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)))

diff --git a/js/src/devtools/rootAnalysis/Makefile.in b/js/src/devtools/rootAnalysis/Makefile.in
@@ -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)
 

diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
@@ -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..

diff --git a/memory/jemalloc/Makefile.in b/memory/jemalloc/Makefile.in
@@ -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

diff --git a/memory/replace/jemalloc/Makefile.in b/memory/replace/jemalloc/Makefile.in
@@ -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
diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in
@@ -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)

diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in
@@ -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

diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in
diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in
@@ -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 \

diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in
@@ -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
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
@@ -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

diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
@@ -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 \

diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in
@@ -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 += \

diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
@@ -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.