From ec07674d4039ad9c320a1d98bce4e281fa3e26da Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Fri, 22 Aug 2003 04:27:10 +0000
Subject: [PATCH]  Fix Makefiles to support read-only source directory.

---
 driver/Makefile.in      | 6 +++---
 ivlpp/Makefile.in       | 4 ++--
 libveriuser/Makefile.in | 6 +++---
 tgt-fpga/Makefile.in    | 4 ++--
 tgt-null/Makefile.in    | 4 ++--
 tgt-stub/Makefile.in    | 4 ++--
 tgt-verilog/Makefile.in | 4 ++--
 vpi/Makefile.in         | 4 ++--
 vvp/Makefile.in         | 8 ++++----
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 4253cc3e9..4172a43bc 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.18 2003/08/10 00:39:13 steve Exp $"
+#ident "$Id: Makefile.in,v 1.19 2003/08/22 04:27:10 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -43,8 +43,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@
-CFLAGS = @CFLAGS@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"'
-CXXFLAGS = @CXXFLAGS@ -I. -I$(srcdir)/..
+CFLAGS = @CFLAGS@ -I.. -I. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"'
+CXXFLAGS = @CXXFLAGS@ -I.. -I. -I$(srcdir)/.. -I$(srcdir)
 LDFLAGS = @LDFLAGS@
 
 all: iverilog@EXEEXT@
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index 822394a06..ddab40c57 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.13 2003/02/27 22:13:22 steve Exp $"
+#ident "$Id: Makefile.in,v 1.14 2003/08/22 04:27:10 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,7 +41,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@
-CFLAGS = @CFLAGS@ -I. -I$(srcdir)/..
+CFLAGS = @CFLAGS@ -I.. -I. -I$(srcdir)/.. -I$(srcdir)
 LDFLAGS = @LDFLAGS@ 
 
 all: ivlpp
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index 282336c95..a4adcbb5b 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.26 2003/06/04 01:56:20 steve Exp $"
+#ident "$Id: Makefile.in,v 1.27 2003/08/22 04:27:10 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -32,8 +32,8 @@ bindir = @bindir@
 libdir = @libdir@
 includedir = $(prefix)/include
 
-CC = @CC@ -I$(srcdir) -I$(srcdir)/..
-CXX = @CXX@ -I$(srcdir) -I$(srcdir)/..
+CC = @CC@ -I. -I.. -I$(srcdir) -I$(srcdir)/..
+CXX = @CXX@ -I. -I.. -I$(srcdir) -I$(srcdir)/..
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in
index 9da751a22..e2b66ded4 100644
--- a/tgt-fpga/Makefile.in
+++ b/tgt-fpga/Makefile.in
@@ -17,7 +17,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.12 2003/08/07 04:04:01 steve Exp $"
+#ident "$Id: Makefile.in,v 1.13 2003/08/22 04:27:10 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -50,7 +50,7 @@ dep:
 	mkdir dep
 
 %.o: %.c
-	$(CC) -Wall @ident_support@ -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
+	$(CC) -Wall @ident_support@ -I.. -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 D = d-generic.o d-generic-edif.o d-lpm.o d-virtex.o d-virtex2.o
diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in
index 8c570ba71..1a6c72593 100644
--- a/tgt-null/Makefile.in
+++ b/tgt-null/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.8 2003/02/27 22:13:22 steve Exp $"
+#ident "$Id: Makefile.in,v 1.9 2003/08/22 04:27:10 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -50,7 +50,7 @@ dep:
 	mkdir dep
 
 %.o: %.c
-	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
+	$(CC) -Wall -I.. -I$(srcdir)/.. -I$(srcdir) $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = null.o
diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in
index a376a03d1..be007436f 100644
--- a/tgt-stub/Makefile.in
+++ b/tgt-stub/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.11 2003/02/27 22:13:22 steve Exp $"
+#ident "$Id: Makefile.in,v 1.12 2003/08/22 04:27:10 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -50,7 +50,7 @@ dep:
 	mkdir dep
 
 %.o: %.c
-	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS)  -MD -c $< -o $*.o
+	$(CC) -Wall -I.. -I$(srcdir)/.. $(CPPFLAGS)  -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = stub.o
diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in
index 43b18ac3a..7aa4bc5e6 100644
--- a/tgt-verilog/Makefile.in
+++ b/tgt-verilog/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.10 2003/02/27 22:13:22 steve Exp $"
+#ident "$Id: Makefile.in,v 1.11 2003/08/22 04:27:11 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -50,7 +50,7 @@ dep:
 	mkdir dep
 
 %.o: %.c
-	$(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
+	$(CC) -Wall -I.. -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = verilog.o
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index b4840e459..bd88985b6 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.40 2003/04/19 22:37:10 steve Exp $"
+#ident "$Id: Makefile.in,v 1.41 2003/08/22 04:27:11 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -54,7 +54,7 @@ dep:
 	mkdir dep
 
 %.o: %.c
-	$(CC) -Wall -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
+	$(CC) -Wall -I$(srcdir)/.. -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_finish.o \
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index 59f6b0b02..83933ef9d 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.50 2003/08/10 00:39:13 steve Exp $"
+#ident "$Id: Makefile.in,v 1.51 2003/08/22 04:27:11 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -43,7 +43,7 @@ RANLIB = @RANLIB@
 LEX = @LEX@
 YACC = @YACC@
 
-CPPFLAGS = -I. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ -DMODULE_DIR=\"$(libdir)/ivl\"
+CPPFLAGS = -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ -DMODULE_DIR=\"$(libdir)/ivl\"
 CXXFLAGS = @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @EXTRALIBS@
@@ -101,8 +101,8 @@ dep:
 	$(CXX) @ident_support@ $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep/$*.d
 
-tables.cc: draw_tt.c
-	$(CC) -o draw_tt draw_tt.c
+tables.cc: $(srcdir)/draw_tt.c
+	$(CC) -o draw_tt $(srcdir)/draw_tt.c
 	./draw_tt > tables.cc
 	rm draw_tt@EXEEXT@