Permalink
Browse files

Still more build system cleanup.

- Add missing dependency of configure on aclocal.m4.

- Remove config stamp files in make distclean (and fix another for
  loop in base make distclean that I missed)

- Add stamp files to .gitignore
  • Loading branch information...
1 parent 7ead2aa commit c167b3a01f304724473f2e96c1710a955d792dbb @jaredcasper jaredcasper committed with Oct 21, 2009
Showing with 16 additions and 9 deletions.
  1. +1 −0 .gitignore
  2. +5 −4 Makefile.in
  3. +2 −1 libveriuser/Makefile.in
  4. +2 −1 tgt-vhdl/Makefile.in
  5. +2 −1 tgt-vvp/Makefile.in
  6. +2 −1 vpi/Makefile.in
  7. +2 −1 vvp/Makefile.in
View
@@ -18,6 +18,7 @@ config.h
/tgt-vvp/vvp_config.h
/tgt-vhdl/vhdl_config.h
/vpi/vpi_config.h
+stamp-*-h
/version.h
/version_tag.h
View
@@ -106,9 +106,10 @@ 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
+ $(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) $@ && ) true
+ 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
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
@@ -144,7 +145,7 @@ stamp-_pli_types-h: $(srcdir)/_pli_types.h.in config.status
./config.status _pli_types.h
_pli_types.h: stamp-_pli_types-h
-$(srcdir)/configure: $(srcdir)/configure.in
+$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
cd $(srcdir) && autoconf
config.status: $(srcdir)/configure
@@ -87,7 +87,8 @@ clean:
rm -rf *.o dep libveriuser.a libveriuser.o bin32
distclean: clean
- rm -f Makefile config.log config.h
+ rm -f Makefile config.log
+ rm -f config.h stamp-config-h
install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32)
@@ -75,7 +75,8 @@ clean:
rm -rf $(O) dep vhdl.tgt
distclean: clean
- rm -f Makefile config.log vhdl_config.h
+ rm -f Makefile config.log
+ rm -f stamp-vhdl_config-h vhdl_config.h
check: all
View
@@ -86,7 +86,8 @@ clean:
rm -rf *.o dep vvp.tgt vvp.conf vvp-s.conf
distclean: clean
- rm -f Makefile config.log vvp_config.h
+ rm -f Makefile config.log
+ rm -f stamp-vvp_config-h vvp_config.h
check: all
View
@@ -109,7 +109,8 @@ clean:
rm -f va_math.vpi v2005_math.vpi
distclean: clean
- rm -f Makefile config.log vpi_config.h
+ rm -f Makefile config.log
+ rm -f vpi_config.h stamp-vpi_config-h
Makefile: $(srcdir)/Makefile.in ../config.status
cd ..; ./config.status --file=vpi/$@
View
@@ -61,7 +61,8 @@ clean:
rm -rf dep vvp@EXEEXT@ libvpi.a bin32 parse.output vvp.pdf vvp.exp
distclean: clean
- rm -f Makefile config.log config.h
+ rm -f Makefile config.log
+ rm -f stamp-config-h config.h
check: all
./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.'

0 comments on commit c167b3a

Please sign in to comment.