Minor rework of how driver-vpi is supported.

Add driver-vpi to either SUBDIRS or NOTUSED depending on if we
are building for MinGW or not. This is more logical and allows
the clean and distclean targets to be simplified.
This commit is contained in:
Cary R 2009-11-30 19:04:26 -08:00 committed by Stephen Williams
parent 9bcc658e37
commit 145133bdb0
1 changed files with 7 additions and 9 deletions

View File

@ -43,6 +43,12 @@ SUBDIRS = ivlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp \
# Only run distclean for these directories. # Only run distclean for these directories.
NOTUSED = tgt-fpga tgt-pal tgt-verilog NOTUSED = tgt-fpga tgt-pal tgt-verilog
ifeq (@MINGW32@,yes)
SUBDIRS += driver-vpi
else
NOTUSED += driver-vpi
endif
# To get the version headers to build correctly we only want to look # To get the version headers to build correctly we only want to look
# for C++ files in the source directory. All other files will require # for C++ files in the source directory. All other files will require
# an explicit $(srcdir). # an explicit $(srcdir).
@ -96,9 +102,6 @@ check: all
clean: clean:
$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
ifeq (@MINGW32@,no)
(cd driver-vpi ; $(MAKE) $@)
endif
rm -f *.o parse.cc parse.h lexor.cc rm -f *.o parse.cc parse.h lexor.cc
rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps parse.output rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps parse.output
rm -f syn-rules.output dosify.exe ivl@EXEEXT@ check.vvp rm -f syn-rules.output dosify.exe ivl@EXEEXT@ check.vvp
@ -108,9 +111,6 @@ endif
distclean: clean distclean: clean
$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
ifeq (@MINGW32@,no)
(cd driver-vpi ; $(MAKE) $@)
endif
$(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) $@ && ) true $(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) $@ && ) true
rm -f Makefile config.status config.log config.cache rm -f Makefile config.status config.log config.cache
rm -f stamp-config-h config.h rm -f stamp-config-h config.h
@ -177,9 +177,7 @@ ivl@EXEEXT@: $O
$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib) $(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib)
endif endif
ifeq (@MINGW32@,yes) ifeq (@MINGW32@,no)
SUBDIRS += driver-vpi
else
all: dep iverilog-vpi all: dep iverilog-vpi
iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile