summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@act-europe.fr>2004-04-26 16:52:20 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2004-04-26 16:52:20 +0200
commitcad79eea440a6d89539fc6857d2e35fd90a2161a (patch)
tree09d6cb693cc4db141298c70f6fbd48c2db45e55f /libada
parent6489430a366bee49048c0fb442997f2f9ca81381 (diff)
downloadgcc-cad79eea440a6d89539fc6857d2e35fd90a2161a.tar.gz
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
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog5
-rw-r--r--libada/Makefile.in32
2 files changed, 9 insertions, 28 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 02abac72fc6..ca8ac2bda47 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -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
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 7f0ce61f595..e77f9cd958f 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -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:
- $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
- GNATMAKE=../gnatmake-cross \
- rts-zfp
-
-rts-ravenscar:
+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