git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.in (GNATTOOLS2_FILES): Replaced by common-tools target in gcc/ada/Makefile.in 

* Makefile.in (GNATTOOLS2_FILES): Replaced by common-tools target
	in gcc/ada/Makefile.in

From-SVN: r135639
This commit is contained in:
Arnaud Charlet 2008-05-20 12:50:26 +00:00 committed by Arnaud Charlet
parent 3393111257
commit eede5a0d7a
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnattools/ChangeLog
View File

@ -1,3 +1,8 @@
2008-05-20 Arnaud Charlet <charlet@adacore.com>
* Makefile.in (GNATTOOLS2_FILES): Replaced by common-tools target
in gcc/ada/Makefile.in
2008-05-13 Arnaud Charlet <charlet@adacore.com> 2008-05-13 Arnaud Charlet <charlet@adacore.com>
PR ada/31808 PR ada/31808

21
gnattools/Makefile.in
View File

@ -146,18 +146,6 @@ TOOLS_FLAGS_TO_PASS_CROSS= \
EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@ EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@
TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@ TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
# These are built by gnatmake, and in both native and cross configurations.
GNATTOOLS2_FILES = \
../../gnatchop$(exeext) \
../../gnat$(exeext) \
../../gnatkr$(exeext) \
../../gnatls$(exeext) \
../../gnatprep$(exeext) \
../../gnatxref$(exeext) \
../../gnatfind$(exeext) \
../../gnatname$(exeext) \
../../gnatclean$(exeext)
# Makefile targets # Makefile targets
# ---------------- # ----------------
@ -202,8 +190,7 @@ gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib
../../gnatmake$(exeext) ../../gnatlink$(exeext) ../../gnatmake$(exeext) ../../gnatlink$(exeext)
# gnattools2 # gnattools2
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
$(TOOLS_FLAGS_TO_PASS_NATIVE) \ $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
$(GNATTOOLS2_FILES)
# gnatmake/link can be built with recent gnatmake/link if they are available. # gnatmake/link can be built with recent gnatmake/link if they are available.
# This is especially convenient for building cross tools or for rebuilding # This is especially convenient for building cross tools or for rebuilding
@ -215,8 +202,7 @@ regnattools: $(GCC_DIR)/stamp-gnatlib
gnatmake-re gnatlink-re gnatmake-re gnatlink-re
# gnattools2 # gnattools2
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
$(TOOLS_FLAGS_TO_PASS_NATIVE) \ $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
$(GNATTOOLS2_FILES)
# For cross builds of gnattools, # For cross builds of gnattools,
# put the host RTS dir first in the PATH to hide the default runtime # put the host RTS dir first in the PATH to hide the default runtime
@ -230,8 +216,7 @@ gnattools-cross: $(GCC_DIR)/stamp-tools
gnatmake-re gnatlink-re gnatmake-re gnatlink-re
# gnattools2 # gnattools2
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
$(TOOLS_FLAGS_TO_PASS_CROSS) \ $(TOOLS_FLAGS_TO_PASS_CROSS) common-tools
$(GNATTOOLS2_FILES)
# Rename cross tools to where the GCC makefile wants them when # Rename cross tools to where the GCC makefile wants them when
# installing. FIXME: installation should be done elsewhere. # installing. FIXME: installation should be done elsewhere.
if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \ if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \