summaryrefslogtreecommitdiff
path: root/apps/examples/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-01-26 23:14:27 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-01-26 23:14:27 +0000
commit8f6700143c5b021a5a1bd3e21a8c20f177e8e9f2 (patch)
tree4bd1111e23d7cdb1b43685aa7f699c694f7c8d7f /apps/examples/Makefile
parentc1f3ba20b6959401b4e259c13c80d9fbd4a50f2c (diff)
downloadnuttx-8f6700143c5b021a5a1bd3e21a8c20f177e8e9f2.tar.gz
nuttx-8f6700143c5b021a5a1bd3e21a8c20f177e8e9f2.tar.bz2
nuttx-8f6700143c5b021a5a1bd3e21a8c20f177e8e9f2.zip
Add a text for the new composite USB device
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4341 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/Makefile')
-rw-r--r--apps/examples/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 297924d0e..c2e5fe3de 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -1,7 +1,7 @@
############################################################################
# apps/examples/Makefile
#
-# Copyright (C) 2011 Gregory Nutt. All rights reserved.
+# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -37,10 +37,11 @@
# Sub-directories
-SUBDIRS = adc buttons can dhcpd ftpc hello helloxx hidkbd igmp lcdrw mm \
- mount nettest nsh null nx nxffs nxflat nxhello nximage nxlines \
- nxtext ostest pashello pipe poll pwm rgmp romfs sendmail serloop \
- thttpd tiff touchscreen udp uip usbserial usbstorage usbterm wget wlan
+SUBDIRS = adc buttons can composite dhcpd ftpc hello helloxx hidkbd igmp \
+ lcdrw mm mount nettest nsh null nx nxffs nxflat nxhello nximage \
+ nxlines nxtext ostest pashello pipe poll pwm rgmp romfs sendmail \
+ serloop thttpd tiff touchscreen udp uip usbserial usbstorage usbterm \
+ wget wlan
# Sub-directories that might need context setup. Directories may need
# context setup for a variety of reasons, but the most common is because
@@ -55,7 +56,7 @@ SUBDIRS = adc buttons can dhcpd ftpc hello helloxx hidkbd igmp lcdrw mm \
CNTXTDIRS = pwm
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-CNTXTDIRS += adc can dhcpd nettest
+CNTXTDIRS += adc can composite dhcpd nettest
endif
ifeq ($(CONFIG_EXAMPLES_HELLOXX_BUILTIN),y)