luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build of ivl with files in libmisc and vhdlpp check issues. 

This patch fixes the ivl build to find files in libmisc using vpath instead
of a separate target. The existing constructs caused build problems after
running a make clean. It also adds an empty checking target to vhdlpp.
This commit is contained in:
Cary R 2011-01-24 13:19:28 -08:00 committed by Stephen Williams
parent ffca523d39
commit 6bf7e88611
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -55,6 +55,7 @@ endif
# rebuild the lexor_keyword.cc file. If we do, then we want to use the # rebuild the lexor_keyword.cc file. If we do, then we want to use the
# local version instead of the one is $(srcdir). # local version instead of the one is $(srcdir).
vpath lexor_keyword.cc . vpath lexor_keyword.cc .
vpath %.cc $(srcdir)/libmisc
vpath %.cc $(srcdir) vpath %.cc $(srcdir)
bindir = @bindir@ bindir = @bindir@
@ -200,7 +201,7 @@ ifeq (@WIN32@,yes)
# The first step makes an ivl.exe that dlltool can use to make an # 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 # export and import library, and the last link makes a, ivl.exe
# that really exports the things that the import library imports. # that really exports the things that the import library imports.
ivl@EXEEXT@: $O $(srcdir)/ivl.def ivl@EXEEXT@: $O $(srcdir)/ivl.def
$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@ $(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \ dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
--output-lib libivl.a --output-exp ivl.exp --output-lib libivl.a --output-exp ivl.exp
@ -232,10 +233,6 @@ version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d mv $*.d dep/$*.d
%.o: $(srcdir)/libmisc/%.cc
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d
# Here are some explicit dependencies needed to get things going. # Here are some explicit dependencies needed to get things going.
main.o: main.cc version_tag.h main.o: main.cc version_tag.h

2
vhdlpp/Makefile.in
View File

@ -58,6 +58,8 @@ O = main.o compiler.o entity.o entity_elaborate.o \
all: dep vhdlpp@EXEEXT@ all: dep vhdlpp@EXEEXT@
check: all
clean: clean:
rm -f *.o *~ rm -f *.o *~
rm -rf dep vhdlpp@EXEEXT@ rm -rf dep vhdlpp@EXEEXT@