diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-08-14 15:45:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-08-14 15:45:53 +0000 |
commit | c921d802cf0afe28a574157c1a66c1aebf280d3d (patch) | |
tree | 49d4d2f2b88c05d3079202a8564f9533265e1937 /apps | |
parent | d15145a14005d75622dd44be1be0821975293366 (diff) | |
download | nuttx-c921d802cf0afe28a574157c1a66c1aebf280d3d.tar.gz nuttx-c921d802cf0afe28a574157c1a66c1aebf280d3d.tar.bz2 nuttx-c921d802cf0afe28a574157c1a66c1aebf280d3d.zip |
Fixes to apps/*/Make.defs files needed for auto-configuration build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5027 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/ChangeLog.txt | 2 | ||||
-rw-r--r-- | apps/graphics/Make.defs | 4 | ||||
-rw-r--r-- | apps/interpreters/Make.defs | 4 | ||||
-rw-r--r-- | apps/modbus/Make.defs | 2 | ||||
-rw-r--r-- | apps/namedapp/Make.defs | 2 | ||||
-rw-r--r-- | apps/netutils/Make.defs | 24 | ||||
-rw-r--r-- | apps/nshlib/Make.defs | 2 | ||||
-rw-r--r-- | apps/system/Make.defs | 8 | ||||
-rw-r--r-- | apps/vsn/Make.defs | 2 |
9 files changed, 26 insertions, 24 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 37d05bacd..01ef090a0 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -276,3 +276,5 @@ help on one command. * system/readline.c: If character input/output is interrupted by a signal, then readline() will try the read/write again. + * apps/*/Make.defs: Numerous fixes needed to use the automated + configuration (from Richard Cochran). diff --git a/apps/graphics/Make.defs b/apps/graphics/Make.defs index f17d36367..96153a6b5 100644 --- a/apps/graphics/Make.defs +++ b/apps/graphics/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps/graaphics/Make.defs +# apps/graphics/Make.defs # Adds selected applications to apps/ build # # Copyright (C) 2012 Gregory Nutt. All rights reserved. @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_TIFF),y) +ifeq ($(CONFIG_TIFF),y) CONFIGURED_APPS += graphics/tiff endif diff --git a/apps/interpreters/Make.defs b/apps/interpreters/Make.defs index 36ee7004d..2fc4b26d4 100644 --- a/apps/interpreters/Make.defs +++ b/apps/interpreters/Make.defs @@ -34,10 +34,10 @@ # ############################################################################ -if ($(CONFIG_PCODE),y) +ifeq ($(CONFIG_PCODE),y) CONFIGURED_APPS += interpreters/pcode endif -if ($(CONFIG_FICL),y) +ifeq ($(CONFIG_FICL),y) CONFIGURED_APPS += interpreters/ficl endif diff --git a/apps/modbus/Make.defs b/apps/modbus/Make.defs index a1165c1bd..11a55aa31 100644 --- a/apps/modbus/Make.defs +++ b/apps/modbus/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_MODBUS),y) +ifeq ($(CONFIG_MODBUS),y) CONFIGURED_APPS += modbus endif diff --git a/apps/namedapp/Make.defs b/apps/namedapp/Make.defs index a07b3b3c2..399fefee8 100644 --- a/apps/namedapp/Make.defs +++ b/apps/namedapp/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NAMEDAPP),y) +ifeq ($(CONFIG_NAMEDAPP),y) CONFIGURED_APPS += namedapp endif diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs index 3994da612..04accf5d2 100644 --- a/apps/netutils/Make.defs +++ b/apps/netutils/Make.defs @@ -34,50 +34,50 @@ # ############################################################################ -if ($(CONFIG_NETUTILS_DHCPC),y) +ifeq ($(CONFIG_NETUTILS_DHCPC),y) CONFIGURED_APPS += netutils/dhcpc endif -if ($(CONFIG_NETUTILS_DHCPD),y) +ifeq ($(CONFIG_NETUTILS_DHCPD),y) CONFIGURED_APPS += netutils/dhcpd endif -if ($(CONFIG_NETUTILS_FTPC),y) +ifeq ($(CONFIG_NETUTILS_FTPC),y) CONFIGURED_APPS += netutils/ftpc endif -if ($(CONFIG_NETUTILS_FTPD),y) +ifeq ($(CONFIG_NETUTILS_FTPD),y) CONFIGURED_APPS += netutils/ftpd endif -if ($(CONFIG_NETUTILS_RESOLV),y) +ifeq ($(CONFIG_NETUTILS_RESOLV),y) CONFIGURED_APPS += netutils/resolv endif -if ($(CONFIG_NETUTILS_SMTP),y) +ifeq ($(CONFIG_NETUTILS_SMTP),y) CONFIGURED_APPS += netutils/smtp endif -if ($(CONFIG_NETUTILS_TELNETD),y) +ifeq ($(CONFIG_NETUTILS_TELNETD),y) CONFIGURED_APPS += netutils/telnetd endif -if ($(CONFIG_NETUTILS_TFTPC),y) +ifeq ($(CONFIG_NETUTILS_TFTPC),y) CONFIGURED_APPS += netutils/tftpc endif -if ($(CONFIG_NETUTILS_THTTPD),y) +ifeq ($(CONFIG_NETUTILS_THTTPD),y) CONFIGURED_APPS += netutils/thttpd endif -if ($(CONFIG_NETUTILS_UIPLIB),y) +ifeq ($(CONFIG_NETUTILS_UIPLIB),y) CONFIGURED_APPS += netutils/uiplib endif -if ($(CONFIG_NETUTILS_WEBCLIENT),y) +ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y) CONFIGURED_APPS += netutils/webclient endif -if ($(CONFIGNETUTILS_WEBSERVER),y) +ifeq ($(CONFIGNETUTILS_WEBSERVER),y) CONFIGURED_APPS += netutils/webserver endif diff --git a/apps/nshlib/Make.defs b/apps/nshlib/Make.defs index c72c09bce..2bacb5b79 100644 --- a/apps/nshlib/Make.defs +++ b/apps/nshlib/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NSH_LIBRARY),y) +ifeq ($(CONFIG_NSH_LIBRARY),y) CONFIGURED_APPS += nshlib endif diff --git a/apps/system/Make.defs b/apps/system/Make.defs index 1ddabd337..e72f56ef5 100644 --- a/apps/system/Make.defs +++ b/apps/system/Make.defs @@ -34,18 +34,18 @@ # ############################################################################ -if ($(CONFIG_VSN_POWEROFF),y) +ifeq ($(CONFIG_VSN_POWEROFF),y) CONFIGURED_APPS += vsn/poweroff endif -if ($(CONFIG_VSN_RAMTRON),y) +ifeq ($(CONFIG_VSN_RAMTRON),y) CONFIGURED_APPS += vsn/ramtron endif -if ($(CONFIG_VSN_SDCARD),y) +ifeq ($(CONFIG_VSN_SDCARD),y) CONFIGURED_APPS += vsn/sdcard endif -if ($(CONFIG_VSN_SYSINFO),y) +ifeq ($(CONFIG_VSN_SYSINFO),y) CONFIGURED_APPS += vsn/sysinfo endif diff --git a/apps/vsn/Make.defs b/apps/vsn/Make.defs index a07b3b3c2..399fefee8 100644 --- a/apps/vsn/Make.defs +++ b/apps/vsn/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NAMEDAPP),y) +ifeq ($(CONFIG_NAMEDAPP),y) CONFIGURED_APPS += namedapp endif |