From eb6ebb93d2b13b6db1e7e4303f128704f5b074eb Mon Sep 17 00:00:00 2001
From: sambas <sambas>
Date: Mon, 24 Jan 2011 20:34:29 +0000
Subject: [PATCH] Build: last patches for windoes, and output targets

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2586 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/Bootloaders/AHRS/Makefile      | 10 +++++-----
 flight/Bootloaders/OpenPilot/Makefile | 10 +++++-----
 flight/Bootloaders/PipXtreme/Makefile | 10 +++++-----
 flight/PipXtreme/Makefile             |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/flight/Bootloaders/AHRS/Makefile b/flight/Bootloaders/AHRS/Makefile
index 4feb5a634..235ca7bfd 100644
--- a/flight/Bootloaders/AHRS/Makefile
+++ b/flight/Bootloaders/AHRS/Makefile
@@ -58,7 +58,7 @@ MODEL    = MD
 
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = ..\..\..\build\flight\bootloaders\ahrs
+OUTDIR = ../../../build/bootloaders/ahrs
 
 # Target file name (without extension).
 TARGET = AHRS_BL
@@ -571,16 +571,16 @@ clean_list :
 # Create output files directory
 # all known MS Windows OS define the ComSpec environment variable
 ifdef ComSpec
-$(shell md $(OUTDIR) 2>NUL)
+$(shell md $(subst /,\\,$(OUTDIR)) 2>NUL)
 else
-$(shell mkdir $(OUTDIR) 2>/dev/null)
+$(shell mkdir -p $(OUTDIR) 2>/dev/null)
 endif
 
 # Include the dependency files.
 ifdef ComSpec
--include $(shell md $(OUTDIR)\dep 2>NUL) $(wildcard $(OUTDIR)/dep/*)
+-include $(shell md $(subst /,\\,$(OUTDIR))\dep 2>NUL) $(wildcard $(OUTDIR)/dep/*)
 else
--include $(shell mkdir $(OUTDIR) 2>/dev/null) $(shell mkdir $(OUTDIR)/dep 2>/dev/null) $(wildcard $(OUTDIR)/dep/*)
+-include $(shell mkdir -p $(OUTDIR) 2>/dev/null) $(shell mkdir $(OUTDIR)/dep 2>/dev/null) $(wildcard $(OUTDIR)/dep/*)
 endif
 
 
diff --git a/flight/Bootloaders/OpenPilot/Makefile b/flight/Bootloaders/OpenPilot/Makefile
index 81aff363c..ed57ab5ee 100644
--- a/flight/Bootloaders/OpenPilot/Makefile
+++ b/flight/Bootloaders/OpenPilot/Makefile
@@ -73,7 +73,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = ..\..\..\build\flight\bootloaders\openpilot
+OUTDIR = ../../../build/bootloaders/openpilot
 
 # Target file name (without extension).
 TARGET = OpenPilot_BL
@@ -669,16 +669,16 @@ clean_list :
 # Create output files directory
 # all known MS Windows OS define the ComSpec environment variable
 ifdef ComSpec
-$(shell md $(OUTDIR) 2>NUL)
+$(shell md $(subst /,\\,$(OUTDIR)) 2>NUL)
 else
-$(shell mkdir $(OUTDIR) 2>/dev/null)
+$(shell mkdir -p $(OUTDIR) 2>/dev/null)
 endif
 
 # Include the dependency files.
 ifdef ComSpec
--include $(shell md $(OUTDIR)\dep 2>NUL) $(wildcard $(OUTDIR)/dep/*)
+-include $(shell md $(subst /,\\,$(OUTDIR))\dep 2>NUL) $(wildcard $(OUTDIR)/dep/*)
 else
--include $(shell mkdir $(OUTDIR) 2>/dev/null) $(shell mkdir $(OUTDIR)/dep 2>/dev/null) $(wildcard $(OUTDIR)/dep/*)
+-include $(shell mkdir -p $(OUTDIR) 2>/dev/null) $(shell mkdir $(OUTDIR)/dep 2>/dev/null) $(wildcard $(OUTDIR)/dep/*)
 endif
 
 
diff --git a/flight/Bootloaders/PipXtreme/Makefile b/flight/Bootloaders/PipXtreme/Makefile
index b94d6c506..a7b731e8f 100644
--- a/flight/Bootloaders/PipXtreme/Makefile
+++ b/flight/Bootloaders/PipXtreme/Makefile
@@ -73,7 +73,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = ..\..\..\build\flight\bootloaders\pipxtreme
+OUTDIR = ../../../build/bootloaders/pipxtreme
 
 # Target file name (without extension).
 TARGET = PipXtreme_BL
@@ -668,16 +668,16 @@ clean_list :
 # Create output files directory
 # all known MS Windows OS define the ComSpec environment variable
 ifdef ComSpec
-$(shell md $(OUTDIR) 2>NUL)
+$(shell md $(subst /,\\,$(OUTDIR)) 2>NUL)
 else
-$(shell mkdir $(OUTDIR) 2>/dev/null)
+$(shell mkdir -p $(OUTDIR) 2>/dev/null)
 endif
 
 # Include the dependency files.
 ifdef ComSpec
--include $(shell md $(OUTDIR)\dep 2>NUL) $(wildcard $(OUTDIR)/dep/*)
+-include $(shell md $(subst /,\\,$(OUTDIR))\dep 2>NUL) $(wildcard $(OUTDIR)/dep/*)
 else
--include $(shell mkdir $(OUTDIR) 2>/dev/null) $(shell mkdir $(OUTDIR)/dep 2>/dev/null) $(wildcard $(OUTDIR)/dep/*)
+-include $(shell mkdir -p $(OUTDIR) 2>/dev/null) $(shell mkdir $(OUTDIR)/dep 2>/dev/null) $(wildcard $(OUTDIR)/dep/*)
 endif
 
 
diff --git a/flight/PipXtreme/Makefile b/flight/PipXtreme/Makefile
index a134c51e1..854968ae7 100644
--- a/flight/PipXtreme/Makefile
+++ b/flight/PipXtreme/Makefile
@@ -72,7 +72,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = ../../build/flight/pipxtreme
+OUTDIR = ../../build/pipxtreme
 
 # Target file name (without extension).
 TARGET = PipXtreme