- now forcing zlib configuration before compiling files that depend on

the zlib header files, since zlib's configure script can modify the
  header files.  removed ZlibInclude variable, which no longer serves
  a purpose.
    c/Mf-*, c/Makefile.*nt
- removed unnecessary datestamp.c target
    c/Mf.*nt

original commit: d081c5b19a185597443f47101caa35b8c12084c7

LOG

@@ -200,3 +200,10 @@
     release_notes.stex
 - fixed spelling of non-existent
     s/syntax.ss
+- now forcing zlib configuration before compiling files that depend on
+  the zlib header files, since zlib's configure script can modify the
+  header files.  removed ZlibInclude variable, which no longer serves
+  a purpose.
+    c/Mf-*, c/Makefile.*nt
+- removed unnecessary datestamp.c target
+    c/Mf.*nt

c/Makefile.a6nt

@@ -17,7 +17,6 @@ m = a6nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:X64 /release /nologo
@@ -38,7 +37,7 @@ DLLLDFLAGS=/machine:X64 /release /nologo
 EXELDFLAGS=/machine:X64 /incremental:no /release /nologo /STACK:0x1000000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 # MDCFLAGS=$(CFLAGS) /Zi /MDd
 # MTCFLAGS=$(CFLAGS) /Zi /MTd
 # DLLLDFLAGS=/machine:X64 /debug /nologo /nodefaultlib:msvcrt
@@ -68,7 +67,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -125,7 +124,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib

c/Makefile.i3nt

@@ -17,7 +17,6 @@ m = i3nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:ix86 /release /nologo
@@ -37,7 +36,7 @@ DLLLDFLAGS=/machine:ix86 /release /nologo
 EXELDFLAGS=/machine:ix86 /incremental:no /release /nologo /STACK:0x800000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
+# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
 # LDFLAGS=/machine:ix86 /incremental:no /release /nologo /debug
 
 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
@@ -64,7 +63,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -121,7 +120,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib

c/Makefile.ta6nt

@@ -17,7 +17,6 @@ m = ta6nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:X64 /release /nologo
@@ -38,7 +37,7 @@ DLLLDFLAGS=/machine:X64 /release /nologo
 EXELDFLAGS=/machine:X64 /incremental:no /release /nologo /STACK:0x1000000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+# CFLAGS=/nologo /Od /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DX86_64 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 # MDCFLAGS=$(CFLAGS) /Zi /MDd
 # MTCFLAGS=$(CFLAGS) /Zi /MTd
 # DLLLDFLAGS=/machine:X64 /debug /nologo /nodefaultlib:msvcrt
@@ -68,7 +67,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -125,7 +124,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib

c/Makefile.ti3nt

@@ -17,7 +17,6 @@ m = ti3nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-ZlibInclude = ..\zlib
 KernelDll = ..\bin\$m\csv941.dll
 KernelLib = ..\bin\$m\csv941.lib
 MTKernelLib = ..\boot\$m\csv941mt.lib
@@ -29,7 +28,7 @@ MDMain = ..\boot\$m\mainmd.obj
 ResFile = ..\boot\$m\scheme.res
 
 # We use MD so that we can link with and load DLLs built against msvcrxxx.dll
-CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
+CFLAGS=/nologo /fp:precise /Ox /W3 /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DWIN32 /D_CRT_SECURE_NO_WARNINGS
 MDCFLAGS=$(CFLAGS) /MD
 MTCFLAGS=$(CFLAGS) /MT
 DLLLDFLAGS=/machine:ix86 /release /nologo
@@ -37,7 +36,7 @@ DLLLDFLAGS=/machine:ix86 /release /nologo
 EXELDFLAGS=/machine:ix86 /incremental:no /release /nologo /STACK:0x800000
 
 # use following flags for debugging
-# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I$(ZlibInclude) /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
+# CFLAGS=/nologo /Od /W3 /MDd /I$(SchemeInclude) /I..\zlib /DUSE_ANSI_PROTOTYPES /DI386 /DNO_UNISTD_H
 # LDFLAGS=/machine:ix86 /incremental:no /release /nologo /debug
 
 SystemLib=rpcrt4.lib ole32.lib advapi32.lib User32.lib
@@ -64,7 +63,7 @@ all: $(Exec) $(MTKernelLib) $(MDKernelLib) $(MTMain)
 
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(hsrc)
 $(KernelLib) $(MTKernelLib) $(MDKernelLib): $(SchemeInclude)/equates.h $(SchemeInclude)/scheme.h
-$(KernelLib) $(MTKernelLib) $(MDKernelLib): $(ZlibInclude)/zconf.h $(ZlibInclude)/zlib.h
+$(KernelLib) $(MTKernelLib) $(MDKernelLib): ..\zlib/zconf.h ..\zlib/zlib.h
 
 $(MTKernelLib): $(csrc) $(MTZlibLib)
 	-del /f $(MTKernelLib)
@@ -121,7 +120,7 @@ mdscheme.exe: $(ResFile) $(MDMain) $(MDKernelLib)
 	-del /f mdscheme.exe
 	link /out:mdscheme.exe $(EXELDFLAGS) $(ResFile) $(MDMain) $(MDKernelLib) $(SystemLib)
 
-$(ZlibInclude)\zlib.h $(ZlibInclude)\zconf.h $(MDZlibLib) $(MTZlibLib):
+..\zlib\zlib.h ..\zlib\zconf.h $(MDZlibLib) $(MTZlibLib):
 	cd ../zlib
 	nmake /nologo -f win32/Makefile.msc AR="link /lib" CFLAGS="-nologo -MT -O2 $(LOC)"
 	ren zlib.lib zlibmt.lib

c/Mf-a6fb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-a6le

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-a6nb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-a6nt

@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@

c/Mf-a6ob

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-a6osx

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-a6s2

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-arm32le

@@ -26,7 +26,7 @@ mdobj = arm32le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; ./configure)
-	(cd ../zlib; make)

c/Mf-base

@@ -16,7 +16,6 @@
 include Mf-config
 
 Include=../boot/$m
-ZlibInclude=../zlib
 PetiteBoot=../boot/$m/petite.boot
 SchemeBoot=../boot/$m/scheme.boot
 Kernel=../boot/$m/kernel.$o
@@ -55,9 +54,14 @@ scheme.o main.o: config.h
 ${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h
 ${kernelobj}: ${Include}/equates.h ${Include}/scheme.h
 ${mainobj}: ${Include}/scheme.h
-scheme.o io.o new-io.o: ${ZlibInclude}/zconf.h ${ZlibInclude}/zlib.h
+${kernelobj}: ../zlib/zconf.h ../zlib/zlib.h
 gc-ocd.o gc-oce.o: gc.c
 
+../zlib/zlib.h ../zlib/zconf.h: ../zlib/configure.log
+
+../zlib/libz.a: ../zlib/configure.log
+	(cd ../zlib; ${MAKE})
+
 clean:
 	rm -f *.$o ${mdclean}
 	rm -f Make.out

c/Mf-i3fb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-i3le

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-i3nb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-i3nt

@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@

c/Mf-i3ob

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-i3osx

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-i3qnx

@@ -27,7 +27,7 @@ LocalInclude = /usr/local/include
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} -I${LocalInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib -I${LocalInclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-i3s2

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ppc32le

@@ -26,7 +26,7 @@ mdobj = ppc32.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ta6fb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-ta6le

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-ta6nb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-ta6nt

@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@

c/Mf-ta6ob

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-ta6osx

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-ta6s2

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m64 ./configure --64)
-	(cd ../zlib; make)

c/Mf-ti3fb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ti3le

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ti3nb

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ti3nt

@@ -28,9 +28,6 @@ ${Scheme}: make.bat
 	./make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-# currently creating datestamp at 'make source' time
-datestamp.c:
-
 vs.bat:
 	echo '@echo off' > $@
 	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@

c/Mf-ti3ob

@@ -27,7 +27,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} ${mdinclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib ${mdinclude} $*.c
 
 include Mf-base
 
@@ -37,6 +37,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ti3osx

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-ti3s2

@@ -26,7 +26,7 @@ mdobj = i3le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -DSOLARIS -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)

c/Mf-tppc32le

@@ -26,7 +26,7 @@ mdobj = ppc32le.o
 .SUFFIXES: .c .o
 
 .c.o:
-	$C -c -D${Cpu} -I${Include} -I${ZlibInclude} $*.c
+	$C -c -D${Cpu} -I${Include} -I../zlib $*.c
 
 include Mf-base
 
@@ -36,6 +36,5 @@ ${Kernel}: ${kernelobj} ../zlib/libz.a
 ${Scheme}: ${Kernel} ${Main}
 	$C -rdynamic -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 
-${ZlibInclude}/zlib.h ${ZlibInclude}/zconf.h ../zlib/libz.a:
+../zlib/configure.log:
 	(cd ../zlib; CFLAGS=-m32 ./configure)
-	(cd ../zlib; make)