From eb530b86e83d2ba33562057e11a96389ba1ab218 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Tue, 18 Dec 2012 10:54:22 -0800 Subject: [PATCH] move Arduino.mk to /mk/Arduino.mk --- ArduCopter/Makefile | 2 +- ArduPlane/Makefile | 2 +- Tools/APM_radio_test/Makefile | 3 +-- Tools/CPUInfo/Makefile | 2 +- Tools/Failsafe/Makefile | 3 +-- Tools/VARTest/Makefile | 5 +---- libraries/AC_PID/examples/AC_PID_test/Makefile | 2 +- libraries/APM_OBC/Failsafe_Board/Makefile | 2 +- libraries/APM_OBC/examples/trivial_APM_OBC/Makefile | 2 +- libraries/AP_ADC/examples/AP_ADC_test/Makefile | 2 +- libraries/AP_AHRS/examples/AHRS_Test/Makefile | 2 +- libraries/AP_Airspeed/examples/Airspeed/Makefile | 2 +- libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile | 2 +- libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile | 2 +- libraries/AP_Compass/examples/AP_Compass_test/Makefile | 2 +- .../AP_Declination/examples/AP_Declination_test/Makefile | 2 +- libraries/AP_GPS/examples/GPS_406_test/Makefile | 2 +- libraries/AP_GPS/examples/GPS_AUTO_test/Makefile | 2 +- libraries/AP_GPS/examples/GPS_MTK_test/Makefile | 2 +- libraries/AP_GPS/examples/GPS_NMEA_test/Makefile | 2 +- libraries/AP_GPS/examples/GPS_UBLOX_test/Makefile | 2 +- libraries/AP_HAL_AVR/examples/AnalogIn/Makefile | 2 +- libraries/AP_HAL_AVR/examples/ArduCopterLibs/Makefile | 2 +- libraries/AP_HAL_AVR/examples/ArduPlaneLibs/Makefile | 2 +- libraries/AP_HAL_AVR/examples/Blink/Makefile | 2 +- libraries/AP_HAL_AVR/examples/Console/Makefile | 2 +- libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/Makefile | 2 +- libraries/AP_HAL_AVR/examples/LCDTest/Makefile | 2 +- libraries/AP_HAL_AVR/examples/RCInputTest/Makefile | 2 +- libraries/AP_HAL_AVR/examples/RCPassthroughTest/Makefile | 2 +- libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/Makefile | 2 +- libraries/AP_HAL_AVR/examples/Scheduler/Makefile | 2 +- libraries/AP_HAL_AVR/examples/Storage/Makefile | 2 +- libraries/AP_HAL_AVR/examples/UARTDriver/Makefile | 2 +- libraries/AP_HAL_Empty/examples/empty_example/Makefile | 2 +- libraries/AP_HAL_PX4/examples/simple/Makefile | 2 +- .../AP_InertialNav/examples/AP_InertialNav_test/Makefile | 2 +- libraries/AP_InertialSensor/examples/MPU6000/Makefile | 2 +- libraries/AP_LeadFilter/examples/AP_LeadFilter/Makefile | 2 +- libraries/AP_Math/examples/eulers/Makefile | 2 +- libraries/AP_Math/examples/location/Makefile | 2 +- libraries/AP_Math/examples/polygon/Makefile | 2 +- libraries/AP_Math/examples/rotations/Makefile | 2 +- libraries/AP_Menu/examples/menu/Makefile | 2 +- libraries/AP_Motors/examples/AP_Motors_test/Makefile | 2 +- libraries/AP_Mount/examples/trivial_AP_Mount/Makefile | 2 +- libraries/AP_Navigation/examples/Navigation/Makefile | 2 +- libraries/AP_Navigation/examples/Navigation_simple/Makefile | 2 +- .../AP_OpticalFlow/examples/AP_OpticalFlow_test/Makefile | 2 +- libraries/AP_RangeFinder/examples/MaxsonarXL_test/Makefile | 2 +- libraries/DataFlash/examples/DataFlash_test/Makefile | 2 +- libraries/Filter/examples/Derivative/Makefile | 2 +- libraries/Filter/examples/Filter/Makefile | 2 +- libraries/Filter/examples/LowPassFilter/Makefile | 2 +- libraries/GCS_Console/examples/Console/Makefile | 2 +- libraries/PID/examples/pid/Makefile | 2 +- libraries/RC_Channel/examples/RC_Channel/Makefile | 2 +- {libraries/AP_Common => mk}/Arduino.mk | 0 58 files changed, 57 insertions(+), 62 deletions(-) rename {libraries/AP_Common => mk}/Arduino.mk (100%) diff --git a/ArduCopter/Makefile b/ArduCopter/Makefile index ebac6448da..2615aca3d5 100644 --- a/ArduCopter/Makefile +++ b/ArduCopter/Makefile @@ -1,4 +1,4 @@ -include ../libraries/AP_Common/Arduino.mk +include ../mk/Arduino.mk nologging: EXTRAFLAGS += "-DLOGGING_ENABLED=DISABLED " nologging: all diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile index 1e555e846a..a8f355d01f 100644 --- a/ArduPlane/Makefile +++ b/ArduPlane/Makefile @@ -1,4 +1,4 @@ -include ../libraries/AP_Common/Arduino.mk +include ../mk/Arduino.mk nogps: EXTRAFLAGS += "-DGPS_PROTOCOL=GPS_PROTOCOL_NONE " nogps: all diff --git a/Tools/APM_radio_test/Makefile b/Tools/APM_radio_test/Makefile index 27bc0138d2..7eccc1d6f8 100644 --- a/Tools/APM_radio_test/Makefile +++ b/Tools/APM_radio_test/Makefile @@ -1,2 +1 @@ -include ../../libraries/AP_Common/Arduino.mk - +include ../../mk/Arduino.mk diff --git a/Tools/CPUInfo/Makefile b/Tools/CPUInfo/Makefile index 5ebdddae17..023a24117a 100644 --- a/Tools/CPUInfo/Makefile +++ b/Tools/CPUInfo/Makefile @@ -1,4 +1,4 @@ # # Trivial makefile for building APM # -include ../../libraries/AP_Common/Arduino.mk +include ../../mk/Arduino.mk diff --git a/Tools/Failsafe/Makefile b/Tools/Failsafe/Makefile index 974efca335..2c51f5e9be 100644 --- a/Tools/Failsafe/Makefile +++ b/Tools/Failsafe/Makefile @@ -1,6 +1,5 @@ # # Trivial makefile for building APM # -BOARD=mega -include ../../libraries/AP_Common/Arduino.mk +include ../../mk/Arduino.mk diff --git a/Tools/VARTest/Makefile b/Tools/VARTest/Makefile index 6903d4580e..023a24117a 100644 --- a/Tools/VARTest/Makefile +++ b/Tools/VARTest/Makefile @@ -1,7 +1,4 @@ # # Trivial makefile for building APM # -include ../../libraries/AP_Common/Arduino.mk - -sitl: - make -f ../../libraries/Desktop/Desktop.mk +include ../../mk/Arduino.mk diff --git a/libraries/AC_PID/examples/AC_PID_test/Makefile b/libraries/AC_PID/examples/AC_PID_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AC_PID/examples/AC_PID_test/Makefile +++ b/libraries/AC_PID/examples/AC_PID_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/APM_OBC/Failsafe_Board/Makefile b/libraries/APM_OBC/Failsafe_Board/Makefile index efe305040c..55921928b0 100644 --- a/libraries/APM_OBC/Failsafe_Board/Makefile +++ b/libraries/APM_OBC/Failsafe_Board/Makefile @@ -2,5 +2,5 @@ # Trivial makefile for building APM # BOARD=uno -include ../../../libraries/AP_Common/Arduino.mk +include ../../../libraries/../mk/Arduino.mk diff --git a/libraries/APM_OBC/examples/trivial_APM_OBC/Makefile b/libraries/APM_OBC/examples/trivial_APM_OBC/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/APM_OBC/examples/trivial_APM_OBC/Makefile +++ b/libraries/APM_OBC/examples/trivial_APM_OBC/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_ADC/examples/AP_ADC_test/Makefile b/libraries/AP_ADC/examples/AP_ADC_test/Makefile index a5d5e7918b..e76d4e3d7b 100644 --- a/libraries/AP_ADC/examples/AP_ADC_test/Makefile +++ b/libraries/AP_ADC/examples/AP_ADC_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega2560 -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_AHRS/examples/AHRS_Test/Makefile b/libraries/AP_AHRS/examples/AHRS_Test/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_AHRS/examples/AHRS_Test/Makefile +++ b/libraries/AP_AHRS/examples/AHRS_Test/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Airspeed/examples/Airspeed/Makefile b/libraries/AP_Airspeed/examples/Airspeed/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_Airspeed/examples/Airspeed/Makefile +++ b/libraries/AP_Airspeed/examples/Airspeed/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile index bd5f874ba2..58dcebb211 100644 --- a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile +++ b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile @@ -1,5 +1,5 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk apm2: make -f Makefile EXTRAFLAGS="-DAPM2_HARDWARE=1" diff --git a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile index a5d5e7918b..e76d4e3d7b 100644 --- a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile +++ b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega2560 -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Compass/examples/AP_Compass_test/Makefile b/libraries/AP_Compass/examples/AP_Compass_test/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_Compass/examples/AP_Compass_test/Makefile +++ b/libraries/AP_Compass/examples/AP_Compass_test/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Declination/examples/AP_Declination_test/Makefile b/libraries/AP_Declination/examples/AP_Declination_test/Makefile index fcdc8ff8fe..0ea05fd5c2 100644 --- a/libraries/AP_Declination/examples/AP_Declination_test/Makefile +++ b/libraries/AP_Declination/examples/AP_Declination_test/Makefile @@ -1,4 +1,4 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk sitl: make -f ../../../../libraries/Desktop/Desktop.mk diff --git a/libraries/AP_GPS/examples/GPS_406_test/Makefile b/libraries/AP_GPS/examples/GPS_406_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_GPS/examples/GPS_406_test/Makefile +++ b/libraries/AP_GPS/examples/GPS_406_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_GPS/examples/GPS_AUTO_test/Makefile b/libraries/AP_GPS/examples/GPS_AUTO_test/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_GPS/examples/GPS_AUTO_test/Makefile +++ b/libraries/AP_GPS/examples/GPS_AUTO_test/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_GPS/examples/GPS_MTK_test/Makefile b/libraries/AP_GPS/examples/GPS_MTK_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_GPS/examples/GPS_MTK_test/Makefile +++ b/libraries/AP_GPS/examples/GPS_MTK_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_GPS/examples/GPS_NMEA_test/Makefile b/libraries/AP_GPS/examples/GPS_NMEA_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_GPS/examples/GPS_NMEA_test/Makefile +++ b/libraries/AP_GPS/examples/GPS_NMEA_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_GPS/examples/GPS_UBLOX_test/Makefile b/libraries/AP_GPS/examples/GPS_UBLOX_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_GPS/examples/GPS_UBLOX_test/Makefile +++ b/libraries/AP_GPS/examples/GPS_UBLOX_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/AnalogIn/Makefile b/libraries/AP_HAL_AVR/examples/AnalogIn/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/AnalogIn/Makefile +++ b/libraries/AP_HAL_AVR/examples/AnalogIn/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/ArduCopterLibs/Makefile b/libraries/AP_HAL_AVR/examples/ArduCopterLibs/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_HAL_AVR/examples/ArduCopterLibs/Makefile +++ b/libraries/AP_HAL_AVR/examples/ArduCopterLibs/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/ArduPlaneLibs/Makefile b/libraries/AP_HAL_AVR/examples/ArduPlaneLibs/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_HAL_AVR/examples/ArduPlaneLibs/Makefile +++ b/libraries/AP_HAL_AVR/examples/ArduPlaneLibs/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/Blink/Makefile b/libraries/AP_HAL_AVR/examples/Blink/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/Blink/Makefile +++ b/libraries/AP_HAL_AVR/examples/Blink/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/Console/Makefile b/libraries/AP_HAL_AVR/examples/Console/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_HAL_AVR/examples/Console/Makefile +++ b/libraries/AP_HAL_AVR/examples/Console/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/Makefile b/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/Makefile +++ b/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/LCDTest/Makefile b/libraries/AP_HAL_AVR/examples/LCDTest/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/LCDTest/Makefile +++ b/libraries/AP_HAL_AVR/examples/LCDTest/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/RCInputTest/Makefile b/libraries/AP_HAL_AVR/examples/RCInputTest/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/RCInputTest/Makefile +++ b/libraries/AP_HAL_AVR/examples/RCInputTest/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/RCPassthroughTest/Makefile b/libraries/AP_HAL_AVR/examples/RCPassthroughTest/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/RCPassthroughTest/Makefile +++ b/libraries/AP_HAL_AVR/examples/RCPassthroughTest/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/Makefile b/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/Makefile +++ b/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/Scheduler/Makefile b/libraries/AP_HAL_AVR/examples/Scheduler/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/Scheduler/Makefile +++ b/libraries/AP_HAL_AVR/examples/Scheduler/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/Storage/Makefile b/libraries/AP_HAL_AVR/examples/Storage/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_AVR/examples/Storage/Makefile +++ b/libraries/AP_HAL_AVR/examples/Storage/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_AVR/examples/UARTDriver/Makefile b/libraries/AP_HAL_AVR/examples/UARTDriver/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_HAL_AVR/examples/UARTDriver/Makefile +++ b/libraries/AP_HAL_AVR/examples/UARTDriver/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_Empty/examples/empty_example/Makefile b/libraries/AP_HAL_Empty/examples/empty_example/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_Empty/examples/empty_example/Makefile +++ b/libraries/AP_HAL_Empty/examples/empty_example/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_HAL_PX4/examples/simple/Makefile b/libraries/AP_HAL_PX4/examples/simple/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_HAL_PX4/examples/simple/Makefile +++ b/libraries/AP_HAL_PX4/examples/simple/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_InertialNav/examples/AP_InertialNav_test/Makefile b/libraries/AP_InertialNav/examples/AP_InertialNav_test/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_InertialNav/examples/AP_InertialNav_test/Makefile +++ b/libraries/AP_InertialNav/examples/AP_InertialNav_test/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_InertialSensor/examples/MPU6000/Makefile b/libraries/AP_InertialSensor/examples/MPU6000/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_InertialSensor/examples/MPU6000/Makefile +++ b/libraries/AP_InertialSensor/examples/MPU6000/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_LeadFilter/examples/AP_LeadFilter/Makefile b/libraries/AP_LeadFilter/examples/AP_LeadFilter/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_LeadFilter/examples/AP_LeadFilter/Makefile +++ b/libraries/AP_LeadFilter/examples/AP_LeadFilter/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Math/examples/eulers/Makefile b/libraries/AP_Math/examples/eulers/Makefile index fcdc8ff8fe..0ea05fd5c2 100644 --- a/libraries/AP_Math/examples/eulers/Makefile +++ b/libraries/AP_Math/examples/eulers/Makefile @@ -1,4 +1,4 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk sitl: make -f ../../../../libraries/Desktop/Desktop.mk diff --git a/libraries/AP_Math/examples/location/Makefile b/libraries/AP_Math/examples/location/Makefile index fcdc8ff8fe..0ea05fd5c2 100644 --- a/libraries/AP_Math/examples/location/Makefile +++ b/libraries/AP_Math/examples/location/Makefile @@ -1,4 +1,4 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk sitl: make -f ../../../../libraries/Desktop/Desktop.mk diff --git a/libraries/AP_Math/examples/polygon/Makefile b/libraries/AP_Math/examples/polygon/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_Math/examples/polygon/Makefile +++ b/libraries/AP_Math/examples/polygon/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Math/examples/rotations/Makefile b/libraries/AP_Math/examples/rotations/Makefile index fcdc8ff8fe..0ea05fd5c2 100644 --- a/libraries/AP_Math/examples/rotations/Makefile +++ b/libraries/AP_Math/examples/rotations/Makefile @@ -1,4 +1,4 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk sitl: make -f ../../../../libraries/Desktop/Desktop.mk diff --git a/libraries/AP_Menu/examples/menu/Makefile b/libraries/AP_Menu/examples/menu/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_Menu/examples/menu/Makefile +++ b/libraries/AP_Menu/examples/menu/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Motors/examples/AP_Motors_test/Makefile b/libraries/AP_Motors/examples/AP_Motors_test/Makefile index bd5f874ba2..58dcebb211 100644 --- a/libraries/AP_Motors/examples/AP_Motors_test/Makefile +++ b/libraries/AP_Motors/examples/AP_Motors_test/Makefile @@ -1,5 +1,5 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk apm2: make -f Makefile EXTRAFLAGS="-DAPM2_HARDWARE=1" diff --git a/libraries/AP_Mount/examples/trivial_AP_Mount/Makefile b/libraries/AP_Mount/examples/trivial_AP_Mount/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/AP_Mount/examples/trivial_AP_Mount/Makefile +++ b/libraries/AP_Mount/examples/trivial_AP_Mount/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Navigation/examples/Navigation/Makefile b/libraries/AP_Navigation/examples/Navigation/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_Navigation/examples/Navigation/Makefile +++ b/libraries/AP_Navigation/examples/Navigation/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Navigation/examples/Navigation_simple/Makefile b/libraries/AP_Navigation/examples/Navigation_simple/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_Navigation/examples/Navigation_simple/Makefile +++ b/libraries/AP_Navigation/examples/Navigation_simple/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/Makefile b/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/Makefile index a5d5e7918b..e76d4e3d7b 100644 --- a/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/Makefile +++ b/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega2560 -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_RangeFinder/examples/MaxsonarXL_test/Makefile b/libraries/AP_RangeFinder/examples/MaxsonarXL_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/AP_RangeFinder/examples/MaxsonarXL_test/Makefile +++ b/libraries/AP_RangeFinder/examples/MaxsonarXL_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/DataFlash/examples/DataFlash_test/Makefile b/libraries/DataFlash/examples/DataFlash_test/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/DataFlash/examples/DataFlash_test/Makefile +++ b/libraries/DataFlash/examples/DataFlash_test/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/Filter/examples/Derivative/Makefile b/libraries/Filter/examples/Derivative/Makefile index fcdc8ff8fe..0ea05fd5c2 100644 --- a/libraries/Filter/examples/Derivative/Makefile +++ b/libraries/Filter/examples/Derivative/Makefile @@ -1,4 +1,4 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk sitl: make -f ../../../../libraries/Desktop/Desktop.mk diff --git a/libraries/Filter/examples/Filter/Makefile b/libraries/Filter/examples/Filter/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/Filter/examples/Filter/Makefile +++ b/libraries/Filter/examples/Filter/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/Filter/examples/LowPassFilter/Makefile b/libraries/Filter/examples/LowPassFilter/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/Filter/examples/LowPassFilter/Makefile +++ b/libraries/Filter/examples/LowPassFilter/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/GCS_Console/examples/Console/Makefile b/libraries/GCS_Console/examples/Console/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/GCS_Console/examples/Console/Makefile +++ b/libraries/GCS_Console/examples/Console/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/PID/examples/pid/Makefile b/libraries/PID/examples/pid/Makefile index d1f40fd90f..1f4121d435 100644 --- a/libraries/PID/examples/pid/Makefile +++ b/libraries/PID/examples/pid/Makefile @@ -1 +1 @@ -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/RC_Channel/examples/RC_Channel/Makefile b/libraries/RC_Channel/examples/RC_Channel/Makefile index 85b4d8856b..bc40321033 100644 --- a/libraries/RC_Channel/examples/RC_Channel/Makefile +++ b/libraries/RC_Channel/examples/RC_Channel/Makefile @@ -1,2 +1,2 @@ BOARD = mega -include ../../../AP_Common/Arduino.mk +include ../../../../mk/Arduino.mk diff --git a/libraries/AP_Common/Arduino.mk b/mk/Arduino.mk similarity index 100% rename from libraries/AP_Common/Arduino.mk rename to mk/Arduino.mk