@@ -3,10 +3,11 @@
 CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1
 LDFLAGS = @LDFLAGS@
 SHOBJLDFLAGS = @SHOBJLDFLAGS@
 LIBS = @LIBS@
 STATICLIBS = @TCL_LIB_SPEC@ ../../../tclvfs/inst/lib/vfs1.3/libvfs1.3.a
+OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
 
 # Default target
 all: libtcl.@SHOBJEXT@
 
 # Build targets
@@ -23,26 +24,27 @@
 ## Extensions
 rechan.o: rechan.c
 pwb.o: pwb.c
 
 ## DLL Build
-libtcl.@SHOBJEXT@: vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtcl.so vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
+libtcl.@SHOBJEXT@: $(OBJS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtcl.so $(OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
 
 # Test driver
 tclsh.o: tclsh.c
 tclsh: tclsh.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o -L. -ltcl -Wl,-R,`pwd`
 
 # Cleanup routeines
 clean:
 	rm -f libtcl.so
-	rm -f rechan.o kitInit.o
-	rm -f vfs_kitdll_data_tcl.c vfs_kitdll_data_tcl.o
+	rm -f $(OBJS)
+	rm -f vfs_kitdll_data_tcl.c
 	rm -f vfs_kitdll.tcl.h
 	rm -f tclsh.o tclsh
 
 distclean: clean
 	rm -f config.status config.log
+	rm -f *~
 	rm -f Makefile
 
 .PHONY: all clean distclean