Private headers in common directory is a bad idea

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@513 42af7a65-404d-4744-a932-0658087f49c3

20 files changed, 12 insertions, 5 deletions

diff --git a/misc/pascal/insn16/libinsn/pgen.c b/misc/pascal/insn16/libinsn/pgen.c
index 4be58e108..cc192587c 100644
--- a/misc/pascal/insn16/libinsn/pgen.c
+++ b/misc/pascal/insn16/libinsn/pgen.c
@@ -61,7 +61,6 @@
  * Global Variables

  **********************************************************************/

 

-/* See pas.h */

 extern poffHandle_t poffHandle; /* Handle to POFF object */

 extern FILE *lstFile;           /* LIST file pointer */

 extern sint16 level;            /* Static nesting level */

diff --git a/misc/pascal/insn32/libinsn/pgen.c b/misc/pascal/insn32/libinsn/pgen.c
index 7283622aa..d6584147d 100644
--- a/misc/pascal/insn32/libinsn/pgen.c
+++ b/misc/pascal/insn32/libinsn/pgen.c
@@ -63,7 +63,6 @@
  * Global Variables

  **********************************************************************/

 

-/* See pas.h */

 extern poffHandle_t poffHandle; /* Handle to POFF object */

 extern FILE *lstFile;           /* LIST file pointer */

 extern sint16 level;            /* Static nesting level */

diff --git a/misc/pascal/nuttx/INSTALL.sh b/misc/pascal/nuttx/INSTALL.sh
index 53749281f..c2f374e57 100755
--- a/misc/pascal/nuttx/INSTALL.sh
+++ b/misc/pascal/nuttx/INSTALL.sh
@@ -126,9 +126,9 @@ mkdir ${nuttxdir}/pcode/libpas || \
 
 # Copy runtime files
 
-cp -a ${pascaldir}/include/poff.h ${pascaldir}/include/pofflib.h \
+cp -a ${pascaldir}/include/poff.h   ${pascaldir}/include/pofflib.h \
       ${pascaldir}/include/pedefs.h ${pascaldir}/include/perr.h \
-      ${pascaldir}/include/pdefs.h ${pascaldir}/include/pfdefs.h \
+      ${pascaldir}/include/pdefs.h  ${pascaldir}/include/pfdefs.h \
       ${pascaldir}/include/pxdefs.h ${pascaldir}/include/paslib.h \
       ${nuttxdir}/pcode/include/. || \
   { echo "Failed to copy ${pascaldir}/include" ; exit 1; }
@@ -161,6 +161,6 @@ cp -a ${pascaldir}/${modeldir}/include/pexec.h  ${pascaldir}/${modeldir}/include
       ${nuttxdir}/pcode/insn/include/. || \
   { echo "Failed to copy ${pascaldir}/${modeldir}/include" ; exit 1; }
 
-cp -a ${pascaldir}/${modeldir}/prun/pexec.c  ${pascaldir}/${modeldir}/prun/pload.c \
+cp -a ${pascaldir}/${modeldir}/prun/pexec.c   ${pascaldir}/${modeldir}/prun/pload.c \
       ${pascaldir}/${modeldir}/prun/Make.defs ${nuttxdir}/pcode/insn/prun/. || \
   { echo "Failed to copy ${pascaldir}/${modeldir}/prun" ; exit 1; }
diff --git a/misc/pascal/pascal/Makefile b/misc/pascal/pascal/Makefile
index 6029fb245..4c4eaf700 100644
--- a/misc/pascal/pascal/Makefile
+++ b/misc/pascal/pascal/Makefile
@@ -47,6 +47,10 @@ BINDIR-$(CONFIG_INSN16)	= $(PASCAL)/bin16
 BINDIR-$(CONFIG_INSN32)	= $(PASCAL)/bin32
 
 #
+# Tools
+#
+CFLAGS			+= -I.
+#
 # Objects and targets
 #
 PASSRCS			= pas.c pprgm.c punit.c pblck.c pstm.c pexpr.c \
diff --git a/misc/pascal/include/pas.h b/misc/pascal/pascal/pas.h
index 5a4829948..5a4829948 100644
--- a/misc/pascal/include/pas.h
+++ b/misc/pascal/pascal/pas.h
diff --git a/misc/pascal/include/pblck.h b/misc/pascal/pascal/pblck.h
index 22b6b75b4..22b6b75b4 100644
--- a/misc/pascal/include/pblck.h
+++ b/misc/pascal/pascal/pblck.h
diff --git a/misc/pascal/include/pexpr.h b/misc/pascal/pascal/pexpr.h
index dba1f1ee7..dba1f1ee7 100644
--- a/misc/pascal/include/pexpr.h
+++ b/misc/pascal/pascal/pexpr.h
diff --git a/misc/pascal/include/pfunc.h b/misc/pascal/pascal/pfunc.h
index e6d3303e4..e6d3303e4 100644
--- a/misc/pascal/include/pfunc.h
+++ b/misc/pascal/pascal/pfunc.h
diff --git a/misc/pascal/include/pgen.h b/misc/pascal/pascal/pgen.h
index 055e14eb3..055e14eb3 100644
--- a/misc/pascal/include/pgen.h
+++ b/misc/pascal/pascal/pgen.h
diff --git a/misc/pascal/include/pprgm.h b/misc/pascal/pascal/pprgm.h
index 7c4ef2ca0..7c4ef2ca0 100644
--- a/misc/pascal/include/pprgm.h
+++ b/misc/pascal/pascal/pprgm.h
diff --git a/misc/pascal/include/pproc.h b/misc/pascal/pascal/pproc.h
index 5ede20a57..5ede20a57 100644
--- a/misc/pascal/include/pproc.h
+++ b/misc/pascal/pascal/pproc.h
diff --git a/misc/pascal/include/pstm.h b/misc/pascal/pascal/pstm.h
index 6508db68a..6508db68a 100644
--- a/misc/pascal/include/pstm.h
+++ b/misc/pascal/pascal/pstm.h
diff --git a/misc/pascal/include/ptbl.h b/misc/pascal/pascal/ptbl.h
index 70d318846..70d318846 100644
--- a/misc/pascal/include/ptbl.h
+++ b/misc/pascal/pascal/ptbl.h
diff --git a/misc/pascal/include/ptdefs.h b/misc/pascal/pascal/ptdefs.h
index d7a079e13..d7a079e13 100644
--- a/misc/pascal/include/ptdefs.h
+++ b/misc/pascal/pascal/ptdefs.h
diff --git a/misc/pascal/include/ptkn.h b/misc/pascal/pascal/ptkn.h
index d30333e0c..d30333e0c 100644
--- a/misc/pascal/include/ptkn.h
+++ b/misc/pascal/pascal/ptkn.h
diff --git a/misc/pascal/include/punit.h b/misc/pascal/pascal/punit.h
index 128ec7198..128ec7198 100644
--- a/misc/pascal/include/punit.h
+++ b/misc/pascal/pascal/punit.h
diff --git a/misc/pascal/plink/Makefile b/misc/pascal/plink/Makefile
index 9b76aa6a0..260639417 100644
--- a/misc/pascal/plink/Makefile
+++ b/misc/pascal/plink/Makefile
@@ -47,6 +47,11 @@ BINDIR-$(CONFIG_INSN16)	= $(PASCAL)/bin16
 BINDIR-$(CONFIG_INSN32)	= $(PASCAL)/bin32
 
 #
+# Tools
+#
+CFLAGS			+= -I.
+
+#
 # Objects and targets
 #
 PLINKSRCS		= plink.c plsym.c plreloc.c
diff --git a/misc/pascal/include/plink.h b/misc/pascal/plink/plink.h
index 350bce461..350bce461 100644
--- a/misc/pascal/include/plink.h
+++ b/misc/pascal/plink/plink.h
diff --git a/misc/pascal/include/plreloc.h b/misc/pascal/plink/plreloc.h
index 1998361b9..1998361b9 100644
--- a/misc/pascal/include/plreloc.h
+++ b/misc/pascal/plink/plreloc.h
diff --git a/misc/pascal/include/plsym.h b/misc/pascal/plink/plsym.h
index 96f520148..96f520148 100644
--- a/misc/pascal/include/plsym.h
+++ b/misc/pascal/plink/plsym.h