diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-10 15:50:23 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-10 15:50:23 +0000 |
commit | b178fec3d84131c06bb015d60533a1b704650008 (patch) | |
tree | c14a8e28ee4a2b3cdaf038eceb9c4b356c8505b6 /nuttx/Makefile | |
parent | 6327539fc800e6d481ff26067c1a40ca01ae6de1 (diff) | |
download | nuttx-b178fec3d84131c06bb015d60533a1b704650008.tar.gz nuttx-b178fec3d84131c06bb015d60533a1b704650008.tar.bz2 nuttx-b178fec3d84131c06bb015d60533a1b704650008.zip |
Pascal now installs in the apps/ directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3583 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
-rw-r--r-- | nuttx/Makefile | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index 8785f1a1f..b74f9e225 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -1,7 +1,6 @@ ############################################################################ # Makefile # -# # Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # @@ -70,16 +69,12 @@ CONFIG_APPS_DIR = ../apps endif APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi} -# The Pascal p-code add-on directory - -PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi} - # All add-on directories. # # NUTTX_ADDONS is the list of directories built into the NuttX kernel. # USER_ADDONS is the list of directories that will be built into the user application -NUTTX_ADDONS := $(PCODE_DIR) $(NX_DIR) +NUTTX_ADDONS := $(NX_DIR) USER_ADDONS := ifeq ($(CONFIG_NUTTX_KERNEL),y) @@ -228,12 +223,6 @@ else NUTTXLIBS += fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) binfmt/libbinfmt$(LIBEXT) endif -# Add libraries for Pascall P-Code - -ifneq ($(PCODE_DIR),) -NUTTXLIBS += $(PCODE_DIR)/libpcode$(LIBEXT) -endif - # Add libraries for the NX graphics sub-system ifneq ($(NX_DIR),) @@ -357,9 +346,6 @@ drivers/libdrivers$(LIBEXT): context binfmt/libbinfmt$(LIBEXT): context @$(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) EXTRADEFINES=$(KDEFINE) -pcode/libpcode$(LIBEXT): context - @$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT) EXTRADEFINES=$(KDEFINE) - graphics/libgraphics$(LIBEXT): context @$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) EXTRADEFINES=$(KDEFINE) |