-# Build file lists from wildcards.
-PFITEMP = ${wildcard ${CSRCDIR}/*.h}
-PFINCLUDES = ${PFITEMP:${CSRCDIR}/pfdicdat.h=}
-PFSOURCE = ${wildcard ${CSRCDIR}/*.c} ${CSRCDIR}/posix/pf_io_posix.c
-PFTEMP = ${PFSOURCE:%.c=%.o}
-PFOBJS = ${PFTEMP:${CSRCDIR}/%=${TEMPOBJECTDIR}/%}
-PFEMBOBJS = ${PFTEMP:${CSRCDIR}/%=${OBJECTDIR}/%}
-
-COMPILE = $(COMPILER) $(CCOPTS) $(CDEFS)
-
-${TEMPOBJECTDIR}/%.o: ${TEMPOBJECTDIR}/posix $(PFINCLUDES) ${CSRCDIR}/%.c
- $(COMPILE) -O -o ${TEMPOBJECTDIR}/$*.o -c ${CSRCDIR}/$*.c
-
-${OBJECTDIR}/%.o: ${OBJECTDIR}/posix $(PFINCLUDES) ${CSRCDIR}/%.c ${CSRCDIR}/pfdicdat.h
- $(COMPILE) -O -o ${OBJECTDIR}/$*.o -c ${CSRCDIR}/$*.c $(EMBCCOPTS)
+PFINCLUDES = pf_all.h pf_cglue.h pf_clib.h pf_core.h pf_float.h \
+ pf_guts.h pf_host.h pf_inc1.h pf_io.h pf_mem.h pf_save.h \
+ pf_text.h pf_types.h pf_win32.h pf_words.h pfcompfp.h \
+ pfcompil.h pfdicdat_arm.h pfinnrfp.h pforth.h
+PFBASESOURCE = pf_cglue.c pf_clib.c pf_core.c pf_inner.c \
+ pf_io.c pf_io_none.c pf_main.c pf_mem.c pf_save.c \
+ pf_text.c pf_words.c pfcompil.c pfcustom.c
+PFSOURCE = $(PFBASESOURCE) $(IO_SOURCE)
+
+VPATH = .:$(CSRCDIR):$(CSRCDIR)/posix:$(CSRCDIR)/stdio:$(CSRCDIR)/win32_console:$(CSRCDIR)/win32
+
+XCFLAGS = $(CCOPTS)
+XCPPFLAGS = -DPF_SUPPORT_FP -D_GNU_SOURCE
+XLDFLAGS = $(WIDTHOPT)
+
+CPPFLAGS = -I. $(XCPPFLAGS)
+CFLAGS = $(XCFLAGS)
+LDFLAGS = $(XLDFLAGS)
+
+COMPILE = $(CC) $(CFLAGS) $(CPPFLAGS)
+LINK = $(CC) $(LDFLAGS)
+
+.SUFFIXES: .c .o .eo
+
+PFOBJS = $(PFSOURCE:.c=.o)
+PFEMBOBJS = $(PFSOURCE:.c=.eo)
+
+.c.o: $(PFINCLUDES)
+ $(COMPILE) -c -o $@ $<
+
+.c.eo: $(PFINCLUDES) pfdicdat.h
+ $(COMPILE) $(EMBCCOPTS) -c -o $@ $<
+
+.PHONY: all clean test
+.PHONY: help pffiles pfdicapp pfdicdat pforthapp