From ebd2614feb9f71cbf75c28d1ed1e5ef7a4dcf06c Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 9 May 2011 22:21:10 +0000 Subject: Move nuttx/include/apps to apps/include git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3581 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'nuttx/Makefile') diff --git a/nuttx/Makefile b/nuttx/Makefile index fc8d6ac28..615a547e5 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -1,6 +1,7 @@ ############################################################################ # Makefile # +# # Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # @@ -274,12 +275,19 @@ tools/mkconfig: include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig tools/mkconfig $(TOPDIR) > include/nuttx/config.h -# link the arch//include dir to include/arch +# Link the apps/include directory to include/apps + +include/apps: Make.defs +ifneq ($(APPDIR),) + @$(DIRLINK) $(APPDIR)/include include/apps +endif + +# Link the arch//include directory to include/arch include/arch: Make.defs @$(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch -# Link the configs//include dir to include/arch/board +# Link the configs//include directory to include/arch/board include/arch/board: include/arch Make.defs include/arch @$(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/include include/arch/board @@ -303,7 +311,7 @@ ifneq ($(CONFIG_ARCH_CHIP),) @$(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip endif -dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip +dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip include/apps context: check_context include/nuttx/config.h include/nuttx/version.h dirlinks @for dir in $(CONTEXTDIRS) ; do \ @@ -317,6 +325,7 @@ clean_context: @$(DIRUNLINK) include/arch @$(DIRUNLINK) $(ARCH_SRC)/board @$(DIRUNLINK) $(ARCH_SRC)/chip + @$(DIRUNLINK) include/apps check_context: @if [ ! -e ${TOPDIR}/.config -o ! -e ${TOPDIR}/Make.defs ]; then \ -- cgit v1.2.3