diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/drops.xml
index 1ad5f47ecb..258fd2f6fa 100644
--- a/conf/airframes/ENAC/fixed-wing/drops.xml
+++ b/conf/airframes/ENAC/fixed-wing/drops.xml
@@ -270,8 +270,6 @@ ap.srcs += snav.c
 # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/ENAC/fixed-wing/firestorm.xml b/conf/airframes/ENAC/fixed-wing/firestorm.xml
index 29f15e0291..5a29cfcb3f 100644
--- a/conf/airframes/ENAC/fixed-wing/firestorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/firestorm.xml
@@ -263,8 +263,6 @@ ap.CFLAGS += -DUSE_MODULES
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/ENAC/fixed-wing/funjet1.xml b/conf/airframes/ENAC/fixed-wing/funjet1.xml
index d79ba9eab7..a23fa01e4b 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet1.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet1.xml
@@ -300,8 +300,6 @@ ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
@@ -321,8 +319,6 @@ sim.srcs += nav_line.c nav_survey_rectangle.c
 # a test program to setup actuators 
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
-setup_actuators.TARGET = setup_actuators
-setup_actuators.TARGETDIR = setup_actuators
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART1 -DUART1_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=Uart1
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4015_hw.c main.c
diff --git a/conf/airframes/ENAC/fixed-wing/slayer2.xml b/conf/airframes/ENAC/fixed-wing/slayer2.xml
index 74627dbc9e..9c54fb869a 100644
--- a/conf/airframes/ENAC/fixed-wing/slayer2.xml
+++ b/conf/airframes/ENAC/fixed-wing/slayer2.xml
@@ -272,8 +272,6 @@ ap.CFLAGS += -D BARO_MS5534A_W1=0xAC20 -D BARO_MS5534A_W2=0x87D9 -D BARO_MS5534A
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/ENAC/fixed-wing/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
index 6765dcad56..9a2113f44f 100644
--- a/conf/airframes/ENAC/fixed-wing/solarstorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
@@ -255,8 +255,6 @@ ap.CFLAGS += -DUSE_MODULES
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/ENAC/fixed-wing/spocII.xml b/conf/airframes/ENAC/fixed-wing/spocII.xml
index 1978a6c42d..d1e8089db5 100644
--- a/conf/airframes/ENAC/fixed-wing/spocII.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocII.xml
@@ -255,8 +255,6 @@ ap.CFLAGS += -DUSE_ADC_3 -DADC_CHANNEL_CURRENT=ADC_3
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
@@ -278,8 +276,6 @@ jsbsim.srcs += $(SIMDIR)/sim_ac_fw.c
 # a test program to setup actuators 
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
-setup_actuators.TARGET = setup_actuators
-setup_actuators.TARGETDIR = setup_actuators
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART1 -DUART1_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=Uart1
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4015_hw.c main.c
diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
index 8320585145..fbe6681233 100644
--- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -305,8 +305,6 @@ ap.CFLAGS += -DUSE_MODULES
 
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl_n.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/Poine/antenna.xml b/conf/airframes/Poine/antenna.xml
index 70383c9f25..b9e81c5540 100644
--- a/conf/airframes/Poine/antenna.xml
+++ b/conf/airframes/Poine/antenna.xml
@@ -11,8 +11,6 @@
 ARCHI=avr
 ant.ARCHDIR = $(ARCHI)
 ant.ARCH = atmega128
-ant.TARGET = ant
-ant.TARGETDIR = ant
 
 
 # 16MHz resonator
diff --git a/conf/airframes/Poine/autoplato.xml b/conf/airframes/Poine/autoplato.xml
index ced78bd3a3..bf4f142dc7 100644
--- a/conf/airframes/Poine/autoplato.xml
+++ b/conf/airframes/Poine/autoplato.xml
@@ -13,8 +13,6 @@ include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
 
 test_usb.ARCHDIR = $(ARCHI)
 test_usb.ARCH = arm7tdmi
-test_usb.TARGET = test_usb
-test_usb.TARGETDIR = test_usb
 
 test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_usb.srcs += $(SRC_BOOZ_TEST)/atpt_main.c
diff --git a/conf/airframes/Poine/beth.xml b/conf/airframes/Poine/beth.xml
index b9e719209b..72b0b3c8cd 100644
--- a/conf/airframes/Poine/beth.xml
+++ b/conf/airframes/Poine/beth.xml
@@ -102,8 +102,6 @@ SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCH)
 
 main_stm32.ARCHDIR = stm32
 #main_stm32.LDSCRIPT = $(SRC_ARCH)/stm32f103re_flash.ld
-main_stm32.TARGET = main_stm32
-main_stm32.TARGETDIR = main_stm32
 main_stm32.CFLAGS += -I$(SRC_LISA) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_LISA_ARCH) -DPERIPHERALS_AUTO_INIT
 main_stm32.CFLAGS += -DBOARD_CONFIG=\"boards/lisa_l_1.0.h\"
 main_stm32.srcs = $(SRC_BETH)/main_stm32.c \
@@ -177,8 +175,6 @@ main_coders.OOCD_BOARD = olimex_stm32_h103
 #main_coders.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_stm32-h103.h\"
 main_coders.CFLAGS += -DBOARD_CONFIG=\"boards/beth.h\"
 
-main_coders.TARGET = main_coders
-main_coders.TARGETDIR = main_coders
 main_coders.CFLAGS += -I$(SRC_LISA) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 main_coders.srcs = $(SRC_BETH)/main_coders.c \
                    $(SRC_ARCH)/stm32_exceptions.c   \
diff --git a/conf/airframes/Poine/bl_mc.xml b/conf/airframes/Poine/bl_mc.xml
index 28fcccf198..1e7f2a2dc1 100644
--- a/conf/airframes/Poine/bl_mc.xml
+++ b/conf/airframes/Poine/bl_mc.xml
@@ -7,8 +7,6 @@ ARCHI=avr
 
 main.ARCHDIR=$(ARCHI)
 main.ARCH = atmega128
-main.TARGET = main
-main.TARGETDIR = main
 
 # internal RC 8MHz
 LOW_FUSE  = e4
diff --git a/conf/airframes/Poine/motor_bench.xml b/conf/airframes/Poine/motor_bench.xml
index ed0a982982..0ef429d1d0 100644
--- a/conf/airframes/Poine/motor_bench.xml
+++ b/conf/airframes/Poine/motor_bench.xml
@@ -10,8 +10,6 @@ MB=motor_bench
 
 main.ARCHDIR = $(ARCHI)
 main.ARCH = arm7tdmi
-main.TARGET = mb
-main.TARGETDIR = mb
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 main.srcs = $(MB)/main_motor_bench.c
@@ -57,8 +55,6 @@ main.srcs += $(MB)/mb_modes.c
 
 foo.ARCHDIR = $(ARCHI)
 foo.ARCH = arm7tdmi
-foo.TARGET = mb
-foo.TARGETDIR = mb
 
 foo.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 foo.srcs = $(MB)/main_foo.c
@@ -79,8 +75,6 @@ foo.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
 
 bar.ARCHDIR = $(ARCHI)
 bar.ARCH = arm7tdmi
-bar.TARGET = mb
-bar.TARGETDIR = mb
 
 bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 bar.srcs = $(MB)/main_bar.c
diff --git a/conf/airframes/Poine/pt_ant.xml b/conf/airframes/Poine/pt_ant.xml
index d6a105298d..cbc45eef89 100644
--- a/conf/airframes/Poine/pt_ant.xml
+++ b/conf/airframes/Poine/pt_ant.xml
@@ -10,8 +10,6 @@
 
 tunnel.ARCHDIR = $(ARCHI)
 tunnel.ARCH = arm7tdmi
-tunnel.TARGET = tunnel
-tunnel.TARGETDIR = tunnel
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"conf_demo.h\" -DLED -DTIME_LED=1
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
@@ -23,8 +21,6 @@ PT_ANT = antenna
 
 main.ARCHDIR = $(ARCHI)
 main.ARCH = arm7tdmi
-main.TARGET = main
-main.TARGETDIR = main
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(PT_ANT)
 main.srcs = $(PT_ANT)/pt_ant_main.c
diff --git a/conf/airframes/Poine/turntable.xml b/conf/airframes/Poine/turntable.xml
index b0936e40cd..aa6b053208 100644
--- a/conf/airframes/Poine/turntable.xml
+++ b/conf/airframes/Poine/turntable.xml
@@ -10,8 +10,6 @@ MB=motor_bench
 
 main.ARCHDIR = $(ARCHI)
 main.ARCH = arm7tdmi
-main.TARGET = main
-main.TARGETDIR = main
 
 main.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" -I$(MB)
 main.CFLAGS += -DPERIPHERALS_AUTO_INIT
diff --git a/conf/airframes/demo.xml b/conf/airframes/demo.xml
index f073369d29..d06b898d9d 100644
--- a/conf/airframes/demo.xml
+++ b/conf/airframes/demo.xml
@@ -12,8 +12,6 @@ FLASH_MODE = IAP
 #
 demo1.ARCHDIR = $(ARCHI)
 demo1.ARCH = arm7tdmi
-demo1.TARGET = demo1
-demo1.TARGETDIR = demo1
 
 demo1.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo1.srcs = main_demo1.c
@@ -23,8 +21,6 @@ demo1.srcs = main_demo1.c
 #
 demo2.ARCHDIR = $(ARCHI)
 demo2.ARCH = arm7tdmi
-demo2.TARGET = demo2
-demo2.TARGETDIR = demo2
 
 demo2.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo2.srcs = main_demo2.c
@@ -39,8 +35,6 @@ demo2.CFLAGS += -DLED
 #
 demo3.ARCHDIR = $(ARCHI)
 demo3.ARCH = arm7tdmi
-demo3.TARGET = demo3
-demo3.TARGETDIR = demo3
 
 demo3.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo3.srcs = main_demo3.c
@@ -61,8 +55,6 @@ demo3.srcs += $(SRC_ARCH)/uart_hw.c
 #
 demo4.ARCHDIR = $(ARCHI)
 demo4.ARCH = arm7tdmi
-demo4.TARGET = demo4
-demo4.TARGETDIR = demo4
 
 demo4.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo4.srcs = main_demo4.c
@@ -87,8 +79,6 @@ demo4.srcs += downlink.c pprz_transport.c
 #
 demo5.ARCHDIR = $(ARCHI)
 demo5.ARCH = arm7tdmi
-demo5.TARGET = demo5
-demo5.TARGETDIR = demo5
 
 demo5.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo5.srcs = main_demo5.c
@@ -114,8 +104,6 @@ demo5.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
 #
 demo6.ARCHDIR = $(ARCHI)
 demo6.ARCH = arm7tdmi
-demo6.TARGET = demo6
-demo6.TARGETDIR = demo6
 
 demo6.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo6.srcs = main_demo6.c
@@ -144,8 +132,6 @@ demo6.srcs += downlink.c pprz_transport.c
 #
 test_spk.ARCHDIR = $(ARCHI)
 test_spk.ARCH = arm7tdmi
-test_spk.TARGET = test_spk
-test_spk.TARGETDIR = test_spk
 
 test_spk.CFLAGS += -DBOARD_CONFIG=\"booz2_board_usb.h\"
 test_spk.srcs = main_test_spk.c
diff --git a/conf/airframes/hitl_usb.xml b/conf/airframes/hitl_usb.xml
index d8d29ccae4..dd7763ae7c 100644
--- a/conf/airframes/hitl_usb.xml
+++ b/conf/airframes/hitl_usb.xml
@@ -155,8 +155,6 @@ ap.CFLAGS += -DGPS_USE_LATLONG # simulating LEA 5H
 # Config for SITL simulation
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED
 sim.srcs = latlong.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml
index 7aa431fea3..fca0e1b6f5 100644
--- a/conf/airframes/mm/fixed-wing/merlin.xml
+++ b/conf/airframes/mm/fixed-wing/merlin.xml
@@ -226,8 +226,6 @@ ap.srcs += snav.c
 # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/obsolete/dc_mc.xml b/conf/airframes/obsolete/dc_mc.xml
index 2dd4821382..7a10c0bacb 100644
--- a/conf/airframes/obsolete/dc_mc.xml
+++ b/conf/airframes/obsolete/dc_mc.xml
@@ -7,8 +7,6 @@ ARCHI=avr
 
 main.ARCHDIR=$(ARCHI)
 main.ARCH = atmega8
-main.TARGET = main
-main.TARGETDIR = main
 
 # to check :  16MHz reso
 main.LOW_FUSE  = 2e
diff --git a/conf/airframes/obsolete/example.xml b/conf/airframes/obsolete/example.xml
index 70ec434090..f76a1ceb37 100644
--- a/conf/airframes/obsolete/example.xml
+++ b/conf/airframes/obsolete/example.xml
@@ -14,8 +14,6 @@ FLASH_MODE = IAP
 #
 example_gps.ARCHDIR = $(ARCHI)
 example_gps.ARCH = arm7tdmi
-example_gps.TARGET = example_gps
-example_gps.TARGETDIR = example_gps
 
 example_gps.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 example_gps.srcs = example/example_gps.c
diff --git a/conf/airframes/obsolete/lila.xml b/conf/airframes/obsolete/lila.xml
index 9d170450a8..dfea3b2b24 100644
--- a/conf/airframes/obsolete/lila.xml
+++ b/conf/airframes/obsolete/lila.xml
@@ -249,8 +249,6 @@ ap.srcs += snav.c
 # Config for SITL simulation
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/obsolete/malolo_sim.xml b/conf/airframes/obsolete/malolo_sim.xml
index b215a1de42..1cd7ac2072 100644
--- a/conf/airframes/obsolete/malolo_sim.xml
+++ b/conf/airframes/obsolete/malolo_sim.xml
@@ -225,8 +225,6 @@ include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
 SIM_TYPE = JSBSIM
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = sim
-sim.TARGETDIR = sim
 
 sim.CFLAGS += -I$(SIMDIR) -I/home/cocoleon/usr/include/JSBSim -I/usr/include
 sim.CFLAGS += `pkg-config glib-2.0 --cflags`
diff --git a/conf/airframes/obsolete/nova.xml b/conf/airframes/obsolete/nova.xml
index 46cde2578c..216f441a5a 100644
--- a/conf/airframes/obsolete/nova.xml
+++ b/conf/airframes/obsolete/nova.xml
@@ -8,8 +8,6 @@ FLASH_MODE = IAP
 
 timu.ARCHDIR = $(ARCHI)
 timu.ARCH = arm7tdmi
-timu.TARGET = timu
-timu.TARGETDIR = timu
 
 timu.CFLAGS += -DBOARD_CONFIG=\"tiny_2_0.h\" -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1e-1)'
 timu.srcs = nova_test_imu.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
diff --git a/conf/airframes/obsolete/tl.xml b/conf/airframes/obsolete/tl.xml
index b1c73ac1a4..b8a1e385ac 100644
--- a/conf/airframes/obsolete/tl.xml
+++ b/conf/airframes/obsolete/tl.xml
@@ -83,8 +83,6 @@ FLASH_MODE = IAP
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = flt
-ap.TARGETDIR = flt
 
 ap.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(16.666e-3)' -I$(TL)
 ap.srcs = $(TL)/tl_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
@@ -133,8 +131,6 @@ ap.srcs += common_nav.c $(TL)/tl_nav.c
 
 tmm.ARCHDIR = $(ARCHI)
 tmm.ARCH = arm7tdmi
-tmm.TARGET = tmm
-tmm.TARGETDIR = tmm
 
 tmm.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(16.666e-3)'
 tmm.srcs = $(TL)/tl_test_mm_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
@@ -151,8 +147,6 @@ tmm.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
 
 timu.ARCHDIR = $(ARCHI)
 timu.ARCH = arm7tdmi
-timu.TARGET = timu
-timu.TARGETDIR = timu
 
 timu.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(16.666e-3)'
 timu.srcs = $(TL)/tl_test_imu_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
diff --git a/conf/airframes/obsolete/twinstarmm.xml b/conf/airframes/obsolete/twinstarmm.xml
index 56ca7f1c0d..09ec1d5aa7 100644
--- a/conf/airframes/obsolete/twinstarmm.xml
+++ b/conf/airframes/obsolete/twinstarmm.xml
@@ -249,8 +249,6 @@ ap.srcs += snav.c
 # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml
index 462c6f0fd0..60582baec2 100644
--- a/conf/airframes/obsolete/xxx1.xml
+++ b/conf/airframes/obsolete/xxx1.xml
@@ -280,8 +280,6 @@ sim.srcs += nav_line.c nav_survey_rectangle.c
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
-setup_actuators.TARGET = setup_actuators
-setup_actuators.TARGETDIR = setup_actuators
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4015_hw.c main.c
diff --git a/conf/airframes/test_i2c.xml b/conf/airframes/test_i2c.xml
index bb5f88a3fc..47a7f4c9b5 100644
--- a/conf/airframes/test_i2c.xml
+++ b/conf/airframes/test_i2c.xml
@@ -10,8 +10,6 @@
 ARCHI=arm7
 mb.ARCHDIR = $(ARCHI)
 mb.ARCH = arm7tdmi
-mb.TARGET = motor_bench
-mb.TARGETDIR = motor_bench
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
diff --git a/conf/airframes/vor.xml b/conf/airframes/vor.xml
index f3f0e047e1..d417a4b9aa 100644
--- a/conf/airframes/vor.xml
+++ b/conf/airframes/vor.xml
@@ -9,8 +9,6 @@ VOR=vor
 FLASH_MODE = IAP
 main.ARCHDIR = $(ARCHI)
 main.ARCH = arm7tdmi
-main.TARGET = main
-main.TARGETDIR = main
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 main.srcs = $(VOR)/lpc_vor_main.c
diff --git a/conf/airframes/wind_tunnel.xml b/conf/airframes/wind_tunnel.xml
index 27eb480e38..b275d66c39 100644
--- a/conf/airframes/wind_tunnel.xml
+++ b/conf/airframes/wind_tunnel.xml
@@ -11,8 +11,6 @@ WIND_TUNNEL=wind_tunnel
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = ap
-ap.TARGETDIR = ap
 
 ap.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(WIND_TUNNEL)
 ap.srcs = $(WIND_TUNNEL)/main.c
@@ -44,8 +42,6 @@ MB=motor_bench
 
 mb.ARCHDIR = $(ARCHI)
 mb.ARCH = arm7tdmi
-mb.TARGET = mb
-mb.TARGETDIR = mb
 
 mb.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(WIND_TUNNEL) -I$(MB)
 mb.srcs = $(WIND_TUNNEL)/main_mb.c
diff --git a/conf/autopilot/booz2_test_progs.makefile b/conf/autopilot/booz2_test_progs.makefile
index 04f91148d7..bc5d6aef53 100644
--- a/conf/autopilot/booz2_test_progs.makefile
+++ b/conf/autopilot/booz2_test_progs.makefile
@@ -27,8 +27,6 @@
 #
 test_led.ARCHDIR = $(ARCHI)
 test_led.ARCH = arm7tdmi
-test_led.TARGET = test_led
-test_led.TARGETDIR = test_led
 
 test_led.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_led.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -42,8 +40,6 @@ test_led.srcs   += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 #
 test_downlink.ARCHDIR = $(ARCHI)
 test_downlink.ARCH = arm7tdmi
-test_downlink.TARGET = test_downlink
-test_downlink.TARGETDIR = test_downlink
 
 test_downlink.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_downlink.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -64,8 +60,6 @@ test_downlink.srcs   += downlink.c pprz_transport.c
 #
 test_max1168.ARCHDIR = $(ARCHI)
 test_max1168.ARCH = arm7tdmi
-test_max1168.TARGET = test_max1168
-test_max1168.TARGETDIR = test_max1168
 
 test_max1168.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_max1168.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -89,8 +83,6 @@ test_max1168.srcs   += $(SRC_BOOZ)/peripherals/booz_max1168.c \
 #
 test_micromag.ARCHDIR = $(ARCHI)
 test_micromag.ARCH = arm7tdmi
-test_micromag.TARGET = test_micromag
-test_micromag.TARGETDIR = test_micromag
 
 test_micromag.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_micromag.srcs += $(SRC_BOOZ_TEST)/booz2_test_micromag.c
@@ -117,8 +109,6 @@ test_micromag.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
 #
 tunnel.ARCHDIR = $(ARCHI)
 tunnel.ARCH = arm7tdmi
-tunnel.TARGET = tunnel
-tunnel.TARGETDIR = tunnel
 
 tunnel.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 tunnel.srcs += $(SRC_BOOZ_TEST)/booz2_tunnel.c
@@ -136,8 +126,6 @@ tunnel.srcs += $(SRC_ARCH)/uart_hw.c
 #
 tunnel_bb.ARCHDIR = $(ARCHI)
 tunnel_bb.ARCH = arm7tdmi
-tunnel_bb.TARGET = tunnel_bb
-tunnel_bb.TARGETDIR = tunnel_bb
 
 tunnel_bb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 tunnel_bb.srcs += $(SRC_BOOZ_TEST)/booz2_tunnel_bb.c
@@ -152,8 +140,6 @@ tunnel_bb.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 #
 test_gps.ARCHDIR = $(ARCHI)
 test_gps.ARCH = arm7tdmi
-test_gps.TARGET = test_gps
-test_gps.TARGETDIR = test_gps
 
 test_gps.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_gps.srcs += $(SRC_BOOZ_TEST)/booz2_test_gps.c
@@ -180,8 +166,6 @@ test_gps.srcs += $(SRC_BOOZ)/booz2_gps.c
 #
 test_modem.ARCHDIR = $(ARCHI)
 test_modem.ARCH = arm7tdmi
-test_modem.TARGET = test_modem
-test_modem.TARGETDIR = test_modem
 
 test_modem.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_modem.srcs += $(SRC_BOOZ_TEST)/booz2_test_modem.c
@@ -204,8 +188,6 @@ test_modem.srcs += downlink.c pprz_transport.c
 #
 test_usb.ARCHDIR = $(ARCHI)
 test_usb.ARCH = arm7tdmi
-test_usb.TARGET = test_usb
-test_usb.TARGETDIR = test_usb
 
 test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_usb.srcs += $(SRC_BOOZ_TEST)/booz2_test_usb.c
@@ -236,8 +218,6 @@ test_usb.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
 #
 test_ami.ARCHDIR = $(ARCHI)
 test_ami.ARCH = arm7tdmi
-test_ami.TARGET = test_ami
-test_ami.TARGETDIR = test_ami
 
 test_ami.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_ami.srcs += $(SRC_BOOZ_TEST)/booz2_test_ami.c
@@ -262,8 +242,6 @@ test_ami.srcs += AMI601.c
 #
 test_crista.ARCHDIR = $(ARCHI)
 test_crista.ARCH = arm7tdmi
-test_crista.TARGET = test_crista
-test_crista.TARGETDIR = test_crista
 
 test_crista.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_crista.srcs += $(SRC_BOOZ_TEST)/booz2_test_crista.c
@@ -289,8 +267,6 @@ test_crista.srcs += $(SRC_BOOZ)/booz2_imu_crista.c $(SRC_BOOZ_ARCH)/booz2_imu_cr
 #
 test_micromag2.ARCHDIR = $(ARCHI)
 test_micromag2.ARCH = arm7tdmi
-test_micromag2.TARGET = test_micromag2
-test_micromag2.TARGETDIR = test_micromag2
 
 test_micromag2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_micromag2.srcs += $(SRC_BOOZ_TEST)/booz2_test_micromag_2.c
@@ -316,8 +292,6 @@ test_micromag2.srcs += downlink.c pprz_transport.c
 #
 test_imu_b2.ARCHDIR = $(ARCHI)
 test_imu_b2.ARCH = arm7tdmi
-test_imu_b2.TARGET = test_imu_b2
-test_imu_b2.TARGETDIR = test_imu_b2
 
 test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz2_test_imu_b2.c
@@ -348,8 +322,6 @@ test_imu_b2.srcs += $(SRC_BOOZ)/booz2_imu.c
 
 test_rc_spektrum.ARCHDIR = $(ARCHI)
 test_rc_spektrum.ARCH = arm7tdmi
-test_rc_spektrum.TARGET = test_rc_spektrum
-test_rc_spektrum.TARGETDIR = test_rc_spektrum
 
 test_rc_spektrum.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) $(BOOZ_CFLAGS)
 test_rc_spektrum.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -383,8 +355,6 @@ test_rc_spektrum.srcs += $(SRC_BOOZ)/booz_radio_control.c \
 
 test_rc_ppm.ARCHDIR = $(ARCHI)
 test_rc_ppm.ARCH = arm7tdmi
-test_rc_ppm.TARGET = test_rc_ppm
-test_rc_ppm.TARGETDIR = test_rc_ppm
 
 test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) $(BOOZ_CFLAGS)
 test_rc_ppm.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -416,8 +386,6 @@ test_rc_ppm.srcs += $(SRC_BOOZ)/booz_radio_control.c \
 #
 test_mc.ARCHDIR = $(ARCHI)
 test_mc.ARCH = arm7tdmi
-test_mc.TARGET = test_mc
-test_mc.TARGETDIR = test_mc
 
 test_mc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_mc.srcs += $(SRC_BOOZ_TEST)/booz2_test_mc.c
@@ -443,8 +411,6 @@ test_mc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 #
 test_buss_bldc.ARCHDIR = $(ARCHI)
 test_buss_bldc.ARCH = arm7tdmi
-test_buss_bldc.TARGET = test_buss_bldc
-test_buss_bldc.TARGETDIR = test_buss_bldc
 
 test_buss_bldc.CFLAGS += -DPERIPHERALS_AUTO_INIT
 test_buss_bldc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
@@ -469,8 +435,6 @@ test_buss_bldc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 #
 test_amc.ARCHDIR = $(ARCHI)
 test_amc.ARCH = arm7tdmi
-test_amc.TARGET = test_amc
-test_amc.TARGETDIR = test_amc
 
 test_amc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) 
 test_amc.srcs += $(SRC_BOOZ_TEST)/booz2_test_amc.c
@@ -501,8 +465,6 @@ test_amc.CFLAGS += -DFLOAT_T=float
 #
 test_mkk_bldc.ARCHDIR = $(ARCHI)
 test_mkk_bldc.ARCH = arm7tdmi
-test_mkk_bldc.TARGET = test_mkk_bldc
-test_mkk_bldc.TARGETDIR = test_mkk_bldc
 
 test_mkk_bldc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_mkk_bldc.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -519,8 +481,6 @@ test_mkk_bldc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 #
 test_baro_24.ARCHDIR = $(ARCHI)
 test_baro_24.ARCH = arm7tdmi
-test_baro_24.TARGET = test_baro_24
-test_baro_24.TARGETDIR = test_baro_24
 
 test_baro_24.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) $(BOOZ_CFLAGS)
 test_baro_24.srcs += $(SRC_BOOZ_TEST)/booz2_test_baro_24.c
@@ -544,8 +504,6 @@ test_baro_24.srcs += $(SRC_BOOZ)/booz2_baro_24.c
 #
 test_coder.ARCHDIR = $(ARCHI)
 test_coder.ARCH = arm7tdmi
-test_coder.TARGET = test_coder
-test_coder.TARGETDIR = test_coder
 
 test_coder.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" $(BOOZ_CFLAGS)
 test_coder.CFLAGS += -DPERIPHERALS_AUTO_INIT
diff --git a/conf/autopilot/booz_test_progs.makefile b/conf/autopilot/booz_test_progs.makefile
index 972a0ae6aa..d733d63401 100644
--- a/conf/autopilot/booz_test_progs.makefile
+++ b/conf/autopilot/booz_test_progs.makefile
@@ -65,8 +65,6 @@ BOARD_CFG=\"boards/booz_1.0.h\"
 #
 test_telemetry.ARCHDIR   = $(ARCHI)
 test_telemetry.ARCH      = arm7tdmi
-test_telemetry.TARGET    = test_telemetry
-test_telemetry.TARGETDIR = test_telemetry
 test_telemetry.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_telemetry.CFLAGS += -DPERIPHERALS_AUTO_INIT
 test_telemetry.srcs   += test/test_telemetry.c \
@@ -93,8 +91,6 @@ test_telemetry.srcs   += $(SRC_ARCH)/uart_hw.c
 #
 test_baro.ARCHDIR   = $(ARCHI)
 test_baro.ARCH      = arm7tdmi
-test_baro.TARGET    = test_baro
-test_baro.TARGETDIR = test_baro
 test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_ARCH) -I$(SRC_BOARD)
 test_baro.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -142,8 +138,6 @@ test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c
 #
 test_rc_ppm.ARCHDIR   = $(ARCHI)
 test_rc_ppm.ARCH      = arm7tdmi
-test_rc_ppm.TARGET    = test_rc_ppm
-test_rc_ppm.TARGETDIR = test_rc_ppm
 
 test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_rc_ppm.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
@@ -172,8 +166,6 @@ test_rc_ppm.srcs   += $(SRC_BOOZ)/booz_radio_control.c \
 #
 test_esc_mkk_simple.ARCHDIR = $(ARCHI)
 test_esc_mkk_simple.ARCH    = arm7tdmi
-test_esc_mkk_simple.TARGET  = test_esc_mkk_simple
-test_esc_mkk_simple.TARGETDIR = test_esc_mkk_simple
 test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_esc_mkk_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c	    \
@@ -193,8 +185,6 @@ test_esc_mkk_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 #
 test_actuators_mkk.ARCHDIR = $(ARCHI)
 test_actuators_mkk.ARCH      = arm7tdmi
-test_actuators_mkk.TARGET = test_actuators_mkk
-test_actuators_mkk.TARGETDIR = test_actuators_mkk
 test_actuators_mkk.CFLAGS = -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 \
@@ -227,8 +217,6 @@ test_actuators_mkk.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_V
 #
 test_ami601.ARCHDIR = $(ARCHI)
 test_ami601.ARCH      = arm7tdmi
-test_ami601.TARGET = test_ami601
-test_ami601.TARGETDIR = test_ami601
 test_ami601.CFLAGS = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_ami601.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_ami601.srcs = test/peripherals/test_ami601.c \
diff --git a/conf/autopilot/classix.makefile b/conf/autopilot/classix.makefile
index 6e9de09fec..9ded437fc8 100644
--- a/conf/autopilot/classix.makefile
+++ b/conf/autopilot/classix.makefile
@@ -4,19 +4,13 @@ ARCHI=arm7
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = autopilot
-ap.TARGETDIR = autopilot
 
 
 fbw.ARCHDIR = $(ARCHI)
 fbw.ARCH = arm7tdmi
-fbw.TARGET = fbw
-fbw.TARGETDIR = fbw
 
 test.ARCHDIR = $(ARCHI)
 test.ARCH = arm7tdmi
-test.TARGET = fbw
-test.TARGETDIR = fbw
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
@@ -24,8 +18,6 @@ LPC21ISP_XTAL = 12000
 # A test program to monitor the ADC values
 test_adcs.ARCHDIR = $(ARCHI)
 test_adcs.ARCH = arm7tdmi
-test_adcs.TARGET = test_adcs
-test_adcs.TARGETDIR = test_adcs
 
 test_adcs.CFLAGS += -DAP -DBOARD_CONFIG=\"classix.h\" -DLED -DTIME_LED=2 -DADC -DUSE_AD1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4 -DUSE_AD1_5  -DUSE_AD1_6  -DUSE_AD1_7
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
@@ -38,8 +30,6 @@ test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SR
 # xxx RAW_DATALINK 16 SET_ACTUATOR;1500;3
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
-setup_actuators.TARGET = setup_actuators
-setup_actuators.TARGETDIR = setup_actuators
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DLED -DTIME_LED=2 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 -DSERVOS_4017_CLOCK_FALLING -DUSE_UART0 -DUART0_BAUD=B57600 -DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4017_hw.c main.c
diff --git a/conf/autopilot/classix_proto1.makefile b/conf/autopilot/classix_proto1.makefile
index eb24d7b80e..f850c93345 100644
--- a/conf/autopilot/classix_proto1.makefile
+++ b/conf/autopilot/classix_proto1.makefile
@@ -4,13 +4,9 @@ ARCHI=arm7
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = autopilot
-ap.TARGETDIR = autopilot
 
 fbw.ARCHDIR = $(ARCHI)
 fbw.ARCH = arm7tdmi
-fbw.TARGET = fbw
-fbw.TARGETDIR = fbw
 
 LPC21ISP_BAUD = 115200
 LPC21ISP_XTAL = 14746
\ No newline at end of file
diff --git a/conf/autopilot/csc.makefile b/conf/autopilot/csc.makefile
index 722822be73..dd2369fc30 100644
--- a/conf/autopilot/csc.makefile
+++ b/conf/autopilot/csc.makefile
@@ -43,8 +43,6 @@ SRC_CSC=csc
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = main
-ap.TARGETDIR = main
 
 ap.CFLAGS += -I$(SRC_CSC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -98,8 +96,6 @@ ap.CFLAGS += -DERROR_LED=4
 #
 test_uart.ARCHDIR = $(ARCHI)
 test_uart.ARCH = arm7tdmi
-test_uart.TARGET = test_uart
-test_uart.TARGETDIR = test_uart
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
@@ -125,8 +121,6 @@ test_uart.srcs += downlink.c pprz_transport.c
 
 test_can1.ARCHDIR = $(ARCHI)
 test_can1.ARCH = arm7tdmi
-test_can1.TARGET = test_can1
-test_can1.TARGETDIR = test_can1
 
 
 test_can1.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/csc_ap.makefile b/conf/autopilot/csc_ap.makefile
index c38d02d08e..145bbee014 100644
--- a/conf/autopilot/csc_ap.makefile
+++ b/conf/autopilot/csc_ap.makefile
@@ -43,8 +43,6 @@ SRC_CSC=csc
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = main
-ap.TARGETDIR = main
 
 ap.CFLAGS += -I$(SRC_CSC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -101,8 +99,6 @@ ap.CFLAGS += -DERROR_LED=4
 #
 test_uart.ARCHDIR = $(ARCHI)
 test_uart.ARCH = arm7tdmi
-test_uart.TARGET = test_uart
-test_uart.TARGETDIR = test_uart
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/lisa_l_test_progs.makefile b/conf/autopilot/lisa_l_test_progs.makefile
index 96fca4d978..7e13aaa229 100644
--- a/conf/autopilot/lisa_l_test_progs.makefile
+++ b/conf/autopilot/lisa_l_test_progs.makefile
@@ -66,8 +66,6 @@ BOARD_CFG=\"boards/lisa_l_1.0.h\"
 #   MODEM_BAUD :
 #
 test_telemetry.ARCHDIR = $(ARCHI)
-test_telemetry.TARGET = test_telemetry
-test_telemetry.TARGETDIR = test_telemetry
 test_telemetry.CFLAGS += -I$(SRC_LISA) -I$(SRC_ARCH) -DPERIPHERALS_AUTO_INIT
 test_telemetry.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_telemetry.srcs = test/test_telemetry.c            \
@@ -95,8 +93,6 @@ test_telemetry.srcs   += $(SRC_ARCH)/uart_hw.c
 #   MODEM_BAUD
 #
 test_baro.ARCHDIR   = $(ARCHI)
-test_baro.TARGET    = test_baro
-test_baro.TARGETDIR = test_baro
 test_baro.CFLAGS = -I$(SRC_LISA) -I$(SRC_ARCH) -I$(SRC_BOARD) -DPERIPHERALS_AUTO_INIT
 test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro.srcs = $(SRC_BOARD)/test_baro.c      	  \
@@ -128,8 +124,6 @@ test_baro.srcs   += i2c.c $(SRC_ARCH)/i2c_hw.c
 #   RADIO_CONROL_LINK
 #
 test_rc_spektrum.ARCHDIR   = $(ARCHI)
-test_rc_spektrum.TARGET    = test_rc_spektrum
-test_rc_spektrum.TARGETDIR = test_rc_spektrum
 
 test_rc_spektrum.CFLAGS += -I$(SRC_ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_rc_spektrum.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) 
@@ -167,8 +161,6 @@ test_rc_spektrum.srcs   += $(SRC_BOOZ)/booz_radio_control.c
 #   RADIO_CONTROL_LED
 #
 test_rc_ppm.ARCHDIR   = $(ARCHI)
-test_rc_ppm.TARGET    = test_rc_ppm
-test_rc_ppm.TARGETDIR = test_rc_ppm
 
 test_rc_ppm.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
 test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -205,8 +197,6 @@ test_rc_ppm.CFLAGS += -DUSE_TIM2_IRQ
 #   MODEM_BAUD
 #
 test_adc.ARCHDIR = $(ARCHI)
-test_adc.TARGET = test_adc
-test_adc.TARGETDIR = test_adc
 test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 
@@ -242,8 +232,6 @@ test_adc.CFLAGS += -DUSE_ADC1_2_IRQ_HANDLER
 #   MODEM_BAUD
 #
 test_imu_b2.ARCHDIR = $(ARCHI)
-test_imu_b2.TARGET = test_imu_b2
-test_imu_b2.TARGETDIR = test_imu_b2
 test_imu_b2.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -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 \
@@ -282,8 +270,6 @@ test_imu_b2.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c  $(SRC_BOOZ_ARCH)/peri
 # test IMU aspirin
 #
 test_imu_aspirin.ARCHDIR = $(ARCHI)
-test_imu_aspirin.TARGET = test_imu_aspirin
-test_imu_aspirin.TARGETDIR = test_imu_aspirin
 test_imu_aspirin.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_imu_aspirin.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_imu_aspirin.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
@@ -329,8 +315,6 @@ test_imu_aspirin.CFLAGS += -DUSE_DMA1_C4_IRQ    # SPI2 Rx DMA
 # test hmc5843
 #
 test_hmc5843.ARCHDIR = $(ARCHI)
-test_hmc5843.TARGET = test_hmc5843
-test_hmc5843.TARGETDIR = test_hmc5843
 test_hmc5843.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -Ibooz -DPERIPHERALS_AUTO_INIT
 test_hmc5843.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_hmc5843.srcs = lisa/test/lisa_test_hmc5843.c         \
@@ -358,8 +342,6 @@ test_hmc5843.CFLAGS += -DUSE_EXTI9_5_IRQ   # Mag Int on PB5
 # test ITG3200
 #
 test_itg3200.ARCHDIR = $(ARCHI)
-test_itg3200.TARGET = test_itg3200
-test_itg3200.TARGETDIR = test_itg3200
 test_itg3200.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_itg3200.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_itg3200.srcs += lisa/test/lisa_test_itg3200.c \
@@ -388,8 +370,6 @@ test_itg3200.CFLAGS += -DUSE_EXTI15_10_IRQ   # Gyro Int on PC14
 # test adxl345 with DMA
 #
 test_adxl345.ARCHDIR = $(ARCHI)
-test_adxl345.TARGET = test_adxl345
-test_adxl345.TARGETDIR = test_adxl345
 test_adxl345.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_adxl345.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_adxl345.srcs += lisa/test/lisa_test_adxl345_dma.c \
@@ -418,8 +398,6 @@ test_adxl345.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA
 # simple test of mikrokopter motor controllers
 #
 test_esc_mkk_simple.ARCHDIR = $(ARCHI)
-test_esc_mkk_simple.TARGET = test_esc_mkk_simple
-test_esc_mkk_simple.TARGETDIR = test_esc_mkk_simple
 test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_esc_mkk_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c	    \
@@ -438,8 +416,6 @@ test_esc_mkk_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # simple test of asctec v1 motor controllers
 #
 test_esc_asctecv1_simple.ARCHDIR = $(ARCHI)
-test_esc_asctecv1_simple.TARGET = test_esc_asctecv1_simple
-test_esc_asctecv1_simple.TARGETDIR = test_esc_asctecv1_simple
 test_esc_asctecv1_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_esc_asctecv1_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_esc_asctecv1_simple.srcs = test/test_esc_asctecv1_simple.c  \
@@ -458,8 +434,6 @@ test_esc_asctecv1_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test actuators mkk
 #
 test_actuators_mkk.ARCHDIR = $(ARCHI)
-test_actuators_mkk.TARGET = test_actuators_mkk
-test_actuators_mkk.TARGETDIR = test_actuators_mkk
 test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -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 \
@@ -490,8 +464,6 @@ test_actuators_mkk.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test actuators asctecv1
 #
 test_actuators_asctecv1.ARCHDIR = $(ARCHI)
-test_actuators_asctecv1.TARGET = test_actuators_asctecv1
-test_actuators_asctecv1.TARGETDIR = test_actuators_asctecv1
 test_actuators_asctecv1.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -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            \
diff --git a/conf/autopilot/lisa_passthrough.makefile b/conf/autopilot/lisa_passthrough.makefile
index 101e8c59ba..004241392b 100644
--- a/conf/autopilot/lisa_passthrough.makefile
+++ b/conf/autopilot/lisa_passthrough.makefile
@@ -16,8 +16,6 @@ CFG_LISA_PASSTHROUGH = $(PAPARAZZI_SRC)/conf/autopilot/subsystems/lisa_passthrou
 
 
 stm_passthrough.ARCHDIR = stm32
-stm_passthrough.TARGET = stm_passthrough
-stm_passthrough.TARGETDIR = stm_passthrough
 stm_passthrough.CFLAGS += -I$(SRC_LISA) -I$(SRC_LISA_ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
 stm_passthrough.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 stm_passthrough.CFLAGS += -DPERIPHERALS_AUTO_INIT
diff --git a/conf/autopilot/lisa_test_progs.makefile b/conf/autopilot/lisa_test_progs.makefile
index 626c6d2a25..81373cb877 100644
--- a/conf/autopilot/lisa_test_progs.makefile
+++ b/conf/autopilot/lisa_test_progs.makefile
@@ -132,8 +132,6 @@ FLASH_MODE = JTAG
 # test leds
 #
 test_led.ARCHDIR = $(ARCHI)
-test_led.TARGET = test_led
-test_led.TARGETDIR = test_led
 test_led.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_led.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_led.srcs += $(SRC_LISA)/test_led.c       	\
@@ -147,8 +145,6 @@ test_led.CFLAGS += -DUSE_LED
 # test leds2
 #
 test_led2.ARCHDIR = $(ARCHI)
-test_led2.TARGET = test_led2
-test_led2.TARGETDIR = test_led2
 test_led2.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_led2.CFLAGS += -DBOARD_CONFIG=\"boards/lisa_0.99.h\"
 test_led2.srcs += $(SRC_LISA)/test_led2.c              \
@@ -161,8 +157,6 @@ test_led2.CFLAGS += -DUSE_LED
 # test periodic
 #
 test_periodic.ARCHDIR = $(ARCHI)
-test_periodic.TARGET = test_periodic
-test_periodic.TARGETDIR = test_periodic
 test_periodic.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_periodic.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_periodic.srcs += $(SRC_LISA)/test_periodic.c  \
@@ -179,8 +173,6 @@ test_periodic.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.TARGET = test_uart
-test_uart.TARGETDIR = test_uart
 test_uart.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_uart.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_uart.srcs = $(SRC_LISA)/test_uart.c         \
@@ -199,8 +191,6 @@ test_uart.srcs += $(SRC_ARCH)/uart_hw.c
 # test telemetry1
 #
 test_telemetry1.ARCHDIR = $(ARCHI)
-test_telemetry1.TARGET = test_telemetry1
-test_telemetry1.TARGETDIR = test_telemetry1
 test_telemetry1.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_telemetry1.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_telemetry1.srcs = $(SRC_LISA)/test_telemetry.c \
@@ -221,8 +211,6 @@ test_telemetry1.srcs += downlink.c pprz_transport.c
 # test telemetry2
 #
 test_telemetry2.ARCHDIR = $(ARCHI)
-test_telemetry2.TARGET = test_telemetry2
-test_telemetry2.TARGETDIR = test_telemetry2
 test_telemetry2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_telemetry2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_telemetry2.srcs = $(SRC_LISA)/test_telemetry.c \
@@ -243,8 +231,6 @@ test_telemetry2.srcs += downlink.c pprz_transport.c
 # test telemetry3
 #
 test_telemetry3.ARCHDIR = $(ARCHI)
-test_telemetry3.TARGET = test_telemetry3
-test_telemetry3.TARGETDIR = test_telemetry3
 test_telemetry3.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_telemetry3.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_telemetry3.srcs = $(SRC_LISA)/test_telemetry.c \
@@ -264,8 +250,6 @@ test_telemetry3.srcs += downlink.c pprz_transport.c
 # test datalink
 #
 test_datalink.ARCHDIR = $(ARCHI)
-test_datalink.TARGET = test_datalink
-test_datalink.TARGETDIR = test_datalink
 test_datalink.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_datalink.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_datalink.srcs = $(SRC_LISA)/test_datalink.c \
@@ -287,8 +271,6 @@ test_datalink.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart2
 # tunnel
 #
 tunnel.ARCHDIR = $(ARCHI)
-tunnel.TARGET = tunnel
-tunnel.TARGETDIR = tunnel
 tunnel.CFLAGS  = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 tunnel.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 tunnel.srcs += $(SRC_LISA)/test/lisa_tunnel.c \
@@ -319,8 +301,6 @@ tunnel.srcs += $(SRC_ARCH)/uart_hw.c
 # test float
 #
 test_float.ARCHDIR = $(ARCHI)
-test_float.TARGET = test_float
-test_float.TARGETDIR = test_float
 test_float.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_float.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_float.srcs = $(SRC_LISA)/test_float.c \
@@ -341,8 +321,6 @@ test_float.srcs += lisa/plug_sys.c
 # test bswap
 #
 test_bswap.ARCHDIR = $(ARCHI)
-test_bswap.TARGET = test_bswap
-test_bswap.TARGETDIR = test_bswap
 test_bswap.CFLAGS = -I$(SRC_LISA) -I$(ARCHI)
 test_bswap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_bswap.srcs = $(SRC_LISA)/test/test_bswap.c \
@@ -357,8 +335,6 @@ SRC_BOOZ = booz
 SRC_BOOZ_TEST = $(SRC_BOOZ)/test
 
 test_rc_24.ARCHDIR = $(ARCHI)
-test_rc_24.TARGET = test_rc_24
-test_rc_24.TARGETDIR = test_rc_24
 test_rc_24.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -DPERIPHERALS_AUTO_INIT
 test_rc_24.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) 
 test_rc_24.srcs += $(SRC_BOOZ_TEST)/booz2_test_radio_control.c \
@@ -394,8 +370,6 @@ test_rc_24.srcs += $(SRC_BOOZ)/booz_radio_control.c \
 SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCHI)
 
 test_servos.ARCHDIR = $(ARCHI)
-test_servos.TARGET = test_servos
-test_servos.TARGETDIR = test_servos
 test_servos.CFLAGS  = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_servos.LDFLAGS += -lm
@@ -425,8 +399,6 @@ test_servos.srcs += $(SRC_BOOZ)/actuators/booz_actuators_pwm.c $(SRC_BOOZ_ARCH)/
 # test IMU b2
 #
 test_imu_b2.ARCHDIR = $(ARCHI)
-test_imu_b2.TARGET = test_imu_b2
-test_imu_b2.TARGETDIR = test_imu_b2
 test_imu_b2.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -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 \
@@ -461,8 +433,6 @@ test_imu_b2.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c  $(SRC_BOOZ_ARCH)/peri
 # test IMU crista
 #
 test_imu_crista.ARCHDIR = $(ARCHI)
-test_imu_crista.TARGET = test_imu_crista
-test_imu_crista.TARGETDIR = test_imu_crista
 test_imu_crista.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_imu_crista.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_imu_crista.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
@@ -495,8 +465,6 @@ test_imu_crista.CFLAGS += -DUSE_DMA1_C4_IRQ
 # test IMU aspirin
 #
 test_imu_aspirin.ARCHDIR = $(ARCHI)
-test_imu_aspirin.TARGET = test_imu_aspirin
-test_imu_aspirin.TARGETDIR = test_imu_aspirin
 test_imu_aspirin.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_imu_aspirin.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_imu_aspirin.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \
@@ -540,8 +508,6 @@ test_imu_aspirin.CFLAGS += -DUSE_DMA1_C4_IRQ    # SPI2 Rx DMA
 # test motor controllers
 #
 test_mc.ARCHDIR = $(ARCHI)
-test_mc.TARGET = test_mc
-test_mc.TARGETDIR = test_mc
 test_mc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_mc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_mc.srcs = $(SRC_LISA)/test_mc.c      \
@@ -558,8 +524,6 @@ test_mc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 # test motor controllers with interrupts
 #
 test_mc2.ARCHDIR = $(ARCHI)
-test_mc2.TARGET = test_mc
-test_mc2.TARGETDIR = test_mc
 test_mc2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_mc2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_mc2.srcs = $(SRC_LISA)/test_mc2.c           \
@@ -578,8 +542,6 @@ test_mc2.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test motor controllers asctec with interrupts
 #
 test_mc_asctec_v1_simple.ARCHDIR = $(ARCHI)
-test_mc_asctec_v1_simple.TARGET = test_mc_asctec_v1_simple
-test_mc_asctec_v1_simple.TARGETDIR = test_mc_asctec_v1_simple
 test_mc_asctec_v1_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_mc_asctec_v1_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_mc_asctec_v1_simple.srcs = $(SRC_LISA)/test/test_mc_asctec_v1_simple.c  \
@@ -603,8 +565,6 @@ test_mc_asctec_v1_simple.srcs += downlink.c pprz_transport.c
 # test motor controllers asctec2 with interrupts
 #
 test_mc5.ARCHDIR = $(ARCHI)
-test_mc5.TARGET = test_mc
-test_mc5.TARGETDIR = test_mc
 test_mc5.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_mc5.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_mc5.srcs = $(SRC_LISA)/test_mc5.c           \
@@ -625,8 +585,6 @@ test_mc5.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test actuators mkk
 #
 test_actuators_mkk.ARCHDIR = $(ARCHI)
-test_actuators_mkk.TARGET = test_actuators_mkk
-test_actuators_mkk.TARGETDIR = test_actuators_mkk
 test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -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 \
@@ -661,8 +619,6 @@ test_actuators_mkk.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test actuators asctec
 #
 test_actuators_asctec.ARCHDIR = $(ARCHI)
-test_actuators_asctec.TARGET = test_actuators_asctec
-test_actuators_asctec.TARGETDIR = test_actuators_asctec
 test_actuators_asctec.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -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 \
@@ -701,8 +657,6 @@ test_actuators_asctec.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test motor controllers asctec
 #
 test_mc3.ARCHDIR = $(ARCHI)
-test_mc3.TARGET = test_mc3
-test_mc3.TARGETDIR = test_mc3
 test_mc3.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_mc3.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_mc3.srcs = $(SRC_LISA)/test_mc3.c      \
@@ -720,8 +674,6 @@ test_mc3.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 # test baro
 #
 test_baro.ARCHDIR = $(ARCHI)
-test_baro.TARGET = test_baro
-test_baro.TARGETDIR = test_baro
 test_baro.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro.srcs = $(SRC_LISA)/test_baro.c      \
@@ -744,8 +696,6 @@ test_baro.srcs += downlink.c pprz_transport.c
 # test baro with interrupts
 #
 test_baro2.ARCHDIR = $(ARCHI)
-test_baro2.TARGET = test_baro2
-test_baro2.TARGETDIR = test_baro2
 test_baro2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_baro2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro2.srcs = $(SRC_LISA)/test_baro2.c      \
@@ -772,8 +722,6 @@ test_baro2.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # another baro test with interrupts
 #
 test_baro3.ARCHDIR = $(ARCHI)
-test_baro3.TARGET = test_baro3
-test_baro3.TARGETDIR = test_baro3
 test_baro3.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_baro3.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro3.srcs = $(SRC_LISA)/test_baro3.c      \
@@ -800,8 +748,6 @@ test_baro3.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # test spi slave ( hardcoded SPI without DMA )
 #
 test_spi_slave.ARCHDIR = $(ARCHI)
-test_spi_slave.TARGET = test_spi_slave
-test_spi_slave.TARGETDIR = test_spi_slave
 test_spi_slave.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_spi_slave.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_spi_slave.srcs = $(SRC_LISA)/test_spi_slave.c     \
@@ -823,8 +769,6 @@ test_spi_slave.srcs += downlink.c pprz_transport.c
 # test spi slave2  ( hardcoded SPI with DMA )
 #
 test_spi_slave2.ARCHDIR = $(ARCHI)
-test_spi_slave2.TARGET = test_spi_slave2
-test_spi_slave2.TARGETDIR = test_spi_slave2
 test_spi_slave2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_spi_slave2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_spi_slave2.srcs = $(SRC_LISA)/test_spi_slave2.c    \
@@ -846,8 +790,6 @@ test_spi_slave2.srcs += downlink.c pprz_transport.c
 # test spi link between overo and stm32
 #
 stm_test_spi_link.ARCHDIR = $(ARCHI)
-stm_test_spi_link.TARGET = stm_test_spi_link
-stm_test_spi_link.TARGETDIR = stm_test_spi_link
 stm_test_spi_link.CFLAGS += -Ilisa -Ilisa/arch/$(ARCHI) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 stm_test_spi_link.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 stm_test_spi_link.srcs += lisa/stm_test_spi_link.c       \
@@ -876,8 +818,6 @@ stm_test_spi_link.srcs += lisa/lisa_overo_link.c lisa/arch/stm32/lisa_overo_link
 # test static
 #
 test_static.ARCHDIR = $(ARCHI)
-test_static.TARGET = test_static
-test_static.TARGETDIR = test_static
 test_static.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_static.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_static.srcs = $(SRC_LISA)/test_static.c \
@@ -890,8 +830,6 @@ test_static.srcs = $(SRC_LISA)/test_static.c \
 # test SC18IS600
 #
 test_sc18is600.ARCHDIR = $(ARCHI)
-test_sc18is600.TARGET = test_sc18is600
-test_sc18is600.TARGETDIR = test_sc18is600
 test_sc18is600.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_sc18is600.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_sc18is600.srcs += lisa/test/lisa_test_sc18is600.c \
@@ -922,8 +860,6 @@ test_sc18is600.srcs += $(SRC_BOOZ)/peripherals/booz_sc18is600.c \
 # test Max1168
 #
 test_max1168.ARCHDIR = $(ARCHI)
-test_max1168.TARGET = test_max1168
-test_max1168.TARGETDIR = test_max1168
 test_max1168.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_max1168.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_max1168.srcs = $(SRC_LISA)/test/lisa_test_max1168.c \
@@ -951,8 +887,6 @@ test_max1168.srcs += downlink.c pprz_transport.c
 # test ms2001
 #
 test_ms2001.ARCHDIR = $(ARCHI)
-test_ms2001.TARGET = test_ms2001
-test_ms2001.TARGETDIR = test_ms2001
 test_ms2001.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_ms2001.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_ms2001.srcs = $(SRC_LISA)/test/lisa_test_ms2001.c \
@@ -982,8 +916,6 @@ test_ms2001.srcs += downlink.c pprz_transport.c
 # test adxl345
 #
 test_adxl345.ARCHDIR = $(ARCHI)
-test_adxl345.TARGET = test_adxl345
-test_adxl345.TARGETDIR = test_adxl345
 test_adxl345.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_adxl345.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_adxl345.srcs += lisa/test/lisa_test_adxl345.c \
@@ -1009,8 +941,6 @@ test_adxl345.CFLAGS += -DUSE_EXTI2_IRQ   # Acc  Int on PD2
 # test adxl345 with DMA
 #
 test_adxl345_dma.ARCHDIR = $(ARCHI)
-test_adxl345_dma.TARGET = test_adxl345_dma
-test_adxl345_dma.TARGETDIR = test_adxl345_dma
 test_adxl345_dma.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_adxl345_dma.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_adxl345_dma.srcs += lisa/test/lisa_test_adxl345_dma.c \
@@ -1040,8 +970,6 @@ test_adxl345_dma.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA
 # test ITG3200
 #
 test_itg3200.ARCHDIR = $(ARCHI)
-test_itg3200.TARGET = test_itg3200
-test_itg3200.TARGETDIR = test_itg3200
 test_itg3200.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_itg3200.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_itg3200.srcs += lisa/test/lisa_test_itg3200.c \
@@ -1070,8 +998,6 @@ test_itg3200.CFLAGS += -DUSE_EXTI15_10_IRQ   # Gyro Int on PC14
 # test hmc5843
 #
 test_hmc5843.ARCHDIR = $(ARCHI)
-test_hmc5843.TARGET = test_hmc5843
-test_hmc5843.TARGETDIR = test_hmc5843
 test_hmc5843.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -Ibooz -DPERIPHERALS_AUTO_INIT
 test_hmc5843.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_hmc5843.srcs = lisa/test/lisa_test_hmc5843.c         \
@@ -1102,8 +1028,6 @@ test_hmc5843.CFLAGS += -DUSE_EXTI9_5_IRQ   # Mag Int on PB5
 # test Aspirin ( rewired ) no sc18is600
 #
 test_aspirin.ARCHDIR = $(ARCHI)
-test_aspirin.TARGET = test_aspirin
-test_aspirin.TARGETDIR = test_aspirin
 test_aspirin.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_aspirin.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 test_aspirin.srcs += lisa/test/lisa_test_aspirin.c \
@@ -1139,8 +1063,6 @@ test_aspirin.CFLAGS += -DUSE_EXTI4_IRQ   # Acc  Int
 #
 
 ptw.ARCHDIR = stm32
-ptw.TARGET = ptw
-ptw.TARGETDIR = ptw
 ptw.CFLAGS += -I$(SRC_LISA) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 ptw.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 ptw.srcs = $(SRC_LISA)/test/lisa_test_stm_wifi_telemetry.c \
@@ -1203,8 +1125,6 @@ ptw.CFLAGS += -DUSE_I2C1
 # test csc servo
 #
 test_csc_servo.ARCHDIR = $(ARCHI)
-test_csc_servo.TARGET = test_csc_servo
-test_csc_servo.TARGETDIR = test_csc_servo
 test_csc_servo.CFLAGS = -I $(SRC_CSC) -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_csc_servo.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_csc_servo.srcs = $(SRC_CSC)/csc_protocol.c \
@@ -1244,8 +1164,6 @@ test_csc_servo.srcs += can.c $(SRC_ARCH)/can_hw.c
 # test GPS
 #
 test_gps.ARCHDIR = $(ARCHI)
-test_gps.TARGET = test_gps
-test_gps.TARGETDIR = test_gps
 test_gps.CFLAGS = -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_gps.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_gps.srcs += $(SRC_BOOZ_TEST)/booz2_test_gps.c \
@@ -1277,8 +1195,6 @@ test_gps.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
 # test ADC
 #
 # test_adc.ARCHDIR = $(ARCHI)
-# test_adc.TARGET = test_adc
-# test_adc.TARGETDIR = test_adc
 # test_adc.CFLAGS = -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 # test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 # test_adc.srcs += $(SRC_LISA)/test/lisa_test_adc.c \
@@ -1302,8 +1218,6 @@ test_gps.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
 # test adc
 #
 test_adc.ARCHDIR = $(ARCHI)
-test_adc.TARGET = test_adc
-test_adc.TARGETDIR = test_adc
 test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_adc.srcs = $(SRC_ARCH)/adc_hw.c \
@@ -1333,8 +1247,6 @@ test_adc.CFLAGS += -DUSE_AD1 -DUSE_AD1_1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4
 #
 ################################################################################
 test_board.ARCHDIR = $(ARCHI)
-test_board.TARGET = test_board
-test_board.TARGETDIR = test_board
 test_board.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_board.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_board.srcs = $(SRC_LISA)/test/test_board.c       \
@@ -1379,8 +1291,6 @@ test_board.srcs += $(SRC_BOOZ)/actuators/booz_actuators_pwm.c $(SRC_BOOZ_ARCH)/a
 # Spits every samples of one axis of gyro on IMU aspirin
 #
 hs_gyro_aspirin.ARCHDIR = $(ARCHI)
-hs_gyro_aspirin.TARGET = hs_gyro_aspirin
-hs_gyro_aspirin.TARGETDIR = hs_gyro_aspirin
 hs_gyro_aspirin.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 hs_gyro_aspirin.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 hs_gyro_aspirin.srcs += lisa/test/hs_gyro.c \
@@ -1419,8 +1329,6 @@ hs_gyro_aspirin.CFLAGS += -DUSE_DMA1_C4_IRQ    # SPI2 Rx DMA
 # Spits every samples of one axis of gyro on IMU b2
 #
 hs_gyro_b2.ARCHDIR = $(ARCHI)
-hs_gyro_b2.TARGET = hs_gyro_b2
-hs_gyro_b2.TARGETDIR = hs_gyro_b2
 hs_gyro_b2.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 hs_gyro_b2.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 hs_gyro_b2.srcs += lisa/test/hs_gyro.c \
@@ -1454,8 +1362,6 @@ hs_gyro_b2.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c  $(SRC_BOOZ_ARCH)/perip
 # Spits every samples of one axis of gyro on IMU crista
 #
 hs_gyro_crista.ARCHDIR = $(ARCHI)
-hs_gyro_crista.TARGET = hs_gyro_crista
-hs_gyro_crista.TARGETDIR = hs_gyro_crista
 hs_gyro_crista.CFLAGS  =  -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 hs_gyro_crista.CFLAGS +=  -DBOARD_CONFIG=$(BOARD_CFG)
 hs_gyro_crista.srcs += lisa/test/hs_gyro.c \
diff --git a/conf/autopilot/mercury.makefile b/conf/autopilot/mercury.makefile
index 87ddeca849..39f5ee647c 100644
--- a/conf/autopilot/mercury.makefile
+++ b/conf/autopilot/mercury.makefile
@@ -45,8 +45,6 @@ SRC_BOOZ=booz
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = main
-ap.TARGETDIR = main
 
 ap.CFLAGS += -I$(SRC_CSC) -I$(SRC_BOOZ) -I$(SRC_CSC_ARCH)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -126,8 +124,6 @@ ap.CFLAGS += -DERROR_LED=4
 #
 test_uart.ARCHDIR = $(ARCHI)
 test_uart.ARCH = arm7tdmi
-test_uart.TARGET = test_uart
-test_uart.TARGETDIR = test_uart
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/mercury_csc.makefile b/conf/autopilot/mercury_csc.makefile
index 7535e96a67..6e9c56eb53 100644
--- a/conf/autopilot/mercury_csc.makefile
+++ b/conf/autopilot/mercury_csc.makefile
@@ -44,8 +44,6 @@ SRC_CSC_ARCH=$(SRC_CSC)/$(ARCHI)
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = main
-ap.TARGETDIR = main
 
 ap.CFLAGS += -I$(SRC_CSC) -I$(SRC_CSC_ARCH)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -97,8 +95,6 @@ ap.CFLAGS += -DERROR_LED=4
 #
 test_uart.ARCHDIR = $(ARCHI)
 test_uart.ARCH = arm7tdmi
-test_uart.TARGET = test_uart
-test_uart.TARGETDIR = test_uart
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
@@ -124,8 +120,6 @@ test_uart.srcs += downlink.c pprz_transport.c
 
 test_can1.ARCHDIR = $(ARCHI)
 test_can1.ARCH = arm7tdmi
-test_can1.TARGET = test_can1
-test_can1.TARGETDIR = test_can1
 
 
 test_can1.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/rotorcraft.makefile b/conf/autopilot/rotorcraft.makefile
index f55db76622..11fe612cb3 100644
--- a/conf/autopilot/rotorcraft.makefile
+++ b/conf/autopilot/rotorcraft.makefile
@@ -47,8 +47,6 @@ BOOZ_INC = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
 ap.ARCHDIR = $(ARCHI)
 # this is supposedly ignored by the stm32 makefile
 ap.ARCH = arm7tdmi
-ap.TARGET = ap
-ap.TARGETDIR = ap
 
 
 ap.CFLAGS += $(BOOZ_INC)
diff --git a/conf/autopilot/sitl.makefile b/conf/autopilot/sitl.makefile
index b7749905b8..e95ff95000 100644
--- a/conf/autopilot/sitl.makefile
+++ b/conf/autopilot/sitl.makefile
@@ -1,7 +1,5 @@
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
diff --git a/conf/autopilot/sitl_jsbsim.makefile b/conf/autopilot/sitl_jsbsim.makefile
index d367467f29..16e45a3dbc 100644
--- a/conf/autopilot/sitl_jsbsim.makefile
+++ b/conf/autopilot/sitl_jsbsim.makefile
@@ -1,7 +1,6 @@
 jsbsim.ARCHDIR = $(ARCHI)
 jsbsim.ARCH = sitl
-jsbsim.TARGET = autopilot
-jsbsim.TARGETDIR = autopilot
+
 # external libraries
 jsbsim.CFLAGS = -I$(SIMDIR) -I/usr/include `pkg-config glib-2.0 --cflags`
 jsbsim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -L/usr/lib -lJSBSim
diff --git a/conf/autopilot/sitl_link_pprz.makefile b/conf/autopilot/sitl_link_pprz.makefile
index 06c864f26c..489bc08785 100644
--- a/conf/autopilot/sitl_link_pprz.makefile
+++ b/conf/autopilot/sitl_link_pprz.makefile
@@ -1,6 +1,4 @@
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DINFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DDOWNLINK_AP_DEVICE=SimUart -DDOWNLINK_FBW_DEVICE=SimUart -DDATALINK=PPRZ
 sim.srcs = radio_control.c downlink.c pprz_transport.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c  $(SRC_ARCH)/sim_uart.c datalink.c 
diff --git a/conf/autopilot/sitl_link_xbee.makefile b/conf/autopilot/sitl_link_xbee.makefile
index 504ff55c2f..295da156f7 100644
--- a/conf/autopilot/sitl_link_xbee.makefile
+++ b/conf/autopilot/sitl_link_xbee.makefile
@@ -1,6 +1,4 @@
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=XBeeTransport -DINFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DSIM_XBEE -DXBEE_UART=SimUart
 sim.srcs = radio_control.c downlink.c xbee.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c  $(SRC_ARCH)/sim_uart.c 
diff --git a/conf/autopilot/subsystems/fixedwing/testing.makefile b/conf/autopilot/subsystems/fixedwing/testing.makefile
index a0ae3479f6..a97ab95a9f 100644
--- a/conf/autopilot/subsystems/fixedwing/testing.makefile
+++ b/conf/autopilot/subsystems/fixedwing/testing.makefile
@@ -3,8 +3,6 @@
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
-setup_actuators.TARGET = setup_actuators
-setup_actuators.TARGETDIR = setup_actuators
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4015_hw.c main.c
@@ -13,8 +11,6 @@ setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.
 # a test program to tunnel between both uart
 tunnel.ARCHDIR = $(ARCHI)
 tunnel.ARCH = arm7tdmi
-tunnel.TARGET = tunnel
-tunnel.TARGETDIR = tunnel
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
@@ -23,8 +19,6 @@ tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
 # A test program to monitor the ADC values
 test_adcs.ARCHDIR = $(ARCHI)
 test_adcs.ARCH = arm7tdmi
-test_adcs.TARGET = test_adcs
-test_adcs.TARGETDIR = test_adcs
 
 test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 -DUSE_ADC_6 -DUSE_ADC_7
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
@@ -37,8 +31,6 @@ test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SR
 # a configuration program to access both uart through usb
 usb_tunnel_0.ARCHDIR = $(ARCHI)
 usb_tunnel_0.ARCH = arm7tdmi
-usb_tunnel_0.TARGET = usb_tunnel_0
-usb_tunnel_0.TARGETDIR = usb_tunnel_0
 usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 -DUART0_BAUD=B115200
 usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/uart_hw.c
@@ -48,8 +40,6 @@ usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 usb_tunnel_1.ARCHDIR = $(ARCHI)
 usb_tunnel_1.ARCH = arm7tdmi
-usb_tunnel_1.TARGET = usb_tunnel_1
-usb_tunnel_1.TARGETDIR = usb_tunnel_1
 usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 -DUART1_BAUD=B115200
 usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/uart_hw.c
diff --git a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
index 6b2b487c13..c22bf4ee10 100644
--- a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
+++ b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
@@ -18,8 +18,6 @@ NPSDIR = $(SIMDIR)/nps
 
 sim.ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = sim
-sim.TARGETDIR = sim
 
 sim.CFLAGS  += -DSITL
 sim.CFLAGS  += `pkg-config glib-2.0 --cflags` -I /usr/include/meschach
diff --git a/conf/autopilot/tiny.makefile b/conf/autopilot/tiny.makefile
index 3f0e226454..7cc2689a31 100644
--- a/conf/autopilot/tiny.makefile
+++ b/conf/autopilot/tiny.makefile
@@ -5,13 +5,9 @@ ARCH=arm7
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = arm7tdmi
-ap.TARGET = autopilot
-ap.TARGETDIR = autopilot
 
 fbw.ARCHDIR = $(ARCHI)
 fbw.ARCH = arm7tdmi
-fbw.TARGET = autopilot
-fbw.TARGETDIR = autopilot
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
@@ -33,8 +29,6 @@ ADC_GYRO_NB_SAMPLES = 16
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
 setup_actuators.ARCH = arm7tdmi
-setup_actuators.TARGET = setup_actuators
-setup_actuators.TARGETDIR = setup_actuators
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4015_hw.c main.c
@@ -43,8 +37,6 @@ setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.
 # a test program to tunnel between both uart
 tunnel.ARCHDIR = $(ARCHI)
 tunnel.ARCH = arm7tdmi
-tunnel.TARGET = tunnel
-tunnel.TARGETDIR = tunnel
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
@@ -53,8 +45,6 @@ tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
 # A test program to monitor the ADC values
 test_adcs.ARCHDIR = $(ARCHI)
 test_adcs.ARCH = arm7tdmi
-test_adcs.TARGET = test_adcs
-test_adcs.TARGETDIR = test_adcs
 
 test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 -DUSE_ADC_6 -DUSE_ADC_7
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
@@ -67,8 +57,6 @@ test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SR
 # a configuration program to access both uart through usb
 usb_tunnel_0.ARCHDIR = $(ARCHI)
 usb_tunnel_0.ARCH = arm7tdmi
-usb_tunnel_0.TARGET = usb_tunnel_0
-usb_tunnel_0.TARGETDIR = usb_tunnel_0
 usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 -DUART0_BAUD=B115200
 usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/uart_hw.c
@@ -78,8 +66,6 @@ usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 usb_tunnel_1.ARCHDIR = $(ARCHI)
 usb_tunnel_1.ARCH = arm7tdmi
-usb_tunnel_1.TARGET = usb_tunnel_1
-usb_tunnel_1.TARGETDIR = usb_tunnel_1
 usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 -DUART1_BAUD=B115200
 usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/uart_hw.c
diff --git a/conf/autopilot/twin_avr.makefile b/conf/autopilot/twin_avr.makefile
index def93d33d4..bb1fc793a6 100644
--- a/conf/autopilot/twin_avr.makefile
+++ b/conf/autopilot/twin_avr.makefile
@@ -2,8 +2,6 @@ ARCHI=avr
 
 ap.ARCHDIR = $(ARCHI)
 ap.ARCH = atmega128
-ap.TARGET = autopilot
-ap.TARGETDIR = autopilot
 ap.LOW_FUSE  = a0
 ap.HIGH_FUSE = 99
 ap.EXT_FUSE  = ff
@@ -12,8 +10,6 @@ ap.CFLAGS += -DAP
 
 fbw.ARCHDIR = $(ARCHI)
 fbw.ARCH = atmega8
-fbw.TARGET = fbw
-fbw.TARGETDIR = fbw
 fbw.LOW_FUSE  = 2e
 fbw.HIGH_FUSE = cb
 fbw.EXT_FUSE  = ff
@@ -22,6 +18,4 @@ fbw.CFLAGS += -DFBW
 
 tunnel.ARCHDIR = $(ARCHI)
 tunnel.ARCH = atmega128
-tunnel.TARGET = autopilot
-tunnel.TARGETDIR = autopilot
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
diff --git a/conf/boards/classix.makefile b/conf/boards/classix.makefile
index cd98adc1c7..eda51cecc6 100644
--- a/conf/boards/classix.makefile
+++ b/conf/boards/classix.makefile
@@ -32,8 +32,6 @@ GPS_BAUD	= B38400
 # All targets on the TINY board run on the same processor achitecture
 $(TARGET).ARCHDIR = $(ARCHI)
 $(TARGET).ARCH = arm7tdmi
-$(TARGET).TARGET = $(TARGET)
-$(TARGET).TARGETDIR = $(TARGET)
 
 # Battery Voltage
 fbw.CFLAGS +=  -DUSE_AD0
diff --git a/conf/boards/lisa_l_1.0.makefile b/conf/boards/lisa_l_1.0.makefile
index d29a5078a8..61571c7bd2 100644
--- a/conf/boards/lisa_l_1.0.makefile
+++ b/conf/boards/lisa_l_1.0.makefile
@@ -23,8 +23,6 @@ else
 	$(TARGET).ARCHDIR = $(ARCHI)
 # not needed?
 #	$(TARGET).ARCH = arm7tdmi
-	$(TARGET).TARGET = $(TARGET)
-	$(TARGET).TARGETDIR = $(TARGET)
 
 endif
 # -----------------------------------------------------------------------
diff --git a/conf/boards/pc.makefile b/conf/boards/pc.makefile
index 0ec1c34d43..cce0ea9456 100644
--- a/conf/boards/pc.makefile
+++ b/conf/boards/pc.makefile
@@ -16,6 +16,4 @@ BOARD_CFG = \"tiny.h\"
 
 $(TARGET).ARCHDIR = $(ARCHI)
 sim.ARCH = sitl
-sim.TARGET = autopilot
-sim.TARGETDIR = autopilot
 
diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile
index 5ecd6ad517..d67090feeb 100644
--- a/conf/boards/tiny_2.11.makefile
+++ b/conf/boards/tiny_2.11.makefile
@@ -45,6 +45,4 @@ ADC_GENERIC_NB_SAMPLES = 16
 # All targets on the TINY board run on the same processor achitecture
 $(TARGET).ARCHDIR = $(ARCHI)
 $(TARGET).ARCH = arm7tdmi
-$(TARGET).TARGET = $(TARGET)
-$(TARGET).TARGETDIR = $(TARGET)