From cf2f99ec3d75bec23ecc7ea0e98dbd9504faf987 Mon Sep 17 00:00:00 2001
From: Cary R <cygcary@yahoo.com>
Date: Wed, 28 Oct 2009 19:20:36 -0700
Subject: [PATCH] Cleanup Makefile clean targets.

This patch removes bin32 from the clean targets since it is no
longer user/created. It adds autom4te.cache to the distclean
target in the main directory. It removes the files in driver
that are not created (lexor.c parse.c, etc.). The *.cc.output
files are no longer created so removing them is not needed.
---
 Makefile.in             | 5 +++--
 cadpli/Makefile.in      | 2 +-
 driver/Makefile.in      | 3 +--
 libveriuser/Makefile.in | 2 +-
 vpi/Makefile.in         | 2 +-
 vvp/Makefile.in         | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4eda7e227..9c4d93f17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,10 +95,10 @@ clean:
 ifeq (@MINGW32@,no)
 	(cd driver-vpi ; $(MAKE) $@)
 endif
-	rm -f *.o parse.cc parse.cc.output parse.h lexor.cc
+	rm -f *.o parse.cc parse.h lexor.cc
 	rm -f ivl.exp iverilog-vpi.pdf iverilog-vpi.ps parse.output
 	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 -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc
 	rm -rf dep
 
 distclean: clean
@@ -110,6 +110,7 @@ endif
 	rm -f Makefile config.status config.log config.cache
 	rm -f stamp-config-h config.h
 	rm -f stamp-_pli_types-h _pli_types.h
+	rm -rf autom4te.cache
 
 TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o
 FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o
diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index 66005c641..81ca68350 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -71,7 +71,7 @@ cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
 	$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
 
 clean:
-	rm -rf *.o dep cadpli.vpl bin32
+	rm -rf *.o dep cadpli.vpl
 
 distclean: clean
 	rm -f Makefile config.log
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 1a366f73f..84da8d38c 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -50,8 +50,7 @@ all: dep iverilog@EXEEXT@
 check: all
 
 clean:
-	rm -f *.o lexor.c parse.c parse.h parse.output
-	rm -f cflexor.c cfparse.c cfparse.h cfparse.output
+	rm -f *.o cflexor.c cfparse.c cfparse.h cfparse.output
 	rm -f iverilog@EXEEXT@ iverilog.pdf iverilog.ps
 	rm -rf dep
 
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index d675319c3..12a8484c4 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -84,7 +84,7 @@ dep:
 
 
 clean:
-	rm -rf *.o dep libveriuser.a libveriuser.o bin32
+	rm -rf *.o dep libveriuser.a libveriuser.o
 
 distclean: clean
 	rm -f Makefile config.log
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index c398932a2..6b2988a78 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -104,7 +104,7 @@ va_math.vpi: $V ../vvp/libvpi.a
 	$(CC) @shared@ -o $@ $V -L../vvp $(LDFLAGS) -lvpi $(VA_MATH_VPI_LDFLAGS)
 
 clean:
-	rm -rf *.o sys_readmem_lex.c dep system.vpi bin32
+	rm -rf *.o sys_readmem_lex.c dep system.vpi
 	rm -f sdf_lexor.c sdf_parse.c sdf_parse.output sdf_parse.h
 	rm -f va_math.vpi v2005_math.vpi
 
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index b9156a71a..a46a246d2 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -57,8 +57,8 @@ MDIR1 = -DMODULE_DIR1=\"$(libdir)/ivl$(suffix)/.\"
 all: dep vvp@EXEEXT@ libvpi.a
 
 clean:
-	rm -f *.o *~ parse.cc parse.cc.output parse.h lexor.cc tables.cc
-	rm -rf dep vvp@EXEEXT@ libvpi.a bin32 parse.output vvp.pdf vvp.exp
+	rm -f *.o *~ parse.cc parse.h lexor.cc tables.cc
+	rm -rf dep vvp@EXEEXT@ libvpi.a parse.output vvp.pdf vvp.exp
 
 distclean: clean
 	rm -f Makefile config.log