diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2008-05-20 12:50:26 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-05-20 14:50:26 +0200 |
| commit | eede5a0d7a073f4a546bed31b2fafc616f9002fd (patch) | |
| tree | 35f0d979405dedea881284828b59abf5ceaa9e5f /gnattools | |
| parent | 3393111257f2c11710a7dc704846581a481c0309 (diff) | |
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
Diffstat (limited to 'gnattools')
| -rw-r--r-- | gnattools/ChangeLog | 5 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 21 |
2 files changed, 8 insertions, 18 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 7375dbea33b..c9685f81db2 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -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> PR ada/31808 diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 4c50d6e1cce..46da2df8ba7 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -146,18 +146,6 @@ TOOLS_FLAGS_TO_PASS_CROSS= \ EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@ 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 # ---------------- @@ -202,8 +190,7 @@ gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib ../../gnatmake$(exeext) ../../gnatlink$(exeext) # gnattools2 $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ - $(TOOLS_FLAGS_TO_PASS_NATIVE) \ - $(GNATTOOLS2_FILES) + $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools # gnatmake/link can be built with recent gnatmake/link if they are available. # This is especially convenient for building cross tools or for rebuilding @@ -215,8 +202,7 @@ regnattools: $(GCC_DIR)/stamp-gnatlib gnatmake-re gnatlink-re # gnattools2 $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ - $(TOOLS_FLAGS_TO_PASS_NATIVE) \ - $(GNATTOOLS2_FILES) + $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools # For cross builds of gnattools, # 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 # gnattools2 $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ - $(TOOLS_FLAGS_TO_PASS_CROSS) \ - $(GNATTOOLS2_FILES) + $(TOOLS_FLAGS_TO_PASS_CROSS) common-tools # Rename cross tools to where the GCC makefile wants them when # installing. FIXME: installation should be done elsewhere. if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \ |