summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2008-02-01 20:44:51 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2008-02-01 20:44:51 +0000
commit9b167eeeb8f5c76586e9353a137ee268869648b0 (patch)
treeaeaa6134b5f3889c16d2873cbe22fd1385488032
parentc7b718fad0805f52c6f476c5dd1a886b2c4c0fe4 (diff)
NuttX installation fixes
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@605 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r--misc/pascal/ChangeLog8
-rw-r--r--misc/pascal/libpas/Make.defs14
-rw-r--r--misc/pascal/nuttx/Makefile12
3 files changed, 14 insertions, 20 deletions
diff --git a/misc/pascal/ChangeLog b/misc/pascal/ChangeLog
index 5b895fa1eb..5b7e5916b0 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 8ffcd4d622..9dca4a720f 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 1e6691f009..f04055db3c 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