From 3119f7b909d6c8938ae92e45b1e92dc1bcba0c0b Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 16 May 2011 15:09:39 +0000
Subject: Add initial CC1101 wireless logic from Uros

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3617 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/drivers/usbhost/Make.defs | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'nuttx/drivers/usbhost')

diff --git a/nuttx/drivers/usbhost/Make.defs b/nuttx/drivers/usbhost/Make.defs
index ffdb9c651..cc28e874d 100644
--- a/nuttx/drivers/usbhost/Make.defs
+++ b/nuttx/drivers/usbhost/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # drivers/usbhost/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,19 +33,25 @@
 #
 ############################################################################
 
-USBHOST_ASRCS  =
-USBHOST_CSRCS  = hid_parser.c
-
-# Built-in USB driver logic
+CSRCS  += hid_parser.c
 
 ifeq ($(CONFIG_USBHOST),y)
-USBHOST_CSRCS  += usbhost_registry.c usbhost_registerclass.c usbhost_findclass.c
-USBHOST_CSRCS  += usbhost_enumerate.c usbhost_storage.c usbhost_hidkbd.c
 
-# Add-on USB driver logic (see misc/drivers)
+# Include built-in USB host driver logic
+
+CSRCS  += usbhost_registry.c usbhost_registerclass.c usbhost_findclass.c
+CSRCS  += usbhost_enumerate.c usbhost_storage.c usbhost_hidkbd.c
+
+# Include add-on USB host driver logic (see misc/drivers)
 
 ifeq ($(CONFIG_NET),y)
   RTL8187_CSRC  := ${shell if [ -f usbhost/rtl8187x.c ]; then echo "rtl8187x.c"; fi}
-  USBHOST_CSRCS += $(RTL8187_CSRC)
+  CSRCS += $(RTL8187_CSRC)
 endif
 endif
+
+# Include USB host driver build logic
+
+DEPPATH += --dep-path usbhost
+VPATH += :usbhost
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbhost}
-- 
cgit v1.2.3