diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-27 18:21:26 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-27 18:21:26 +0000 |
commit | 4f104b5e3de5f9981280ed6a9cc6d825b62847d7 (patch) | |
tree | 406de17abc4dcaf0ee6ea4ad85bc4c45ea1d4e85 /apps/examples/Makefile | |
parent | 54aa38368612e70a846674ceae13fe19677c01dc (diff) | |
download | px4-firmware-4f104b5e3de5f9981280ed6a9cc6d825b62847d7.tar.gz px4-firmware-4f104b5e3de5f9981280ed6a9cc6d825b62847d7.tar.bz2 px4-firmware-4f104b5e3de5f9981280ed6a9cc6d825b62847d7.zip |
Add port of cJSON from Darcy Gong
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5267 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/Makefile')
-rw-r--r-- | apps/examples/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/examples/Makefile b/apps/examples/Makefile index ef59e6822..0ebc300e4 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -38,7 +38,7 @@ # Sub-directories SUBDIRS = adc buttons can cdcacm composite dhcpd discover elf ftpc ftpd hello -SUBDIRS += helloxx hidkbd igmp lcdrw mm modbus mount nettest nsh null nx +SUBDIRS += helloxx hidkbd igmp json lcdrw mm modbus mount nettest nsh null nx SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest SUBDIRS += pashello pipe poll pwm qencoder rgmp romfs serloop telnetd SUBDIRS += thttpd tiff touchscreen udp uip usbserial sendmail usbstorage @@ -57,8 +57,8 @@ SUBDIRS += usbterm watchdog wget wlan CNTXTDIRS = pwm ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -CNTXTDIRS += adc can cdcacm composite discover ftpd dhcpd modbus nettest -CNTXTDIRS += qencoder telnetd watchdog +CNTXTDIRS += adc can cdcacm composite dhcpd discover ftpd json modbus +CNTXTDIRS += nettest qencoder telnetd watchdog endif ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y) |