V0.8: Fix cleanup and cygwin out of source building

This patch adds a few missing files to clean/distclean and also
fixes the out of source directory building for cygwin/MinGW.
This commit is contained in:
Cary R 2011-03-11 13:39:58 -08:00 committed by Stephen Williams
parent ac8fddfa01
commit 32e30f2d5b
6 changed files with 23 additions and 13 deletions

View File

@ -78,8 +78,8 @@ all: dep ivl@EXEEXT@
# dosify text files.
ifeq (@WIN32@,yes)
all: dep dosify.exe
dosify.exe: dosify.c
$(CC) -o dosify.exe dosify.c
dosify.exe: $(srcdir)/dosify.c
$(CC) -o dosify.exe $(srcdir)/dosify.c
endif
# This rule rules the compiler in the trivial hello.vl program to make
@ -107,17 +107,24 @@ clean:
for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
for dir in vpi ivlpp tgt-verilog tgt-stub driver; \
do (cd $$dir ; $(MAKE) $@); done
rm -f *.o parse.cc parse.output parse.h lexor.cc syn-rules.output
rm -f iverilog-vpi.ps iverilog-vpi.pdf
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 -rf dep ivl@EXEEXT@ dosify.exe check.vvp
rm -rf dep
distclean: clean
for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
for dir in vpi ivlpp tgt-verilog tgt-stub driver; \
do (cd $$dir ; $(MAKE) $@); done
rm -f Makefile config.status config.log config.cache config.h
rm -f Makefile config.status config.log config.cache
rm -f config.h
rm -f _pli_types.h
ifneq (@srcdir@,.)
rm -f check.conf
rmdir $(SUBDIRS)
endif
rm -rf autom4te.cache
TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-xnf.o
@ -148,9 +155,9 @@ ifeq (@WIN32@,yes)
# The first step makes an ivl.exe that dlltool can use to make an
# export and import library, and the last link makes a, ivl.exe
# that really exports the things that the import library imports.
ivl@EXEEXT@: $O ivl.def
ivl@EXEEXT@: $O $(srcdir)/ivl.def
$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
dlltool --dllname ivl@EXEEXT@ --def ivl.def \
dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
--output-lib libivl.a --output-exp ivl.exp
$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
else

View File

@ -91,6 +91,7 @@ clean:
distclean: clean
rm -f Makefile config.status config.log config.cache
rm -f config.h
rm -rf autom4te.cache
install:: all installdirs $(libdir64)/libveriuser$(suffix).a $(INSTALL32)

View File

@ -92,7 +92,7 @@ Makefile: Makefile.in config.status
./config.status
clean:
rm -rf *.o dep edif.tgt
rm -rf *.o dep libedif_tgt.a edif.tgt
distclean: clean
rm -f Makefile config.status config.log config.cache

View File

@ -77,6 +77,7 @@ clean:
distclean: clean
rm -f Makefile config.status config.log config.cache
rm -f vvp_config.h
rm -rf autom4te.cache
check: all

View File

@ -112,6 +112,7 @@ clean:
distclean: clean
rm -f Makefile config.log config.status
rm -f vpi_config.h
rm -rf autom4te.cache
check: all

View File

@ -70,8 +70,8 @@ endif
all: dep vvp@EXEEXT@ libvpi.a $(ALL32)
clean:
rm -f *.o *~ parse.cc parse.cc.output parse.h lexor.cc tables.cc
rm -f vvp.ps vvp.pdf
rm -f *.o *~ parse.cc parse.output parse.h lexor.cc tables.cc
rm -f vvp.ps vvp.pdf vvp.exp
rm -rf dep vvp@EXEEXT@ libvpi.a bin32
distclean: clean
@ -112,9 +112,9 @@ ifeq (@WIN32@,yes)
#
# To get this to work correctly we must use the suffixed version of the
# executable to build the library.
vvp@EXEEXT@ libvpi.a: $O vvp.def
vvp@EXEEXT@ libvpi.a: $O $(srcdir)/vvp.def
$(CXX) -o vvp$(suffix)@EXEEXT@ $(LDFLAGS) $O $(dllib) $(LIBS)
dlltool --dllname vvp$(suffix)@EXEEXT@ --def vvp.def \
dlltool --dllname vvp$(suffix)@EXEEXT@ --def $(srcdir)/vvp.def \
--output-lib libvpi.a --output-exp vvp.exp
rm -f vvp$(suffix)@EXEEXT@
$(CXX) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS)