Bug 875013 - Remove VPATH from hal/; r=joey
authorMike Shal <mshal@mozilla.com>
Wed, 18 Sep 2013 15:18:15 -0400
changeset 148441 28316508a37f5ea157afe9616b752d5545ae0118
parent 148440 944e6d1fd97933c0a44fb02364cda44d2f26a241
child 148442 2c3d1c9241d7b0f3612bb9cb705b33c537eb7925
push id34224
push usermshal@mozilla.com
push dateTue, 24 Sep 2013 15:19:32 +0000
treeherdermozilla-inbound@28316508a37f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs875013
milestone27.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 from hal/; r=joey
hal/Makefile.in
hal/moz.build
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -1,24 +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)/android \
-  $(srcdir)/gonk \
-  $(srcdir)/fallback \
-  $(srcdir)/sandbox \
-  $(srcdir)/linux \
-  $(srcdir)/windows \
-  $(srcdir)/cocoa \
-  $(NULL)
-
 EXPORT_LIBRARY = 1
 MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
 	$(NULL)
 
 ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -18,137 +18,137 @@ EXPORTS.mozilla += [
     'HalTypes.h',
     'HalWakeLock.h',
 ]
 
 TEST_DIRS += ['tests']
 CPP_SOURCES += [
     'Hal.cpp',
     'HalWakeLock.cpp',
-    'SandboxHal.cpp',
     'WindowIdentifier.cpp',
+    'sandbox/SandboxHal.cpp',
 ]
 
 if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
     CPP_SOURCES += [
-        'FallbackGamepad.cpp'
+        'fallback/FallbackGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
     CPP_SOURCES += [
-        'CocoaGamepad.cpp'
+        'cocoa/CocoaGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
     CPP_SOURCES += [
-        'WindowsGamepad.cpp'
+        'windows/WindowsGamepad.cpp'
     ]
 elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
     CPP_SOURCES += [
-        'LinuxGamepad.cpp'
+        'linux/LinuxGamepad.cpp'
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CPP_SOURCES += [
-        'AndroidHal.cpp',
-        'AndroidSensor.cpp',
-        'FallbackPower.cpp',
-        'FallbackAlarm.cpp',
+        'android/AndroidHal.cpp',
+        'android/AndroidSensor.cpp',
+        'fallback/FallbackPower.cpp',
+        'fallback/FallbackAlarm.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     CPP_SOURCES += [
-        'GonkHal.cpp',
-        'LinuxPower.cpp',
-        'GonkSensor.cpp',
-        'UeventPoller.cpp',
-        'GonkSwitch.cpp',
-        'GonkFMRadio.cpp',
-        'GonkDiskSpaceWatcher.cpp',
+        'gonk/GonkDiskSpaceWatcher.cpp',
+        'gonk/GonkFMRadio.cpp',
+        'gonk/GonkHal.cpp',
+        'gonk/GonkSensor.cpp',
+        'gonk/GonkSwitch.cpp',
+        'gonk/UeventPoller.cpp',
+        'linux/LinuxPower.cpp',
     ]
 elif CONFIG['OS_TARGET'] == 'Linux':
     CPP_SOURCES += [
-        'LinuxPower.cpp',
-        'FallbackScreenConfiguration.cpp',
-        'FallbackSensor.cpp',
-        'FallbackVibration.cpp',
-        'FallbackAlarm.cpp',
+        'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackScreenConfiguration.cpp',
+        'fallback/FallbackSensor.cpp',
+        'fallback/FallbackVibration.cpp',
+        'linux/LinuxPower.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DBUS']:
         CPP_SOURCES += [
-            'UPowerClient.cpp'
+            'linux/UPowerClient.cpp',
         ]
     else:
         CPP_SOURCES += [
-            'FallbackBattery.cpp'
+            'fallback/FallbackBattery.cpp',
         ]
 elif CONFIG['OS_TARGET'] == 'WINNT':
     CPP_SOURCES += [
-        'WindowsBattery.cpp',
-        'WindowsSensor.cpp',
-        'FallbackVibration.cpp',
-        'FallbackScreenConfiguration.cpp',
-        'FallbackPower.cpp',
-        'FallbackAlarm.cpp',
+        'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackPower.cpp',
+        'fallback/FallbackScreenConfiguration.cpp',
+        'fallback/FallbackVibration.cpp',
+        'windows/WindowsBattery.cpp',
+        'windows/WindowsSensor.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
-        'CocoaBattery.cpp',
-        'FallbackVibration.cpp',
-        'FallbackPower.cpp',
-        'FallbackScreenConfiguration.cpp',
-        'FallbackAlarm.cpp',
+        'cocoa/CocoaBattery.cpp',
+        'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackPower.cpp',
+        'fallback/FallbackScreenConfiguration.cpp',
+        'fallback/FallbackVibration.cpp',
     ]
 elif CONFIG['OS_TARGET'] in ('OpenBSD', 'NetBSD', 'FreeBSD', 'DragonFly'):
     CPP_SOURCES += [
-        'FallbackSensor.cpp',
-        'FallbackVibration.cpp',
-        'FallbackPower.cpp',
-        'FallbackScreenConfiguration.cpp',
-        'FallbackAlarm.cpp',
+        'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackPower.cpp',
+        'fallback/FallbackScreenConfiguration.cpp',
+        'fallback/FallbackSensor.cpp',
+        'fallback/FallbackVibration.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DBUS']:
         CPP_SOURCES += [
-            'UPowerClient.cpp'
+            'linux/UPowerClient.cpp',
         ]
     else:
         CPP_SOURCES += [
-            'FallbackBattery.cpp'
+            'fallback/FallbackBattery.cpp',
         ]
 else:
     CPP_SOURCES += [
-        'FallbackBattery.cpp',
-        'FallbackSensor.cpp',
-        'FallbackVibration.cpp',
-        'FallbackPower.cpp',
-        'FallbackScreenConfiguration.cpp',
-        'FallbackAlarm.cpp',
+        'fallback/FallbackAlarm.cpp',
+        'fallback/FallbackBattery.cpp',
+        'fallback/FallbackPower.cpp',
+        'fallback/FallbackScreenConfiguration.cpp',
+        'fallback/FallbackSensor.cpp',
+        'fallback/FallbackVibration.cpp',
     ]
 
 # Fallbacks for backends implemented on Gonk only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
-        'FallbackLights.cpp',
-        'FallbackTime.cpp',
-        'FallbackWakeLocks.cpp',
-        'FallbackSwitch.cpp',
-        'FallbackScreenPower.cpp',
-        'FallbackProcessPriority.cpp',
-        'FallbackFMRadio.cpp',
-        'FallbackFactoryReset.cpp',
-        'FallbackDiskSpaceWatcher.cpp',
+        'fallback/FallbackDiskSpaceWatcher.cpp',
+        'fallback/FallbackFMRadio.cpp',
+        'fallback/FallbackFactoryReset.cpp',
+        'fallback/FallbackLights.cpp',
+        'fallback/FallbackProcessPriority.cpp',
+        'fallback/FallbackScreenPower.cpp',
+        'fallback/FallbackSwitch.cpp',
+        'fallback/FallbackTime.cpp',
+        'fallback/FallbackWakeLocks.cpp',
     ]
 
 # Fallbacks for backends implemented on Android only.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     CPP_SOURCES += [
-        'FallbackNetwork.cpp'
+        'fallback/FallbackNetwork.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
-        'CocoaSensor.mm',
-        'smslib.mm',
+        'cocoa/CocoaSensor.mm',
+        'cocoa/smslib.mm',
     ]
 
 IPDL_SOURCES = [
     'sandbox/PHal.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True