Browse files

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"
  • Loading branch information...
1 parent 45d46da commit 26ee14c7dd9208bf35cda43d8f968223b41373a0 @caryr caryr committed with Dec 16, 2008
View
6 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
View
2 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)
View
6 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=$@
View
3 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=$@
View
2 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=$@
View
6 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)
View
2 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
View
2 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=$@
View
2 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=$@
View
5 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
View
2 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=$@
View
6 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
View
6 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
View
6 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
View
6 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)

0 comments on commit 26ee14c

Please sign in to comment.