summaryrefslogtreecommitdiff
path: root/apps/examples/Makefile
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-25 18:50:14 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-25 18:50:14 -0600
commit97ef769f2d180b5809c2f9513cf4bb66de1f2595 (patch)
treeae801e098a52399edee7d6a322c486a92b5fd499 /apps/examples/Makefile
parent54cd9689cccad1949c067f40d500491851799221 (diff)
downloadnuttx-97ef769f2d180b5809c2f9513cf4bb66de1f2595.tar.gz
nuttx-97ef769f2d180b5809c2f9513cf4bb66de1f2595.tar.bz2
nuttx-97ef769f2d180b5809c2f9513cf4bb66de1f2595.zip
Mov apps/examples/composite to apps/system/composite; convert configs/stm3210e-eval/composite to use kconfig-frontend tools -- untested
Diffstat (limited to 'apps/examples/Makefile')
-rw-r--r--apps/examples/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index daa944e89..b629efa77 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -37,10 +37,10 @@
# Sub-directories
-SUBDIRS = adc buttons can cc3000 composite cxxtest dhcpd discover elf
-SUBDIRS += flash_test ftpc ftpd hello helloxx hidkbd igmp json keypadtest
-SUBDIRS += lcdrw mm modbus mount mtdpart nettest nrf24l01_term nsh null
-SUBDIRS += nx nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest
+SUBDIRS = adc buttons can cc3000 cxxtest dhcpd discover elf flash_test
+SUBDIRS += ftpc ftpd hello helloxx hidkbd igmp json keypadtest lcdrw
+SUBDIRS += mm modbus mount mtdpart nettest nrf24l01_term nsh null nx
+SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest
SUBDIRS += pashello pipe poll posix_spawn pwm qencoder relays rgmp romfs
SUBDIRS += sendmail serloop slcd smart smart_test tcpecho telnetd thttpd tiff
SUBDIRS += touchscreen udp uip usbserial usbterm watchdog wget wgetjson
@@ -53,8 +53,8 @@ SUBDIRS += xmlrpc
CNTXTDIRS = pwm
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-CNTXTDIRS += adc can cc3000 composite cxxtest dhcpd discover flash_test
-CNTXTDIRS += ftpd hello helloxx json keypadtestmodbus lcdrw mtdpart nettest
+CNTXTDIRS += adc can cc3000 cxxtest dhcpd discover flash_test ftpd
+CNTXTDIRS += hello helloxx json keypadtestmodbus lcdrw mtdpart nettest
CNTXTDIRS += nx nxhello nximage nxlines nxtext nrf24l01_term ostest relays
CNTXTDIRS += qencoder slcd smart_test tcpecho telnetd tiff touchscreen
CNTXTDIRS += usbterm watchdog wgetjson