diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-28 18:06:51 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-28 18:06:51 +0000 |
commit | 46f39c4adab2144ee3e7f11a02f0d2253b656668 (patch) | |
tree | 75bd179581f5c8a8b532dcc83658105e3a180993 /nuttx/Makefile | |
parent | 09e1aa6ffa05eedcdb4e9f71d7a08f9139311fb6 (diff) | |
download | px4-nuttx-46f39c4adab2144ee3e7f11a02f0d2253b656668.tar.gz px4-nuttx-46f39c4adab2144ee3e7f11a02f0d2253b656668.tar.bz2 px4-nuttx-46f39c4adab2144ee3e7f11a02f0d2253b656668.zip |
Replace CONFIG_EXAMPLE with CONFIG_APP_DIR
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2893 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
-rw-r--r-- | nuttx/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index ddd9e1edf..90bd2f202 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -69,7 +69,7 @@ ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) # (except for parts of FSDIRS). We will exclude FSDIRS # from the build if file descriptor support is disabled -NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS) +NONFSDIRS = sched lib $(ARCH_SRC) mm $(CONFIG_APP_DIR) $(ADDON_DIRS) FSDIRS = fs drivers binfmt CONTEXTDIRS = @@ -113,7 +113,7 @@ endif # is disabled. LINKLIBS = sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \ - lib/liblib$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT) + lib/liblib$(LIBEXT) $(CONFIG_APP_DIR)/libapp$(LIBEXT) # Add libraries for network support. CXX, CXXFLAGS, and COMPILEXX must # be defined in Make.defs for this to work! @@ -253,8 +253,8 @@ pcode/libpcode$(LIBEXT): context graphics/libgraphics$(LIBEXT): context @$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) -examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT): context - @$(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR="$(TOPDIR)" lib$(CONFIG_EXAMPLE)$(LIBEXT) +$(CONFIG_APP_DIR)/libapp$(LIBEXT): context + @$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" libapp$(LIBEXT) pass1: ifeq ($(CONFIG_BUILD_2PASS),y) |