From ba1d519192eccb4be61eb3ee5a9feadd3e2d90c4 Mon Sep 17 00:00:00 2001
From: peabody124 <peabody124>
Date: Mon, 24 Jan 2011 08:14:00 +0000
Subject: [PATCH] Get CC working with new file locations and also fix AHRS
 build to work with these locations

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2581 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/AHRS/Makefile          |  4 +--
 flight/CopterControl/Makefile | 51 ++++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/flight/AHRS/Makefile b/flight/AHRS/Makefile
index cab696d1c..be6952820 100644
--- a/flight/AHRS/Makefile
+++ b/flight/AHRS/Makefile
@@ -60,7 +60,7 @@ else
 BOOT_MODEL    = $(MODEL)_NB
 endif
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = ..\..\build\flight\ahrs
+OUTDIR = ..\..\build\ahrs
 
 # Target file name (without extension).
 TARGET = AHRS
@@ -89,7 +89,7 @@ OPSYSINC = $(OPDIR)/System/inc
 BOOT = ../Bootloaders/AHRS
 BOOTINC = $(BOOT)/inc
 
-OPUAVSYNTHDIR = $(OUTDIR)/../../uavobject-synthetics/flight
+OPUAVSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight
 
 # List C source files here. (C dependencies are automatically generated.)
 # use file-extension c for "c-only"-files
diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile
index c0d76bc02..defd33769 100644
--- a/flight/CopterControl/Makefile
+++ b/flight/CopterControl/Makefile
@@ -82,7 +82,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = Build
+OUTDIR = ..\..\build\coptercontrol
 
 # Target file name (without extension).
 TARGET = CopterControl
@@ -131,6 +131,8 @@ PYMITEINC += $(OUTDIR)
 FLIGHTPLANLIB = $(OPMODULEDIR)/FlightPlan/lib
 FLIGHTPLANS = $(OPMODULEDIR)/FlightPlan/flightplans
 
+OPUAVSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight
+
 # List C source files here. (C dependencies are automatically generated.)
 # use file-extension c for "c-only"-files
 
@@ -160,29 +162,29 @@ endif
 
 ## UAVOBJECTS
 ifndef TESTAPP
-SRC += $(OPUAVOBJ)/objectpersistence.c
-SRC += $(OPUAVOBJ)/gcstelemetrystats.c
-SRC += $(OPUAVOBJ)/flighttelemetrystats.c
-SRC += $(OPUAVOBJ)/systemstats.c
-SRC += $(OPUAVOBJ)/systemalarms.c
-SRC += $(OPUAVOBJ)/systemsettings.c
-SRC += $(OPUAVOBJ)/stabilizationsettings.c
-SRC += $(OPUAVOBJ)/actuatorcommand.c
-SRC += $(OPUAVOBJ)/actuatordesired.c
-SRC += $(OPUAVOBJ)/actuatorsettings.c
-SRC += $(OPUAVOBJ)/attituderaw.c
-SRC += $(OPUAVOBJ)/attitudeactual.c
-SRC += $(OPUAVOBJ)/attitudedesired.c
-SRC += $(OPUAVOBJ)/manualcontrolcommand.c
-SRC += $(OPUAVOBJ)/taskinfo.c
-SRC += $(OPUAVOBJ)/i2cstats.c
-SRC += $(OPUAVOBJ)/watchdogstatus.c
-SRC += $(OPUAVOBJ)/telemetrysettings.c
-SRC += $(OPUAVOBJ)/ratedesired.c
-SRC += $(OPUAVOBJ)/manualcontrolsettings.c
-SRC += $(OPUAVOBJ)/mixersettings.c
-SRC += $(OPUAVOBJ)/mixerstatus.c
-SRC += $(OPUAVOBJ)/ahrssettings.c
+SRC += $(OPUAVSYNTHDIR)/objectpersistence.c
+SRC += $(OPUAVSYNTHDIR)/gcstelemetrystats.c
+SRC += $(OPUAVSYNTHDIR)/flighttelemetrystats.c
+SRC += $(OPUAVSYNTHDIR)/systemstats.c
+SRC += $(OPUAVSYNTHDIR)/systemalarms.c
+SRC += $(OPUAVSYNTHDIR)/systemsettings.c
+SRC += $(OPUAVSYNTHDIR)/stabilizationsettings.c
+SRC += $(OPUAVSYNTHDIR)/actuatorcommand.c
+SRC += $(OPUAVSYNTHDIR)/actuatordesired.c
+SRC += $(OPUAVSYNTHDIR)/actuatorsettings.c
+SRC += $(OPUAVSYNTHDIR)/attituderaw.c
+SRC += $(OPUAVSYNTHDIR)/attitudeactual.c
+SRC += $(OPUAVSYNTHDIR)/attitudedesired.c
+SRC += $(OPUAVSYNTHDIR)/manualcontrolcommand.c
+SRC += $(OPUAVSYNTHDIR)/taskinfo.c
+SRC += $(OPUAVSYNTHDIR)/i2cstats.c
+SRC += $(OPUAVSYNTHDIR)/watchdogstatus.c
+SRC += $(OPUAVSYNTHDIR)/telemetrysettings.c
+SRC += $(OPUAVSYNTHDIR)/ratedesired.c
+SRC += $(OPUAVSYNTHDIR)/manualcontrolsettings.c
+SRC += $(OPUAVSYNTHDIR)/mixersettings.c
+SRC += $(OPUAVSYNTHDIR)/mixerstatus.c
+SRC += $(OPUAVSYNTHDIR)/ahrssettings.c
 #${wildcard ${OBJ}/$(shell echo $(VAR) | tr A-Z a-z)/*.c}
 #SRC += ${foreach OBJ, ${UAVOBJECTS}, $(UAVOBJECTS)/$(OBJ).c}
 # Cant use until i can automatically generate list of UAVObjects
@@ -321,6 +323,7 @@ EXTRAINCDIRS  += $(OPUAVTALK)
 EXTRAINCDIRS  += $(OPUAVTALKINC)
 EXTRAINCDIRS  += $(OPUAVOBJ)
 EXTRAINCDIRS  += $(OPUAVOBJINC)
+EXTRAINCDIRS  += $(OPUAVSYNTHDIR)
 EXTRAINCDIRS  += $(PIOS)
 EXTRAINCDIRS  += $(PIOSINC)
 EXTRAINCDIRS  += $(FLIGHTLIBINC)