[paparazzi-commits] [5986] makefile fixes for actuators move and rename

[Felix Ruess]

Revision: 5986
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5986
Author:   flixr
Date:     2010-09-28 09:13:35 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
makefile fixes for actuators move and rename

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile

Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-09-28 
09:13:28 UTC (rev 5985)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-09-28 
09:13:35 UTC (rev 5986)
@@ -434,7 +434,7 @@
 # test actuators mkk
 #
 test_actuators_mkk.ARCHDIR = $(ARCH)
-test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_actuators_mkk.CFLAGS = -I$(SRC_FIRMWARE) -I$(SRC_LISA) -I$(ARCH) 
-I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_actuators_mkk.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_actuators_mkk.srcs = test/test_actuators.c \
                                                  
$(SRC_ARCH)/stm32_exceptions.c   \
@@ -464,7 +464,7 @@
 # test actuators asctecv1
 #
 test_actuators_asctecv1.ARCHDIR = $(ARCH)
-test_actuators_asctecv1.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_actuators_asctecv1.CFLAGS = -I$(SRC_FIRMWARE) -I$(SRC_LISA) -I$(ARCH) 
-I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_actuators_asctecv1.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_actuators_asctecv1.srcs = test/test_actuators.c            \
                                                           
$(SRC_ARCH)/stm32_exceptions.c   \

Modified: paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile    2010-09-28 
09:13:28 UTC (rev 5985)
+++ paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile    2010-09-28 
09:13:35 UTC (rev 5986)
@@ -123,6 +123,8 @@
 SRC_BOOZ=booz
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 
+SRC_FIRMWARE=firmwares/rotorcraft
+
 #BOARD_CFG=\"boards/olimex_stm32-h103.h\"
 BOARD_CFG=\"boards/lisa_l_1.0.h\"
 #FLASH_MODE = SERIAL
@@ -370,7 +372,7 @@
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
 
 test_servos.ARCHDIR = $(ARCH)
-test_servos.CFLAGS  = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) 
-DPERIPHERALS_AUTO_INIT
+test_servos.CFLAGS  = -I$(SRC_FIRMWARE) 
-I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_servos.LDFLAGS += -lm
 test_servos.srcs += $(SRC_LISA)/test_servos.c   \
@@ -399,7 +401,7 @@
 # test IMU b2
 #
 test_imu_b2.ARCHDIR = $(ARCH)
-test_imu_b2.CFLAGS  = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/imu/arch/$(ARCH)  
-I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_imu_b2.CFLAGS  = -I$(SRC_FIRMWARE) -I$(SRC_FIRMWARE)/imu/arch/$(ARCH) 
-I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_imu_b2.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
                     $(SRC_ARCH)/stm32_exceptions.c   \
@@ -585,7 +587,7 @@
 # test actuators mkk
 #
 test_actuators_mkk.ARCHDIR = $(ARCH)
-test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_actuators_mkk.CFLAGS = -I$(SRC_FIRMWARE) 
-I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_actuators_mkk.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_actuators_mkk.srcs = $(SRC_LISA)/test/lisa_test_actuators_mkk.c \
                           $(SRC_ARCH)/stm32_exceptions.c   \
@@ -606,7 +608,7 @@
 
 test_actuators_mkk.srcs += $(SRC_BOOZ)/booz2_commands.c
 #test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c \
-#                           $(SRC_BOOZ_ARCH)/actuators/actuators_mkk_arch.c
+#                           
$(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_mkk_arch.c
 #test_actuators_mkk.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c1  -DUSE_TIM2_IRQ
 test_actuators_mkk.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL 
-DACTUATORS_ASCTEC_DEVICE=i2c1
 test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
@@ -619,7 +621,7 @@
 # test actuators asctec
 #
 test_actuators_asctec.ARCHDIR = $(ARCH)
-test_actuators_asctec.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
+test_actuators_asctec.CFLAGS = -I$(SRC_FIRMWARE) -I$(SRC_LISA) -I$(ARCH) 
-I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_actuators_asctec.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_actuators_asctec.srcs = $(SRC_LISA)/test/lisa_test_actuators_mkk.c \
                           $(SRC_ARCH)/stm32_exceptions.c   \
@@ -641,7 +643,7 @@
 test_actuators_asctec.srcs += $(SRC_BOOZ)/booz2_commands.c
 test_actuators_asctec.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
 #\
-#                              
$(SRC_BOOZ_ARCH)/actuators/actuators_asctec_arch.c
+#                              
$(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_asctec_arch.c
 test_actuators_asctec.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
 # -DBOOZ_START_DELAY=3
 #  -DUSE_TIM2_IRQ