From eaf5d424d797e47f041bb75dbc0220d9ef9f5f6b Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 1 Feb 2008 20:44:51 +0000
Subject: NuttX installation fixes

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@605 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/pascal/ChangeLog        |  8 ++++++--
 misc/pascal/libpas/Make.defs | 14 ++------------
 misc/pascal/nuttx/Makefile   | 12 ++++++------
 3 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'misc')

diff --git a/misc/pascal/ChangeLog b/misc/pascal/ChangeLog
index 5b895fa1e..5b7e5916b 100644
--- a/misc/pascal/ChangeLog
+++ b/misc/pascal/ChangeLog
@@ -1,3 +1,7 @@
-P0.1.0 2008-01-07  Gregory Nutt <spudmonkey@racsa.co.cr>
+pascal-0.1.0 2008-01-07 Gregory Nutt <spudmonkey@racsa.co.cr>
 
-  * Initial release
+	* Initial release
+
+pascal-0.1.1 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
+
+	* Correct some errors in the NuttX installation logic
\ No newline at end of file
diff --git a/misc/pascal/libpas/Make.defs b/misc/pascal/libpas/Make.defs
index 8ffcd4d62..9dca4a720 100644
--- a/misc/pascal/libpas/Make.defs
+++ b/misc/pascal/libpas/Make.defs
@@ -34,15 +34,5 @@
 #
 ############################################################################
 
-POFF_ASRCS		= 
-POFF_CSRCS		= pfhandle.c pfproghandle.c pftprog.c \
-			  pfsymhandle.c pftsymbol.c pofferr.c \
-			  pfwhdr.c pfwrodata.c pfwsymbol.c pfwfname.c \
-			  pfwprog.c pfwlineno.c pfwdbgfunc.c pfwreloc.c pfwstring.c \
-			  pfwrite.c pfrhdr.c pfrsymbol.c pfrfname.c \
-			  pfrprog.c pfrlineno.c pfrdbgfunc.c pfrrawlineno.c \
-			  pfrrawreloc.c pfrstring.c pfread.c pfrseek.c \
-			  pfrelease.c pfdbgcontainer.c pfdbgdiscard.c \
-			  pfxprog.c pfxrodata.c pfiprog.c pfirodata.c \
-			  pfdhdr.c pfdsymbol.c pfdreloc.c pflabel.c \
-			  pflineno.c pfdbginfo.c
+PAS_ASRCS		= 
+PAS_CSRCS		= psignextend16.c
diff --git a/misc/pascal/nuttx/Makefile b/misc/pascal/nuttx/Makefile
index 1e6691f00..f04055db3 100644
--- a/misc/pascal/nuttx/Makefile
+++ b/misc/pascal/nuttx/Makefile
@@ -52,20 +52,19 @@ OBJS		= $(AOBJS) $(COBJS)
 
 BIN		= libpcode$(LIBEXT)
 
-VPATH		= insn/prun:libpoff
+VPATH		= insn/prun:libpoff:libpas
 
 all:	$(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) -D__ASSEMBLY__ $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(BIN):	$(OBJS)
 	( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)
@@ -76,7 +75,8 @@ $(BIN):	$(OBJS)
 depend: .depend
 
 clean:
-	rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(BIN) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
-- 
cgit v1.2.3