summaryrefslogtreecommitdiff
path: root/apps/Makefile
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-05 11:25:34 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-05 11:25:34 -0600
commit4786d0438effecde73585fefaa6cec4921f70b3c (patch)
tree7f20c57dbd38a446a833f2e59e5c994b1bc6bae6 /apps/Makefile
parent46e70207ede819e3855c0b605c57d04c849bfd31 (diff)
downloadnuttx-4786d0438effecde73585fefaa6cec4921f70b3c.tar.gz
nuttx-4786d0438effecde73585fefaa6cec4921f70b3c.tar.bz2
nuttx-4786d0438effecde73585fefaa6cec4921f70b3c.zip
Copy more logic from nuttx/tools/Config.mk into the Make.defs file. Plus trivial related changes
Diffstat (limited to 'apps/Makefile')
-rw-r--r--apps/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile
index b8d73f995..0ad9596d6 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -35,17 +35,17 @@
#
############################################################################
--include $(TOPDIR)/Make.defs
-
APPDIR = ${shell pwd}
+TOPDIR ?= $(APPDIR)/import
+
+-include $(TOPDIR)/Make.defs
# Application Directories
# CONFIGURED_APPS is the list of all configured built-in directories/built
# action.
# SUBDIRS is the list of all directories containing Makefiles. It is used
-# only for cleaning. builtin must always be the first in the list. This
-# list can be extended by the .config file as well.
+# only for cleaning. builtin must always be the first in the list.
CONFIGURED_APPS =
SUBDIRS = examples graphics interpreters modbus builtin import nshlib