diff --git a/.cvsignore b/.cvsignore
index c8c0aa289..6546e2c52 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -17,6 +17,7 @@ configure
 Makefile
 check
 check.cc
+check.vvp
 config.status
 config.log
 config.cache
diff --git a/Makefile.in b/Makefile.in
index 336fd47fb..3fd3bf910 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.179 2006/10/30 22:45:36 steve Exp $"
+#ident "$Id: Makefile.in,v 1.180 2007/02/06 05:07:31 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -43,7 +43,6 @@ mandir = @mandir@
 libdir64 = @libdir64@
 
 dllib=@DLLIB@
-strip_dynamic=@strip_dynamic@
 
 CC = @CC@
 CXX = @CXX@
@@ -51,7 +50,6 @@ INSTALL = @INSTALL@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-STRIP = @STRIP@
 LEX = @LEX@
 YACC = @YACC@
 
@@ -68,7 +66,7 @@ all: dep ivl@EXEEXT@
 
 # In the windows world, the installer will need a dosify program to
 # dosify text files.
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
 all: dep dosify.exe
 dosify.exe: dosify.c
 	$(CC) -o dosify.exe dosify.c
@@ -88,9 +86,9 @@ clean:
 	    do (cd $$dir ; $(MAKE) $@); done
 	rm -f *.o parse.cc parse.cc.output parse.h lexor.cc
 	rm -f ivl.exp iverilog-vpi.pdf iverilog-vpi.ps parse.output
-	rm -f syn-rules.output dosify.exe
+	rm -f syn-rules.output dosify.exe ivl@EXEEXT@ check.vvp
 	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc*
-	rm -rf dep ivl@EXEEXT@
+	rm -rf dep
 
 distclean: clean
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
@@ -131,11 +129,10 @@ ivl@EXEEXT@: $O ivl.def
 	$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
 	dlltool --dllname ivl@EXEEXT@ --def ivl.def \
 		--output-lib libivl.a --output-exp ivl.exp
-	$(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
+	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
 else
 ivl@EXEEXT@: $O
 	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib)
-
 endif
 
 ifeq (@MINGW32@,yes)
@@ -145,6 +142,9 @@ all: dep iverilog-vpi
 
 iverilog-vpi: iverilog-vpi.sh
 	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
+	    -e 's;@IVCC@;$(CC);' \
+	    -e 's;@IVCXX@;$(CXX);' \
+	    -e 's;@IVCFLAGS@;$(CXXFLAGS);' \
 	    -e 's;@INCLUDEDIR@;@includedir@;' \
 	    -e 's;@LIBDIR64@;@libdir64@;' \
 	    -e 's;@VPIDIR1@;@vpidir1@;' -e 's;@VPIDIR2@;@vpidir2@;' \
@@ -185,7 +185,7 @@ iverilog-vpi.ps: $(srcdir)/iverilog-vpi.man
 iverilog-vpi.pdf: iverilog-vpi.ps
 	ps2pdf iverilog-vpi.ps iverilog-vpi.pdf
 
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
 INSTALL_DOC = $(prefix)/iverilog-vpi.pdf $(mandir)/man1/iverilog-vpi.1
 INSTALL_DOCDIR = $(mandir)/man1
 all: dep iverilog-vpi.pdf
@@ -212,7 +212,6 @@ $(bindir)/iverilog-vpi: ./iverilog-vpi
 
 $(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
 	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl/ivl@EXEEXT@
-	$(STRIP) $(strip_dynamic) $(libdir)/ivl/ivl@EXEEXT@
 
 $(libdir)/ivl/xnf-s.conf: $(srcdir)/xnf-s.conf
 	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl/xnf-s.conf
@@ -269,14 +268,14 @@ uninstall:
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
 	for dir in vpi ivlpp driver; \
 	    do (cd $$dir ; $(MAKE) $@); done
-	for f in xnf.conf xnf-s.conf ivl; \
+	for f in xnf.conf xnf-s.conf ivl@EXEEXT@; \
 	    do rm -f $(libdir)/ivl/$$f; done
 	-rmdir $(libdir)/ivl
 	for f in verilog iverilog-vpi gverilog@EXEEXT@; \
 	    do rm -f $(bindir)/$$f; done
 	for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
 	    do rm -f $(includedir)/$$f; done
-	rm -f $(mandir)/man1/iverilog-vpi.1
+	rm -f $(mandir)/man1/iverilog-vpi.1 $(prefix)/iverilog-vpi.pdf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index 01bdb12f8..61051e6de 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.12 2006/02/15 18:42:42 steve Exp $"
+#ident "$Id: Makefile.in,v 1.13 2007/02/06 05:07:31 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -35,8 +35,6 @@ includedir = $(prefix)/include
 
 vpidir = @libdir@/ivl/@vpidir1@
 
-strip_dynamic=@strip_dynamic@
-
 CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -45,7 +43,6 @@ INSTALL_DATA = @INSTALL_DATA@
 CPPFLAGS = @ident_support@ -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@
 CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
-STRIP = @STRIP@
 
 SHARED = @shared@
 
@@ -74,7 +71,7 @@ dep:
 O = cadpli.o
 
 SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
     SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif
 
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 1a1976385..585922d35 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.25 2006/10/30 22:45:37 steve Exp $"
+#ident "$Id: Makefile.in,v 1.26 2007/02/06 05:07:31 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -80,7 +80,7 @@ iverilog.ps: $(srcdir)/iverilog.man
 iverilog.pdf: iverilog.ps
 	ps2pdf iverilog.ps iverilog.pdf
 
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
 INSTALL_DOC = $(prefix)/iverilog.pdf $(mandir)/man1/iverilog.1
 INSTALL_DOCDIR = $(mandir)/man1
 all: iverilog.pdf
@@ -105,4 +105,4 @@ installdirs: ../mkinstalldirs
 
 uninstall:
 	rm -f $(bindir)/iverilog@EXEEXT@
-	rm -f $(mandir)/man1/iverilog.1
+	rm -f $(mandir)/man1/iverilog.1 $(prefix)/iverilog.pdf
diff --git a/iverilog-vpi.sh b/iverilog-vpi.sh
index b8456091d..c82689a4f 100644
--- a/iverilog-vpi.sh
+++ b/iverilog-vpi.sh
@@ -17,12 +17,12 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: iverilog-vpi.sh,v 1.16 2006/09/26 18:54:42 steve Exp $"
+#ident "$Id: iverilog-vpi.sh,v 1.17 2007/02/06 05:07:31 steve Exp $"
 
 # These are the variables used for compiling files
-CC=gcc
-CXX=g++
-CFLAGS="@PIC@ -O -I@INCLUDEDIR@"
+CC=@IVCC@
+CXX=@IVCXX@
+CFLAGS="@PIC@ @IVCFLAGS@ -I@INCLUDEDIR@"
 
 # These are used for linking...
 LD=gcc
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index a0be96c14..54c647a81 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.35 2006/10/30 22:45:37 steve Exp $"
+#ident "$Id: Makefile.in,v 1.36 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,7 +41,6 @@ INSTALL_DATA = @INSTALL_DATA@
 CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
 CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
-STRIP = @STRIP@
 RANLIB = @RANLIB@
 
 A = a_close.o a_compare_handles.o a_configure.o a_fetch_argc.o \
diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in
index d9b8211e2..a603bbe8a 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.19 2007/01/17 05:00:12 steve Exp $"
+#ident "$Id: Makefile.in,v 1.20 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -34,7 +34,6 @@ libdir = @libdir@
 includedir = $(prefix)/include
 
 CC = @CC@
-CXX = @CXX@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in
index 7b3f4696e..399e033a2 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.25 2006/10/30 22:45:37 steve Exp $"
+#ident "$Id: Makefile.in,v 1.26 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -100,7 +100,7 @@ installdirs: ../mkinstalldirs
 	$(srcdir)/../mkinstalldirs $(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/vvp.tgt
+	rm -f $(libdir)/ivl/vvp.tgt $(libdir)/ivl/vvp.conf $(libdir)/ivl/vvp-s.conf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 4276c2ea2..b9de29963 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.60 2006/10/30 22:45:37 steve Exp $"
+#ident "$Id: Makefile.in,v 1.61 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -35,8 +35,6 @@ includedir = $(prefix)/include
 
 vpidir = $(libdir)/ivl/@vpidir1@
 
-strip_dynamic=@strip_dynamic@
-
 CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -45,7 +43,6 @@ INSTALL_DATA = @INSTALL_DATA@
 CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@
 CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
-STRIP = @STRIP@
 
 ifeq (@enable_vvp32@,yes)
 vpidir32 = $(libdir)/ivl/@vpidir2@
@@ -74,7 +71,7 @@ endif
 
 LIBS = @LIBS@
 SYSTEM_VPI_LDFLAGS = $(LIBS)
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
     SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif
 
@@ -101,7 +98,6 @@ install32: all32 $(vpidir32)/system.vpi
 
 $(vpidir32)/system.vpi: bin32/system.vpi
 	$(INSTALL_PROGRAM) bin32/system.vpi $(vpidir32)/system.vpi
-	$(STRIP) $(strip_dynamic) $(vpidir32)/system.vpi
 
 uninstall32:
 	rm -f $(vpidir32)/system.vpi
@@ -117,7 +113,6 @@ install: all installdirs $(vpidir)/system.vpi $(libdir)/ivl/system.sft $(INSTALL
 
 $(vpidir)/system.vpi: ./system.vpi
 	$(INSTALL_PROGRAM) ./system.vpi $(vpidir)/system.vpi
-	$(STRIP) $(strip_dynamic) $(vpidir)/system.vpi
 
 $(libdir)/ivl/system.sft: system.sft
 	$(INSTALL_DATA) $< $@
diff --git a/vpip/Makefile.in b/vpip/Makefile.in
index 4041d5f86..0b98525aa 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.8 2004/02/10 19:25:01 steve Exp $"
+#ident "$Id: Makefile.in,v 1.9 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -98,9 +98,4 @@ uninstall::
 	rm -f $(libdir)/libvpip.a
 	rm -f $(includedir)/vpi_priv.h
 
-ifeq (@WIN32@,yes)
-uninstall::
-	rm -f $(bindir)/vpip.dll
-endif
-
 -include $(patsubst %.o, dep/%.d, $O $P)
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index c298574b0..b2123cb16 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.72 2007/01/16 05:44:16 steve Exp $"
+#ident "$Id: Makefile.in,v 1.73 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,7 +41,6 @@ INSTALL = @INSTALL@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-STRIP = @STRIP@
 RANLIB = @RANLIB@
 LEX = @LEX@
 YACC = @YACC@
@@ -97,7 +96,7 @@ vvp@EXEEXT@ libvpi.a: $O vvp.def
 	$(CXX) -o vvp@EXEEXT@ $(LDFLAGS) $O $(dllib) $(LIBS)
 	dlltool --dllname vvp@EXEEXT@ --def vvp.def \
 		--output-lib libvpi.a --output-exp vvp.exp
-	$(CXX) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS)
+	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS)
 else
 libvpi.a: libvpi.c
 	$(CC) -c $(srcdir)/libvpi.c
@@ -105,8 +104,8 @@ libvpi.a: libvpi.c
 	ar cqv libvpi.a libvpi.o
 	$(RANLIB) libvpi.a
 
-vvp: $O
-	$(CXX) $(LDFLAGS) -o vvp $O $(LIBS) $(dllib)
+vvp@EXEEXT@: $O
+	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ $O $(LIBS) $(dllib)
 endif
 
 dep:
@@ -170,7 +169,7 @@ lexor.cc: $(srcdir)/lexor.lex
 vvp.pdf: $(srcdir)/vvp.man
 	man -t $(srcdir)/vvp.man | ps2pdf - vvp.pdf
 
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
 INSTALL_DOC = $(prefix)/vvp.pdf $(mandir)/man1/vvp.1
 INSTALL_DOCDIR = $(mandir)/man1
 all: vvp.pdf
@@ -218,6 +217,6 @@ endif
 uninstall: $(UNINSTALL32)
 	rm -f $(bindir)/vvp@EXEEXT@
 	rm -f $(libdir64)/libvpi.a
-	rm -f $(mandir)/man1/vvp.1
+	rm -f $(mandir)/man1/vvp.1 $(prefix)/vvp.pdf
 
 -include $(patsubst %.o, dep/%.d, $O)