Fixed POSIX IO, (ACCEPT) now emits SPACE at end of line.

[pforth] / build / unix / Makefile

diff --git a/build/unix/Makefile b/build/unix/Makefile
index a842005..2408291 100644 (file)
--- a/build/unix/Makefile
+++ b/build/unix/Makefile
@@ -8,17 +8,16 @@
 # Options include: PF_SUPPORT_FP PF_NO_MALLOC PF_NO_INIT PF_DEBUG
 # See "docs/pf_ref.htm" file for more info.
 
 # Options include: PF_SUPPORT_FP PF_NO_MALLOC PF_NO_INIT PF_DEBUG
 # See "docs/pf_ref.htm" file for more info.
 

-# Note for Mac OS X, use cc instead of gcc

 COMPILER = gcc
 
 COMPILER = gcc
 

-PFORTHDIR   := $(shell cd ../; pwd)
+PFORTHDIR   := $(shell cd ../../; pwd)

 CSRCDIR      = $(PFORTHDIR)/csrc
 FTHDIR       = $(PFORTHDIR)/fth
 
 PFDICAPP     = $(FTHDIR)/pforth
 PFORTHDIC    = $(FTHDIR)/pforth.dic
 PFDICDAT     = ${CSRCDIR}/pfdicdat.h
 CSRCDIR      = $(PFORTHDIR)/csrc
 FTHDIR       = $(PFORTHDIR)/fth
 
 PFDICAPP     = $(FTHDIR)/pforth
 PFORTHDIC    = $(FTHDIR)/pforth.dic
 PFDICDAT     = ${CSRCDIR}/pfdicdat.h

-PFORTHAPP    = $(PFORTHDIR)/pforth
+PFORTHAPP    = $(PFORTHDIR)/pforth_standalone

 OBJECTDIR    = $(PFORTHDIR)/objects
 TEMPOBJECTDIR = $(PFORTHDIR)/tempobjects
 
 OBJECTDIR    = $(PFORTHDIR)/objects
 TEMPOBJECTDIR = $(PFORTHDIR)/tempobjects
 


@@ -35,7 +34,10 @@ FULL_WARNINGS =  \
         -Wmissing-prototypes \
         -Wmissing-declarations
         
         -Wmissing-prototypes \
         -Wmissing-declarations
         

-CCOPTS = -DPF_SUPPORT_FP -DPF_POSIX_IO -O2 $(FULL_WARNINGS) $(EXTRA_CCOPTS)
+CCOPTS = -DPF_SUPPORT_FP -O2 $(FULL_WARNINGS) $(EXTRA_CCOPTS)
+
+IO_SOURCE = ${CSRCDIR}/posix/pf_io_posix.c
+#IO_SOURCE = ${CSRCDIR}/stdio/pf_io_stdio.c

 
 EMBCCOPTS = -DPF_STATIC_DIC
 
 
 EMBCCOPTS = -DPF_STATIC_DIC
 


@@ -43,17 +45,17 @@ EMBCCOPTS = -DPF_STATIC_DIC
 # Build file lists from wildcards.
 PFITEMP    = ${wildcard ${CSRCDIR}/*.h}
 PFINCLUDES = ${PFITEMP:${CSRCDIR}/pfdicdat.h=}
 # Build file lists from wildcards.
 PFITEMP    = ${wildcard ${CSRCDIR}/*.h}
 PFINCLUDES = ${PFITEMP:${CSRCDIR}/pfdicdat.h=}

-PFSOURCE   = ${wildcard ${CSRCDIR}/*.c}
+PFSOURCE   = ${wildcard ${CSRCDIR}/*.c} ${IO_SOURCE}

 PFTEMP     = ${PFSOURCE:%.c=%.o}
 PFOBJS     = ${PFTEMP:${CSRCDIR}/%=${TEMPOBJECTDIR}/%}
 PFEMBOBJS  = ${PFTEMP:${CSRCDIR}/%=${OBJECTDIR}/%}
 
 COMPILE = $(COMPILER) $(CCOPTS) $(CDEFS)
 PFTEMP     = ${PFSOURCE:%.c=%.o}
 PFOBJS     = ${PFTEMP:${CSRCDIR}/%=${TEMPOBJECTDIR}/%}
 PFEMBOBJS  = ${PFTEMP:${CSRCDIR}/%=${OBJECTDIR}/%}
 
 COMPILE = $(COMPILER) $(CCOPTS) $(CDEFS)

-
-${TEMPOBJECTDIR}/%.o:  $(PFINCLUDES)  ${CSRCDIR}/%.c
+       
+${TEMPOBJECTDIR}/%.o:  ${TEMPOBJECTDIR} $(PFINCLUDES)  ${CSRCDIR}/%.c

        $(COMPILE) -O -o ${TEMPOBJECTDIR}/$*.o -c ${CSRCDIR}/$*.c
        
        $(COMPILE) -O -o ${TEMPOBJECTDIR}/$*.o -c ${CSRCDIR}/$*.c
        

-${OBJECTDIR}/%.o:  $(PFINCLUDES) ${CSRCDIR}/%.c ${CSRCDIR}/pfdicdat.h 
+${OBJECTDIR}/%.o:  ${OBJECTDIR} $(PFINCLUDES) ${CSRCDIR}/%.c ${CSRCDIR}/pfdicdat.h 

        $(COMPILE) -O -o ${OBJECTDIR}/$*.o -c ${CSRCDIR}/$*.c $(EMBCCOPTS)
 
 all: $(PFORTHAPP)
        $(COMPILE) -O -o ${OBJECTDIR}/$*.o -c ${CSRCDIR}/$*.c $(EMBCCOPTS)
 
 all: $(PFORTHAPP)


@@ -70,6 +72,14 @@ pffiles:
        @echo "EMBEDDED OBJECT FILES ------------------"
        @echo ${PFEMBOBJS}
        
        @echo "EMBEDDED OBJECT FILES ------------------"
        @echo ${PFEMBOBJS}
        

+${TEMPOBJECTDIR}: 
+       mkdir -p ${TEMPOBJECTDIR}/posix
+       mkdir -p ${TEMPOBJECTDIR}/stdio
+
+${OBJECTDIR}: 
+       mkdir -p ${OBJECTDIR}/posix
+       mkdir -p ${OBJECTDIR}/stdio
+

 # build pforth by compiling 'C' source
 $(PFDICAPP): $(PFINCLUDES) $(PFOBJS)
        $(COMPILER) $(PFOBJS) -lm -o $(PFDICAPP)
 # build pforth by compiling 'C' source
 $(PFDICAPP): $(PFINCLUDES) $(PFOBJS)
        $(COMPILER) $(PFOBJS) -lm -o $(PFDICAPP)


@@ -80,8 +90,10 @@ pfdicapp: $(PFDICAPP)
 $(PFDICDAT): $(PFDICAPP)
        cd $(FTHDIR); $(PFDICAPP) -i system.fth ; mv pfdicdat.h $(PFDICDAT)
 
 $(PFDICDAT): $(PFDICAPP)
        cd $(FTHDIR); $(PFDICAPP) -i system.fth ; mv pfdicdat.h $(PFDICDAT)
 

-$(PFORTHAPP): $(PFDICDAT) $(PFINCLUDES) $(PFEMBOBJS)
+$(PFORTHAPP): ${TEMPOBJECTDIR} $(PFDICDAT) $(PFINCLUDES) $(PFEMBOBJS)

        $(COMPILER) $(PFEMBOBJS) -lm -o $(PFORTHAPP)
        $(COMPILER) $(PFEMBOBJS) -lm -o $(PFORTHAPP)

+       @echo ""
+       @echo "Standalone pForth executable written to $(PFORTHAPP)"

        
 clean:
        -rm -f $(PFOBJS) $(PFEMBOBJS)
        
 clean:
        -rm -f $(PFOBJS) $(PFEMBOBJS)