From 6bf7e88611519dfa0c90d3b0371dad22c0d42f2b Mon Sep 17 00:00:00 2001 From: Cary R Date: Mon, 24 Jan 2011 13:19:28 -0800 Subject: [PATCH] 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. --- Makefile.in | 7 ++----- vhdlpp/Makefile.in | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 48e28d1b8..33d264a54 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,6 +55,7 @@ endif # rebuild the lexor_keyword.cc file. If we do, then we want to use the # local version instead of the one is $(srcdir). vpath lexor_keyword.cc . +vpath %.cc $(srcdir)/libmisc vpath %.cc $(srcdir) bindir = @bindir@ @@ -200,7 +201,7 @@ 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 $(srcdir)/ivl.def +ivl@EXEEXT@: $O $(srcdir)/ivl.def $(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@ dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \ --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 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. main.o: main.cc version_tag.h diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in index 911f3dbad..edd764e16 100644 --- a/vhdlpp/Makefile.in +++ b/vhdlpp/Makefile.in @@ -58,6 +58,8 @@ O = main.o compiler.o entity.o entity_elaborate.o \ all: dep vhdlpp@EXEEXT@ +check: all + clean: rm -f *.o *~ rm -rf dep vhdlpp@EXEEXT@