From 58a3cf18e00d419c312146a47986ae9fe5ff8802 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Thu, 13 Nov 2014 04:44:53 +0100
Subject: Makefiles: fix overwrite of Makefile.in in gcc, add debug backend.

---
 Makefile.in              | 12 +++++++++++-
 src/ortho/debug/Makefile |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2011a8274..ca8a7b6b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,7 +143,6 @@ copy-sources.gcc:
 	 -e "/^####libraries Makefile.inc/r $(srcdir)/libraries/Makefile.inc" \
 	 -e "/^####grt Makefile.inc/r $(srcdir)/src/grt/Makefile.inc" \
 	 < $(srcdir)/dist/gcc/Makefile.in > $(gcc_vhdl_dir)/Makefile.in
-	$(CP) -p $(srcdir)/dist/gcc/Makefile.in $(gcc_vhdl_dir)
 	$(CP) -p $(srcdir)/dist/gcc/config-lang.in $(gcc_vhdl_dir)
 	$(CP) -p $(srcdir)/dist/gcc/lang-options.h $(gcc_vhdl_dir)
 	$(CP) -p $(srcdir)/dist/gcc/lang-specs.h $(gcc_vhdl_dir)
@@ -166,6 +165,17 @@ libs.vhdl.gcc: ghdl_gcc ghdl1-gcc
 	$(MAKE) GHDL=ghdl_gcc libs.vhdl.all
 	$(MAKE) GHDL1=./ghdl1-gcc libs.vhdl.standard
 
+ghdl1-debug: force
+	$(MAKE) -f $(srcdir)/src/ortho/debug/Makefile \
+	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
+	 GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \
+	 GNATMAKE="$(GNATMAKE)" all
+
+oread-gcc: force
+	$(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \
+	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
+	 GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all
+
 #################### For llvm backend ##############################
 
 LLVM_CONFIG=$(llvm_prefix)/bin/llvm-config
diff --git a/src/ortho/debug/Makefile b/src/ortho/debug/Makefile
index 0c15111ef..3e8bb5913 100644
--- a/src/ortho/debug/Makefile
+++ b/src/ortho/debug/Makefile
@@ -23,7 +23,7 @@ orthobe_srcdir=$(ortho_srcdir)/$(BE)
 GNATMAKE=gnatmake
 CC=gcc
 CFLAGS=-g
-ALL_GNAT_FLAGS=-pipe -g -gnato -gnatwl -gnatf -gnaty3befhkmr -gnatwu
+ALL_GNAT_FLAGS=-pipe -g -gnato -gnatwaeu -gnatf -gnaty3befhkmr
 GNATMAKE_FLAGS=-m $(ALL_GNAT_FLAGS) $(GNAT_FLAGS) -aI$(ortho_srcdir) -aI$(orthobe_srcdir) -aI.
 #LARGS=-largs -static
 SED=sed
@@ -32,7 +32,7 @@ all: $(ortho_exec)
 
 
 $(ortho_exec): force $(ortho_srcdir)/$(BE)/ortho_debug.ads
-	gnatmake -o $@ $(GNATMAKE_FLAGS) ortho_debug-main -bargs -E $(LARGS)
+	$(GNATMAKE) -o $@ $(GNATMAKE_FLAGS) ortho_debug-main -bargs -E $(LARGS)
 
 clean:
 	$(RM) -f *.o *.ali *~ b~*.ad? ortho_nodes-main
-- 
cgit v1.2.3