Makefile.in: Put back merge of some targets to avoid code duplication.

* Makefile.in: Put back merge of some targets to avoid code duplication.
	Remove at the same obsolete variable GNATLIBLDFLAGS.

From-SVN: r81192
This commit is contained in:
Arnaud Charlet 2004-04-26 16:52:20 +02:00 committed by Arnaud Charlet
parent 6489430a36
commit cad79eea44
2 changed files with 9 additions and 28 deletions

View File

@ -1,3 +1,8 @@
2004-04-26 Arnaud Charlet <charlet@act-europe.fr>
* Makefile.in: Put back merge of some targets to avoid code duplication.
Remove at the same obsolete variable GNATLIBLDFLAGS.
2004-04-19 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.ac: Fix stupid brain-fade; set default_gnattools_target

View File

@ -130,44 +130,20 @@ gnatlib-plain:
TRACE="$(TRACE)" \
gnatlib
gnatlib-sjlj:
gnatlib-sjlj gnatlib-zcx gnatlib-shared:
$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
THREAD_KIND="$(THREAD_KIND)" \
TRACE="$(TRACE)" \
gnatlib-sjlj
gnatlib-zcx:
$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
THREAD_KIND="$(THREAD_KIND)" \
TRACE="$(TRACE)" \
gnatlib-zcx
gnatlib-shared:
$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
THREAD_KIND="$(THREAD_KIND)" \
TRACE="$(TRACE)" \
gnatlib-shared
$@
.PHONY: rts-zfp rts-ravenscar
rts-zfp:
rts-zfp rts-ravenscar:
$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
GNATMAKE=../gnatmake-cross \
rts-zfp
rts-ravenscar:
$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
GNATMAKE=../gnatmake-cross \
rts-ravenscar
$@
# Rules to build gnattools.
.PHONY: gnattools gnattools-native gnattools-cross regnattools