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

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 02abac72fc6dcecd3bbbbcf37bd300e20465c5b6..ca8ac2bda47f0054c0f81c14f60e35ee26f46ac5 100644 (file)
--- 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 7f0ce61f5957156dd4b43b7920b6bf697f5c2ed8..e77f9cd958f8cc07655edbde011e5858e22ab3fe 100644 (file)
--- 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