From 59e85dcffc04a6480fabefb6d1eee102747c43e3 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Fri, 22 Oct 1999 23:58:13 +0000
Subject: [PATCH]  Support build in different directory.

---
 Makefile.in     | 36 ++++++++++++++++++------------------
 vpi/Makefile.in |  4 ++--
 vvm/Makefile.in |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3be186bad..716ab7574 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.22 1999/10/16 20:48:15 steve Exp $"
+#ident "$Id: Makefile.in,v 1.23 1999/10/22 23:58:13 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -43,19 +43,19 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -I$(srcdir)
 LDFLAGS = @LDFLAGS@
 
 all: ivl verilog
-	cd vpi ; make all
-	cd vvm ; make all
-	cd ivlpp ; make all
+	cd vpi ; $(MAKE) all
+	cd vvm ; $(MAKE) all
+	cd ivlpp ; $(MAKE) all
 
 clean:
 	rm *.o parse.cc parse.cc.output parse.h dep/*.d lexor.cc
-	cd vpi ; make clean
-	cd vvm ; make clean
-	cd ivlpp ; make clean
+	cd vpi ; $(MAKE) clean
+	cd vvm ; $(MAKE) clean
+	cd ivlpp ; $(MAKE) clean
 
 TT = t-null.o t-verilog.o t-vvm.o t-xnf.o
 FF = nobufz.o propinit.o sigfold.o xnfio.o xnfsyn.o
@@ -98,17 +98,17 @@ lexor.o dep/lexor.d: lexor.cc parse.h
 
 parse.o dep/parse.d: parse.cc
 
-parse.h parse.cc: parse.y
-	bison --verbose -t -p VL -d parse.y -o parse.cc
+parse.h parse.cc: $(srcdir)/parse.y
+	bison --verbose -t -p VL -d $(srcdir)/parse.y -o parse.cc
 	mv parse.cc.h parse.h
 
-lexor.cc: lexor.lex
-	flex -PVL -s -olexor.cc lexor.lex
+lexor.cc: $(srcdir)/lexor.lex
+	flex -PVL -s -olexor.cc $(srcdir)/lexor.lex
 
 install: all installdirs $(bindir)/verilog $(bindir)/ivl $(mandir)/man1/verilog.1
-	cd vpi ; make install
-	cd vvm ; make install
-	cd ivlpp ; make install
+	cd vpi ; $(MAKE) install
+	cd vvm ; $(MAKE) install
+	cd ivlpp ; $(MAKE) install
 
 $(bindir)/verilog: ./verilog
 	$(INSTALL_PROGRAM) ./verilog $(bindir)/verilog
@@ -126,9 +126,9 @@ uninstall:
 	rm -f $(bindir)/ivl
 	rm -f $(bindir)/verilog
 	rm -f $(mandir)/man1/verilog.1
-	cd vpi ; make uninstall
-	cd vvm ; make uninstall
-	cd ivlpp ; make uninstall
+	cd vpi ; $(MAKE) uninstall
+	cd vvm ; $(MAKE) uninstall
+	cd ivlpp ; $(MAKE) uninstall
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 551708252..72a162a65 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.5 1999/10/17 20:14:05 steve Exp $"
+#ident "$Id: Makefile.in,v 1.6 1999/10/22 23:58:13 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -49,7 +49,7 @@ all: system.vpi
 
 %.o dep/%.d: %.c
 	@[ -d dep ] || mkdir dep
-	$(CC) -Wall $(CPPFLAGS) -MD -c $< -o $*.o
+	$(CC) -Wall $(CPPFLAGS) -I$(srcdir) -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = sys_table.o sys_display.o sys_finish.o
diff --git a/vvm/Makefile.in b/vvm/Makefile.in
index c74e6bd99..eab2a9fd5 100644
--- a/vvm/Makefile.in
+++ b/vvm/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.7 1999/10/17 20:14:23 steve Exp $"
+#ident "$Id: Makefile.in,v 1.8 1999/10/22 23:58:13 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -36,7 +36,7 @@ libdir = $(exec_prefix)/lib
 includedir = $(prefix)/include
 
 CC = @CC@
-CXX = @CXX@ -I../vpi
+CXX = @CXX@ -I$(srcdir) -I$(srcdir)/../vpi
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@