From 34f8aab8f0e19cc5bd0dae6bf7db3eb1d164836c Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 7 Jun 2011 23:02:34 +0000
Subject: More AVR build fixes

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3680 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/arch/avr/src/Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'nuttx/arch/avr/src/Makefile')

diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile
index 258501b76..1f8c41e7c 100644
--- a/nuttx/arch/avr/src/Makefile
+++ b/nuttx/arch/avr/src/Makefile
@@ -33,26 +33,30 @@
 #
 ############################################################################
 
+-include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs
 
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(CONFIG_ARCH_AVR32),y)
 ARCH_SUBDIR	= avr32
+endif
 ifeq ($(CONFIG_ARCH_AVR),y)
 ARCH_SUBDIR	= avr
 endif
 
 ifeq ($(WINTOOL),y)
   NUTTX		= "${shell cygpath -w $(TOPDIR)/nuttx}"
-  INCLUDES	= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-		   -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" \
-		   -I "${shell cygpath -w $(TOPDIR)/sched}"
+  INCLUDES	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
+  INCLUDES	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
+  INCLUDES	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}"
+  INCLUDES	+= -I "${shell cygpath -w $(TOPDIR)/sched}"
 else
-  NUTTX		= $(TOPDIR)/nuttx
-  INCLUDES	= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common \
-		   -I$(ARCH_SRCDIR)/$(ARCH_SUBDIR) -I$(TOPDIR)/sched
+  NUTTX		= "$(TOPDIR)/nuttx"
+  INCLUDES	+= -I "$(ARCH_SRCDIR)/chip"
+  INCLUDES	+= -I "$(ARCH_SRCDIR)/common"
+  INCLUDES	+= -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)"
+  INCLUDES	+= -I "$(TOPDIR)/sched"
 endif
 
 CPPFLAGS	+= $(INCLUDES)
-- 
cgit v1.2.3