From c9230359ef3da96b4aa2517475eb910e25ea1620 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 29 Nov 2012 18:44:02 +0000
Subject: All ZNEO configurations converted to use the mconf/Kconfig tool

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5401 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/ChangeLog.txt                |  2 ++
 apps/examples/pashello/Makefile   | 30 +++++++++++++++++++-----------
 apps/examples/pashello/pashello.c |  4 ++--
 apps/interpreters/Kconfig         |  4 ++--
 apps/interpreters/Make.defs       |  4 ++--
 apps/interpreters/ficl/Kconfig    |  4 ++--
 6 files changed, 29 insertions(+), 19 deletions(-)

(limited to 'apps')

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 29a54461a..673838067 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -426,3 +426,5 @@
 	  various DHCPC improvements(Darcy Gong).
 	* apps/nshlib/nsh_apps.c: Fix compilation errors whenCONFIG_NSH_DISABLEBG=y.
 	  From Freddie Chopin.
+	* Rename CONFIG_PCODE and CONFIG_FICL as CONFIG_INTERPRETERS_PCODE and
+	  CONFIG_INTERPRETERS_FICL for consistency with other configuration naming.
diff --git a/apps/examples/pashello/Makefile b/apps/examples/pashello/Makefile
index 5876b9d2a..bb525c925 100644
--- a/apps/examples/pashello/Makefile
+++ b/apps/examples/pashello/Makefile
@@ -39,30 +39,38 @@ include $(APPDIR)/Make.defs
 
 # Pascal Add-On Example
 
-ASRCS		=
-CSRCS		= pashello.c device.c
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+  "." \
+  "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \
+  "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)insn$(DELIM)include"}
+
+ASRCS =
+CSRCS = pashello.c device.c
 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN		= ..\..\libapps$(LIBEXT)
+  BIN = ..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN		= ..\\..\\libapps$(LIBEXT)
+  BIN = ..\\..\\libapps$(LIBEXT)
 else
-  BIN		= ../../libapps$(LIBEXT)
+  BIN = ../../libapps$(LIBEXT)
 endif
 endif
 
-ROOTDEPPATH	= --dep-path .
+ROOTDEPPATH = --dep-path .
 
 # Common build
 
-VPATH		= 
+VPATH = 
 
 all: .built
 .PHONY: clean depend distclean
diff --git a/apps/examples/pashello/pashello.c b/apps/examples/pashello/pashello.c
index b8c19b6a4..8f9fc8b22 100644
--- a/apps/examples/pashello/pashello.c
+++ b/apps/examples/pashello/pashello.c
@@ -43,8 +43,8 @@
 #include <stdlib.h>
 #include <debug.h>
 
-#include "apps/pcode/insn/pexec.h"
-#include "apps/pcode/pedefs.h"
+#include "pexec.h"
+#include "pedefs.h"
 #include "pashello.h"
 
 /****************************************************************************
diff --git a/apps/interpreters/Kconfig b/apps/interpreters/Kconfig
index 34cbf2eee..6e7d1ac4f 100644
--- a/apps/interpreters/Kconfig
+++ b/apps/interpreters/Kconfig
@@ -7,7 +7,7 @@ comment "Interpreters"
 
 source "$APPSDIR/interpreters/ficl/Kconfig"
 
-config PCODE
+config INTERPRETERS_PCODE
 	bool "Pascal p-code interpreter"
 	default n
 	---help---
@@ -16,6 +16,6 @@ config PCODE
 		configuration implies that you have performed the required installation of the
 		Pascal run-time code.
 
-if PCODE
+if INTERPRETERS_PCODE
 endif
 
diff --git a/apps/interpreters/Make.defs b/apps/interpreters/Make.defs
index 2fc4b26d4..5d808d5d6 100644
--- a/apps/interpreters/Make.defs
+++ b/apps/interpreters/Make.defs
@@ -34,10 +34,10 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_PCODE),y)
+ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
 CONFIGURED_APPS += interpreters/pcode
 endif
 
-ifeq ($(CONFIG_FICL),y)
+ifeq ($(CONFIG_INTERPRETERS_FICL),y)
 CONFIGURED_APPS += interpreters/ficl
 endif
diff --git a/apps/interpreters/ficl/Kconfig b/apps/interpreters/ficl/Kconfig
index 1860a1591..ba6a7bc35 100644
--- a/apps/interpreters/ficl/Kconfig
+++ b/apps/interpreters/ficl/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config FICL
+config INTERPRETERS_FICL
 	bool "Ficl Forth interpreter"
 	default n
 	---help---
@@ -11,6 +11,6 @@ config FICL
 		apps/interpreters/ficl directory.  Use of this configuration assumes
 		that you have performed the required installation of the Ficl run-time code.
 
-if FICL
+if INTERPRETERS_FICL
 endif
 
-- 
cgit v1.2.3