diff --git a/Makefile.in b/Makefile.in
index 03ded5ff3..481046bad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.145 2003/02/17 06:39:47 steve Exp $"
+#ident "$Id: Makefile.in,v 1.146 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -67,19 +67,17 @@ ifeq ('@HAVE_IPAL@','yes')
 TARGETS += tgt-pal
 endif
 
-all: ivl@EXEEXT@
+all: dep ivl@EXEEXT@
 	for dir in $(SUBDIRS) ; do (cd $$dir ; $(MAKE) all); done
-	cd vpi ; $(MAKE) all
-	cd ivlpp ; $(MAKE) all
-	cd driver ; $(MAKE) VERSION=$(VERSION) all
-	cd tgt-verilog ; $(MAKE) all
-	cd tgt-stub ; $(MAKE) all
 	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) all); done
+	for dir in vpi ivlpp tgt-verilog tgt-stub; \
+	    do (cd $$dir ; $(MAKE) all); done
+	cd driver ; $(MAKE) VERSION=$(VERSION) all
 
 # In the windows world, the installer will need a dosify program to
 # dosify text files.
 ifeq (@WIN32@,yes)
-all: dosify.exe
+all: dep dosify.exe
 dosify.exe: dosify.c
 	$(CC) -o dosify.exe dosify.c
 
@@ -88,7 +86,7 @@ SUBDIRS += driver-vpi
 endif
 
 else
-all: iverilog-vpi
+all: dep iverilog-vpi
 endif
 
 # This rule rules the compiler in the trivial hello.vl program to make
@@ -99,24 +97,20 @@ check: all
 	vvp/vvp -M- -M./vpi ./check.vvp | grep 'Hello, World'
 
 clean:
-	rm -f *.o parse.cc parse.cc.output parse.h dep/*.d lexor.cc lexor_keyword.cc ivl@EXEEXT@ libivl.a libvpi.a iverilog-vpi
-	cd vpi ; $(MAKE) clean
-	cd driver ; $(MAKE) clean
-	cd ivlpp ; $(MAKE) clean
-	cd tgt-verilog ; $(MAKE) clean
-	cd tgt-stub ; $(MAKE) clean
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) clean); done
 	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) clean); done
+	for dir in vpi ivlpp tgt-verilog tgt-stub driver; \
+	    do (cd $$dir ; $(MAKE) clean); done
+	rm -f *.o parse.cc parse.cc.output parse.h lexor.cc 
+	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc*
+	rm -rf dep ivl@EXEEXT@
 
 distclean: clean
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) distclean); done
 	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) distclean); done
-	rm -f vpi/Makefile
-	rm -f ivlpp/Makefile
-	rm -f driver/Makefile
-	rm -f config.status config.cache config.log
-	rm -f Makefile
-	rm -f tgt-pal/Makefile tgt-stub/Makefile tgt-verilog/Makefile
+	for dir in vpi ivlpp tgt-verilog tgt-stub driver; \
+	    do (cd $$dir ; $(MAKE) distclean); done
+	rm -f Makefile config.status config.log config.cache config.h
 
 TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-xnf.o
 FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o xnfio.o
@@ -166,8 +160,10 @@ iverilog-vpi: iverilog-vpi.sh
 	chmod +x $@
 endif
 
+dep:
+	mkdir dep
+
 %.o: %.cc
-	@[ -d dep ] || mkdir dep
 	$(CXX) @ident_support@ $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep/$*.d
 
@@ -176,8 +172,10 @@ lexor.o: lexor.cc parse.h
 
 parse.o: parse.cc
 
-parse.h parse.cc: $(srcdir)/parse.y
+parse.cc: $(srcdir)/parse.y
 	$(YACC) --verbose -t -p VL -d -o parse.cc $(srcdir)/parse.y
+
+parse.h: parse.cc
 	mv parse.cc.h parse.h || mv parse.hh parse.h
 
 syn-rules.cc: $(srcdir)/syn-rules.y
@@ -200,7 +198,7 @@ iverilog-vpi.pdf: iverilog-vpi.ps
 ifeq (@WIN32@,yes)
 INSTALL_DOC = $(prefix)/iverilog-vpi.pdf
 INSTALL_DOCDIR =
-all: iverilog-vpi.pdf
+all: dep iverilog-vpi.pdf
 else
 INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1
 INSTALL_DOCDIR = $(mandir)/man1
diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index 1b7c7dd90..a8c88ed74 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.3 2003/02/24 22:35:56 steve Exp $"
+#ident "$Id: Makefile.in,v 1.4 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -46,13 +46,15 @@ CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 STRIP = @STRIP@
 
-all: cadpli.vpl
+all: dep cadpli.vpl
 
 # No specific check operations.
 check: all
 
+dep:
+	mkdir dep
+
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $<
 	mv $*.d dep
 
@@ -67,7 +69,10 @@ cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.a
 	$(CC) @shared@ -o $@ $O $(SYSTEM_VPI_LDFLAGS)
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o dep cadpli.vpl
+
+distclean: clean
+	rm -f Makefile config.status config.log config.cache
 
 install: all installdirs $(libdir)/ivl/cadpli.vpl
 
diff --git a/driver/Makefile.in b/driver/Makefile.in
index dabd02fcc..1baf43ad3 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.16 2002/12/08 03:06:30 steve Exp $"
+#ident "$Id: Makefile.in,v 1.17 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -52,6 +52,10 @@ all: iverilog@EXEEXT@
 clean:
 	rm -f *.o lexor.c parse.c parse.h parse.output
 	rm -f cflexor.c cfparse.c cfparse.h cfparse.output
+	rm -f iverilog@EXEEXT@
+
+distclean: clean
+	rm -f Makefile
 
 O = main.o build_string.o lexor.o parse.o substit.o cflexor.o cfparse.o
 
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index da096ac41..822394a06 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.12 2001/08/10 00:39:22 steve Exp $"
+#ident "$Id: Makefile.in,v 1.13 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -47,7 +47,10 @@ LDFLAGS = @LDFLAGS@
 all: ivlpp
 
 clean:
-	rm -f *.o lexor.c parse.c parse.h parse.output
+	rm -f *.o lexor.c parse.c parse.h parse.output ivlpp
+
+distclean: clean
+	rm -f Makefile
 
 O = main.o lexor.o parse.o
 
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index 326f1e96a..1305fbe5a 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.17 2003/02/22 04:39:32 steve Exp $"
+#ident "$Id: Makefile.in,v 1.18 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -54,7 +54,7 @@ O = asynch.o finish.o getcstringp.o getinstance.o getlongp.o \
 getp.o getsimtime.o io_print.o mc_scan_plusargs.o nump.o putlongp.o \
 putp.o typep.o workarea.o veriusertfs.o priv.o $A
 
-all: libveriuser.a
+all: dep libveriuser.a
 
 check: all
 
@@ -66,14 +66,16 @@ libveriuser.a: $O
 	ar cvq $@ $O
 	$(RANLIB) $@
 
+dep:
+	mkdir dep
+
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 
 clean:
-	rm -f *.o dep/*.d libveriuser.a
+	rm -rf *.o dep libveriuser.a
 
 distclean: clean
 	rm -f Makefile config.status config.log config.cache
diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in
index d2fd48b8d..91c74b4e4 100644
--- a/tgt-fpga/Makefile.in
+++ b/tgt-fpga/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.6 2002/11/05 02:14:41 steve Exp $"
+#ident "$Id: Makefile.in,v 1.7 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -43,10 +43,12 @@ CXXFLAGS = @CXXFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: fpga.tgt
+all: dep fpga.tgt
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall @ident_support@ -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -69,10 +71,10 @@ Makefile: Makefile.in config.status
 	./config.status
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o dep fpga.tgt
 
 distclean: clean
-	rm -f Makefile config.status config.log config.cache fpga.tgt
+	rm -f Makefile config.status config.log config.cache
 
 check: all
 
diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in
index f1837739b..8c570ba71 100644
--- a/tgt-null/Makefile.in
+++ b/tgt-null/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.7 2002/11/05 02:14:41 steve Exp $"
+#ident "$Id: Makefile.in,v 1.8 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -44,10 +44,12 @@ CXXFLAGS = @CXXFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: null.tgt
+all: dep null.tgt
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -66,7 +68,7 @@ null.tgt: $O $(TGTDEPLIBS)
 	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
 
 clean:
-	rm -f *.o dep/*.d null.tgt
+	rm -rf *.o dep null.tgt
 
 distclean: clean
 	rm -f Makefile config.status config.log config.cache
diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in
index 4099fc37b..8012189ff 100644
--- a/tgt-pal/Makefile.in
+++ b/tgt-pal/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.9 2002/11/05 02:14:41 steve Exp $"
+#ident "$Id: Makefile.in,v 1.10 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -44,10 +44,12 @@ CXXFLAGS = @CXXFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: pal.tgt
+all: dep pal.tgt
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -66,7 +68,10 @@ pal.tgt: $O $(TGTDEPLIBS)
 	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(LDFLAGS) -lipal
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o dep pal.tgt
+
+distclean: clean
+	rm -f Makefile
 
 install: all installdirs $(libdir)/ivl/pal.tgt
 
diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in
index 34009a658..a376a03d1 100644
--- a/tgt-stub/Makefile.in
+++ b/tgt-stub/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.10 2002/11/05 02:14:41 steve Exp $"
+#ident "$Id: Makefile.in,v 1.11 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -44,10 +44,12 @@ CXXFLAGS = @CXXFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: stub.tgt
+all: dep stub.tgt
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS)  -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -66,7 +68,10 @@ stub.tgt: $O $(TGTDEPLIBS)
 	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o dep stub.tgt
+
+distclean: clean
+	rm -f Makefile
 
 install: all installdirs $(libdir)/ivl/stub.tgt \
 	$(includedir)/vpi_user.h
diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in
index 35836e82b..43b18ac3a 100644
--- a/tgt-verilog/Makefile.in
+++ b/tgt-verilog/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.9 2002/11/05 02:14:41 steve Exp $"
+#ident "$Id: Makefile.in,v 1.10 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -44,10 +44,12 @@ CXXFLAGS = @CXXFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: verilog.tgt
+all: dep verilog.tgt
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -65,7 +67,10 @@ verilog.tgt: $O $(TGTDEPLIBS)
 	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o dep verilog.tgt
+
+distclean: clean
+	rm -f Makefile
 
 install: all installdirs $(libdir)/ivl/verilog.tgt \
 	$(includedir)/vpi_user.h
diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in
index ecb8177fa..d0630eb65 100644
--- a/tgt-vvp/Makefile.in
+++ b/tgt-vvp/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.13 2003/01/26 21:15:59 steve Exp $"
+#ident "$Id: Makefile.in,v 1.14 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -43,10 +43,12 @@ CXXFLAGS = @CXXFLAGS@
 CFLAGS  = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: vvp.tgt
+all: dep vvp.tgt
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall @ident_support@ -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -68,10 +70,10 @@ Makefile: Makefile.in config.status
 	./config.status
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o dep vvp.tgt
 
 distclean: clean
-	rm -f Makefile config.status config.log config.cache vvp.tgt
+	rm -f Makefile config.status config.log config.cache
 
 check: all
 
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index da951a8d6..897d49968 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.35 2003/02/20 00:50:06 steve Exp $"
+#ident "$Id: Makefile.in,v 1.36 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -48,10 +48,12 @@ CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 STRIP = @STRIP@
 
-all: system.vpi
+all: dep system.vpi
+
+dep:
+	mkdir dep
 
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
@@ -73,7 +75,10 @@ sys_readmem_lex.c: sys_readmem_lex.lex
 	flex -t -Preadmem $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c
 
 clean:
-	rm -f *.o dep/*.d
+	rm -rf *.o sys_readmem_lex.c dep system.vpi
+
+distclean: clean
+	rm -f Makefile
 
 install: all installdirs $(libdir)/ivl/system.vpi
 
diff --git a/vpip/Makefile.in b/vpip/Makefile.in
index 1919519af..a61e71ff2 100644
--- a/vpip/Makefile.in
+++ b/vpip/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.6 2001/06/12 03:53:10 steve Exp $"
+#ident "$Id: Makefile.in,v 1.7 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -53,7 +53,7 @@ vpi_mcd.o vpi_vlog_info.o
 
 
 
-all: libvpip.a
+all: dep libvpip.a
 
 check: all
 
@@ -69,14 +69,16 @@ libvvm.a: $O
 	rm -f $@
 	ar cvq $@ $O
 
+dep:
+	mkdir dep
+
 %.o: %.c
-	@[ -d dep ] || mkdir dep
 	$(CC) -Wall $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 
 clean:
-	rm -f *.o dep/*.d libvpip.a
+	rm -rf *.o dep libvpip.a
 
 distclean: clean
 	rm -f Makefile config.status config.log config.cache
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index bad4eb7bb..139e37d4a 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.44 2003/02/22 04:39:32 steve Exp $"
+#ident "$Id: Makefile.in,v 1.45 2003/02/27 22:13:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -51,13 +51,14 @@ LIBS = @LIBS@ @EXTRALIBS@
 dllib=@DLLIB@
 rdynamic=@rdynamic@
 
-all: vvp@EXEEXT@ libvpi.a
+all: dep vvp@EXEEXT@ libvpi.a
 
 clean:
-	rm -rf vvp@EXEEXT@ *.o *~ parse.cc parse.cc.output parse.h lexor.cc dep
+	rm -f *.o *~ parse.cc parse.cc.output parse.h lexor.cc tables.cc
+	rm -rf dep vvp@EXEEXT@ libvpi.a libvpi.a
 
 distclean: clean
-	rm -f config.h Makefile config.cache config.log config.status
+	rm -f Makefile config.status config.log config.cache config.h
 
 check: all
 	./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.'
@@ -93,8 +94,10 @@ vvp: $O
 	$(CXX) $(rdynamic) $(CXXFLAGS) $(LDFLAGS) -o vvp $O $(LIBS) $(dllib)
 endif
 
+dep:
+	mkdir dep
+
 %.o: %.cc
-	@[ -d dep ] || mkdir dep
 	$(CXX) @ident_support@ $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep/$*.d
 
@@ -109,8 +112,10 @@ parse.o: parse.cc
 
 tables.o: tables.cc
 
-parse.h parse.cc: $(srcdir)/parse.y
+parse.cc: $(srcdir)/parse.y
 	$(YACC) --verbose -t -d -o parse.cc $(srcdir)/parse.y
+
+parse.h: parse.cc
 	mv parse.cc.h parse.h || mv parse.hh parse.h
 
 lexor.cc: $(srcdir)/lexor.lex