diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-09 22:21:10 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-09 22:21:10 +0000 |
commit | ebd2614feb9f71cbf75c28d1ed1e5ef7a4dcf06c (patch) | |
tree | f4ffb56da02f9448d8b30cb84ce1d267bef00007 | |
parent | 03023238fb7fa0634b0042d5600f08a11e98ecc3 (diff) | |
download | nuttx-ebd2614feb9f71cbf75c28d1ed1e5ef7a4dcf06c.tar.gz nuttx-ebd2614feb9f71cbf75c28d1ed1e5ef7a4dcf06c.tar.bz2 nuttx-ebd2614feb9f71cbf75c28d1ed1e5ef7a4dcf06c.zip |
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
-rw-r--r-- | apps/include/apps.h (renamed from nuttx/include/apps/apps.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/dhcpc.h (renamed from nuttx/include/apps/netutils/dhcpc.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/dhcpd.h (renamed from nuttx/include/apps/netutils/dhcpd.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/httpd.h (renamed from nuttx/include/apps/netutils/httpd.h) | 0 | ||||
-rwxr-xr-x | apps/include/netutils/ipmsfilter.h (renamed from nuttx/include/apps/netutils/ipmsfilter.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/resolv.h (renamed from nuttx/include/apps/netutils/resolv.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/smtp.h (renamed from nuttx/include/apps/netutils/smtp.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/telnetd.h (renamed from nuttx/include/apps/netutils/telnetd.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/tftp.h (renamed from nuttx/include/apps/netutils/tftp.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/thttpd.h (renamed from nuttx/include/apps/netutils/thttpd.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/uiplib.h (renamed from nuttx/include/apps/netutils/uiplib.h) | 0 | ||||
-rw-r--r-- | apps/include/netutils/webclient.h (renamed from nuttx/include/apps/netutils/webclient.h) | 0 | ||||
-rw-r--r-- | apps/include/nsh.h (renamed from nuttx/include/apps/nsh.h) | 0 | ||||
-rw-r--r-- | nuttx/Makefile | 15 |
14 files changed, 12 insertions, 3 deletions
diff --git a/nuttx/include/apps/apps.h b/apps/include/apps.h index d494500d1..d494500d1 100644 --- a/nuttx/include/apps/apps.h +++ b/apps/include/apps.h diff --git a/nuttx/include/apps/netutils/dhcpc.h b/apps/include/netutils/dhcpc.h index 994a6713e..994a6713e 100644 --- a/nuttx/include/apps/netutils/dhcpc.h +++ b/apps/include/netutils/dhcpc.h diff --git a/nuttx/include/apps/netutils/dhcpd.h b/apps/include/netutils/dhcpd.h index b03415b20..b03415b20 100644 --- a/nuttx/include/apps/netutils/dhcpd.h +++ b/apps/include/netutils/dhcpd.h diff --git a/nuttx/include/apps/netutils/httpd.h b/apps/include/netutils/httpd.h index 12f2a1511..12f2a1511 100644 --- a/nuttx/include/apps/netutils/httpd.h +++ b/apps/include/netutils/httpd.h diff --git a/nuttx/include/apps/netutils/ipmsfilter.h b/apps/include/netutils/ipmsfilter.h index 56088eca7..56088eca7 100755 --- a/nuttx/include/apps/netutils/ipmsfilter.h +++ b/apps/include/netutils/ipmsfilter.h diff --git a/nuttx/include/apps/netutils/resolv.h b/apps/include/netutils/resolv.h index a427c5394..a427c5394 100644 --- a/nuttx/include/apps/netutils/resolv.h +++ b/apps/include/netutils/resolv.h diff --git a/nuttx/include/apps/netutils/smtp.h b/apps/include/netutils/smtp.h index d1ea0c5d9..d1ea0c5d9 100644 --- a/nuttx/include/apps/netutils/smtp.h +++ b/apps/include/netutils/smtp.h diff --git a/nuttx/include/apps/netutils/telnetd.h b/apps/include/netutils/telnetd.h index 9d3d6feaf..9d3d6feaf 100644 --- a/nuttx/include/apps/netutils/telnetd.h +++ b/apps/include/netutils/telnetd.h diff --git a/nuttx/include/apps/netutils/tftp.h b/apps/include/netutils/tftp.h index c00e37c72..c00e37c72 100644 --- a/nuttx/include/apps/netutils/tftp.h +++ b/apps/include/netutils/tftp.h diff --git a/nuttx/include/apps/netutils/thttpd.h b/apps/include/netutils/thttpd.h index 959177219..959177219 100644 --- a/nuttx/include/apps/netutils/thttpd.h +++ b/apps/include/netutils/thttpd.h diff --git a/nuttx/include/apps/netutils/uiplib.h b/apps/include/netutils/uiplib.h index a149de63b..a149de63b 100644 --- a/nuttx/include/apps/netutils/uiplib.h +++ b/apps/include/netutils/uiplib.h diff --git a/nuttx/include/apps/netutils/webclient.h b/apps/include/netutils/webclient.h index c80626e3b..c80626e3b 100644 --- a/nuttx/include/apps/netutils/webclient.h +++ b/apps/include/netutils/webclient.h diff --git a/nuttx/include/apps/nsh.h b/apps/include/nsh.h index 6977e44bd..6977e44bd 100644 --- a/nuttx/include/apps/nsh.h +++ b/apps/include/nsh.h 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 <spudmonkey@racsa.co.cr> # @@ -274,12 +275,19 @@ tools/mkconfig: include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig tools/mkconfig $(TOPDIR) > include/nuttx/config.h -# link the arch/<arch-name>/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/<arch-name>/include directory to include/arch include/arch: Make.defs @$(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch -# Link the configs/<board-name>/include dir to include/arch/board +# Link the configs/<board-name>/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 \ |