From 26ee14c7dd9208bf35cda43d8f968223b41373a0 Mon Sep 17 00:00:00 2001 From: Cary R Date: Tue, 16 Dec 2008 16:24:09 -0800 Subject: [PATCH] Clean up Makefile.in files. This patch cleans up the Makefile.in files. We only need to delete config.log in the lower directories. We reference the *.in files at $(srcdir)/ We need to make distclean for the tgt-(fpga,pal,verilog) directories. This is to cleanup the Makefile. Add some missing "rm -r f dep" --- Makefile.in | 6 +++++- cadpli/Makefile.in | 2 +- driver-vpi/Makefile.in | 6 +++--- driver/Makefile.in | 3 ++- ivlpp/Makefile.in | 2 +- libveriuser/Makefile.in | 6 +++--- tgt-fpga/Makefile.in | 2 +- tgt-null/Makefile.in | 2 +- tgt-pal/Makefile.in | 2 +- tgt-stub/Makefile.in | 5 ++++- tgt-verilog/Makefile.in | 2 +- tgt-vhdl/Makefile.in | 6 +++--- tgt-vvp/Makefile.in | 6 +++--- vpi/Makefile.in | 6 +++--- vvp/Makefile.in | 6 +++--- 15 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8fff6b63e..2a6778862 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,10 @@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ datarootdir = @datarootdir@ -SUBDIRS = ivlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp tgt-vhdl driver +SUBDIRS = ivlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp \ + tgt-vhdl driver +# Only run distclean for these driectories. +NOTUSED = tgt-fpga tgt-pal tgt-verilog VPATH = $(srcdir) @@ -117,6 +120,7 @@ distclean: clean ifeq (@MINGW32@,no) (cd driver-vpi ; $(MAKE) $@) endif + for dir in $(NOTUSED); do (cd $$dir ; $(MAKE) $@); done rm -f Makefile config.status config.log config.cache config.h rm -f _pli_types.h diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index 71c7def31..f8db775d4 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -76,7 +76,7 @@ clean: rm -rf *.o dep cadpli.vpl bin32 distclean: clean - rm -f Makefile + rm -f Makefile config.log install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32) diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index 9c2427b95..fc9bd8c8d 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -52,11 +52,11 @@ all: dep iverilog-vpi@EXEEXT@ check: all clean: - rm -f *.o config.h - rm -f iverilog-vpi@EXEEXT@ + rm -f *.o config.h iverilog-vpi@EXEEXT@ + rm -rf dep distclean: clean - rm -f Makefile + rm -f Makefile config.log Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ diff --git a/driver/Makefile.in b/driver/Makefile.in index 23bef98ce..ea48427a4 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -53,9 +53,10 @@ 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@ iverilog.pdf iverilog.ps + rm -rf dep distclean: clean - rm -f Makefile + rm -f Makefile config.log Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in index 6adea5292..024632feb 100644 --- a/ivlpp/Makefile.in +++ b/ivlpp/Makefile.in @@ -49,7 +49,7 @@ clean: rm -f *.o lexor.c ivlpp@EXEEXT@ distclean: clean - rm -f Makefile + rm -f Makefile config.log Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index 2b46112db..066aa5a57 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -59,10 +59,10 @@ all: dep libveriuser.a $(ALL32) check: all -Makefile: Makefile.in ../config.status +Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ -config.h: config.h.in ../config.status +config.h: $(srcdir)/config.h.in ../config.status ../config.status --header=$@ libveriuser.o: $O @@ -85,7 +85,7 @@ clean: rm -rf *.o dep libveriuser.a libveriuser.o bin32 distclean: clean - rm -f Makefile config.status config.log config.cache config.h + rm -f Makefile config.log config.h install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32) diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 23db9e416..7d3344507 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -82,7 +82,7 @@ clean: rm -rf *.o dep fpga.tgt distclean: clean - rm -f Makefile + rm -f Makefile config.log check: all diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in index f5af80c18..1424e0c55 100644 --- a/tgt-null/Makefile.in +++ b/tgt-null/Makefile.in @@ -69,7 +69,7 @@ clean: rm -rf *.o dep null.tgt distclean: clean - rm -f Makefile config.status config.log config.cache + rm -f Makefile config.log Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in index 8056311ab..112a02b65 100644 --- a/tgt-pal/Makefile.in +++ b/tgt-pal/Makefile.in @@ -66,7 +66,7 @@ clean: rm -rf *.o dep pal.tgt distclean: clean - rm -f Makefile + rm -f Makefile config.log Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index ecf50b22f..1c58147f8 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -70,10 +70,13 @@ clean: rm -rf *.o dep stub.tgt distclean: clean - rm -f Makefile config.status config.log + rm -f Makefile config.log check: all +Makefile: $(srcdir)/Makefile.in ../config.status + ../config.status --file=$@ + install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \ $(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in index 5f10263d9..875972a1a 100644 --- a/tgt-verilog/Makefile.in +++ b/tgt-verilog/Makefile.in @@ -65,7 +65,7 @@ clean: rm -rf *.o dep verilog.tgt distclean: clean - rm -f Makefile + rm -f Makefile config.log Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index 89af78d77..2fdeb3afe 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -65,17 +65,17 @@ endif vhdl.tgt: $O $(TGTDEPLIBS) $(CXX) @shared@ -o $@ $O $(TGTLDFLAGS) -Makefile: Makefile.in ../config.status +Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ -vhdl_config.h: vhdl_config.h.in ../config.status +vhdl_config.h: $(srcdir)/vhdl_config.h.in ../config.status ../config.status --header=$@ clean: rm -rf $(O) dep vhdl.tgt distclean: clean - rm -f Makefile config.status config.log config.cache vhdl_config.h + rm -f Makefile config.log vhdl_config.h check: all diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index 81726dcbd..3bb5f3d95 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -76,17 +76,17 @@ vvp.conf: $(srcdir)/vvp.conf.in Makefile vvp-s.conf: $(srcdir)/vvp-s.conf.in Makefile echo 'flag:VVP_EXECUTABLE=$(bindir)/vvp$(suffix)' | cat $(srcdir)/vvp-s.conf.in - > vvp-s.conf -Makefile: Makefile.in ../config.status +Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ -vvp_config.h: vvp_config.h.in ../config.status +vvp_config.h: $(srcdir)/vvp_config.h.in ../config.status ../config.status --header=$@ clean: rm -rf *.o dep vvp.tgt vvp.conf vvp-s.conf distclean: clean - rm -f Makefile config.status config.log config.cache vvp_config.h + rm -f Makefile config.log vvp_config.h check: all diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 8be34c976..8993de1d0 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -111,12 +111,12 @@ clean: rm -f va_math.vpi v2005_math.vpi distclean: clean - rm -f Makefile config.status config.log vpi_config.h + rm -f Makefile config.log vpi_config.h -Makefile: Makefile.in ../config.status +Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ -vpi_config.h: vpi_config.h.in ../config.status +vpi_config.h: $(srcdir)/vpi_config.h.in ../config.status ../config.status --header=$@ check: all diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 428ec052a..efffd61a9 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -63,7 +63,7 @@ clean: rm -rf dep vvp@EXEEXT@ libvpi.a bin32 parse.output vvp.pdf vvp.exp distclean: clean - rm -f Makefile config.status config.log config.cache config.h + rm -f Makefile config.log config.h check: all ./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.' @@ -152,10 +152,10 @@ INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1 INSTALL_DOCDIR = $(mandir)/man1 endif -Makefile: Makefile.in ../config.status +Makefile: $(srcdir)/Makefile.in ../config.status ../config.status --file=$@ -config.h: config.h.in ../config.status +config.h: $(srcdir)/config.h.in ../config.status ../config.status --header=$@ install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(libdir)/libvpi$(suffix).a $(INSTALL_DOC)