@@ -1,11 +1,62 @@
+CC = @CC@
+RC = @RC@
+OBJCOPY = @OBJCOPY@
+CFLAGS = @CFLAGS@ @SHOBJFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEFS@
+WISH_CFLAGS = @WISH_CFLAGS@
+LDFLAGS = @LDFLAGS@
+SHOBJLDFLAGS = @SHOBJLDFLAGS@
+LIBS = @LIBS@
+ARCHS = @ARCHS@
+STRIPLIBS = @STRIPLIBS@ @EXTRA_OBJS@
+EXTRA_OBJS = @EXTRA_OBJS@
+EXTRA_KIT_DEPS = @EXTRA_KIT_DEPS@
 TCLSH_NATIVE = tclsh
 
 # Build targets
 ## VFS Build
 vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
 vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
 	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c
 
-## Tclkit Build
+## Tcl scripts that need to be converted to C headers
 vfs_kitdll.tcl.h: vfs_kitdll.tcl
 	"$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h
+
+boot.tcl.h: boot.tcl
+	"$(TCLSH_NATIVE)" ./stringify.tcl boot.tcl > boot.tcl.h
+
+zipvfs.tcl.h: zipvfs.tcl
+	"$(TCLSH_NATIVE)" ./stringify.tcl zipvfs.tcl > zipvfs.tcl.h
+
+## Objects
+kitInit.o: kitInit.c boot.tcl.h $(EXTRA_KIT_DEPS)
+rechan.o: rechan.c
+pwb.o: pwb.c
+zlib.o: zlib.c
+
+### Windows resources
+kit.res.o: kit.rc kit.ico
+	$(RC) -o kit.res.o $(CPPFLAGS) kit.rc
+
+# Cleanup routines
+clean:
+	rm -f kit kit.res.o
+	rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
+	rm -f $(OBJS)
+	rm -f vfs_kitdll_data_tcl.c
+	rm -f vfs_kitdll.tcl.h
+	rm -f tclsh.o tclsh tclsh.exe
+	rm -f wish.o wish wish.exe
+
+distclean: clean
+	rm -f Makefile Makefile.in Makefile.common
+	rm -f config.status config.log
+	rm -f *~
+	rm -rf autom4te.cache
+	rm -rf starpack.vfs
+
+mrproper: distclean
+	rm -f configure config.h boot.tcl.h zipvfs.tcl.h
+
+.PHONY: all clean distclean mrproper