From 7e4596ff35335f2482a98dfaed32fbb6f41ce19c Mon Sep 17 00:00:00 2001
From: Oleg Semyonov <os@openpilot.org>
Date: Sat, 16 Mar 2013 11:42:12 +0200
Subject: [PATCH] Makefile: fix some MODULE_Name_BUILTIN checks and Makefile

These names are automatically generated by make using the list
of mandatory (always started) modules. Wrong names mean they can
be disabled, fixed now.

Conflicts:
	flight/Modules/Radio/radio.c
---
 flight/Modules/Airspeed/revolution/airspeed.c | 2 +-
 flight/Modules/Autotune/autotune.c            | 2 +-
 flight/Modules/Battery/battery.c              | 2 +-
 flight/Modules/OveroSync/overosync.c          | 2 +-
 make/apps-defs.mk                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flight/Modules/Airspeed/revolution/airspeed.c b/flight/Modules/Airspeed/revolution/airspeed.c
index fd1479d0f..ab817232a 100644
--- a/flight/Modules/Airspeed/revolution/airspeed.c
+++ b/flight/Modules/Airspeed/revolution/airspeed.c
@@ -89,7 +89,7 @@ int32_t AirspeedStart()
  */
 int32_t AirspeedInitialize()
 {
-#ifdef MODULE_AIRSPEED_BUILTIN
+#ifdef MODULE_Airspeed_BUILTIN
 	airspeedEnabled = true;
 #else
 	
diff --git a/flight/Modules/Autotune/autotune.c b/flight/Modules/Autotune/autotune.c
index 260f70750..366ac190f 100644
--- a/flight/Modules/Autotune/autotune.c
+++ b/flight/Modules/Autotune/autotune.c
@@ -82,7 +82,7 @@ static void update_stabilization_settings();
 int32_t AutotuneInitialize(void)
 {
 	// Create a queue, connect to manual control command and flightstatus
-#ifdef MODULE_AUTOTUNE_BUILTIN
+#ifdef MODULE_Autotune_BUILTIN
 	autotuneEnabled = true;
 #else
 	HwSettingsInitialize();
diff --git a/flight/Modules/Battery/battery.c b/flight/Modules/Battery/battery.c
index ac9dcace3..83c0002cd 100644
--- a/flight/Modules/Battery/battery.c
+++ b/flight/Modules/Battery/battery.c
@@ -78,7 +78,7 @@ int32_t BatteryInitialize(void)
 {
 
 	
-#ifdef MODULE_BATTERY_BUILTIN
+#ifdef MODULE_Battery_BUILTIN
 	batteryEnabled = true;
 #else
 	uint8_t optionalModules[HWSETTINGS_OPTIONALMODULES_NUMELEM];
diff --git a/flight/Modules/OveroSync/overosync.c b/flight/Modules/OveroSync/overosync.c
index 1fb4d1920..eaa2cb6fb 100644
--- a/flight/Modules/OveroSync/overosync.c
+++ b/flight/Modules/OveroSync/overosync.c
@@ -75,7 +75,7 @@ struct overosync *overosync;
 int32_t OveroSyncInitialize(void)
 {
 
-#ifdef MODULE_OVERO_BUILTIN
+#ifdef MODULE_OveroSync_BUILTIN
 	overoEnabled = true;
 #else
 	
diff --git a/make/apps-defs.mk b/make/apps-defs.mk
index 3ec1ff840..218694cb6 100644
--- a/make/apps-defs.mk
+++ b/make/apps-defs.mk
@@ -314,7 +314,7 @@ ifeq ($(ENABLE_DEBUG_PINS), YES)
 endif
 
 # Declare all non-optional modules as built-in to force inclusion
-CDEFS += $(foreach mod, $(MODULES), -DMODULE_$(mod)_BUILTIN)
+CDEFS += $(foreach mod, $(notdir $(MODULES)), -DMODULE_$(mod)_BUILTIN)
 
 # Place project-specific -D and/or -U options for Assembler with preprocessor here.
 #ADEFS = -DUSE_IRQ_ASM_WRAPPER