Makefile.in (osconstool): Revert previous change, still needed after all.

	* Makefile.in (osconstool): Revert previous change, still needed
	after all. Add call to copy-s-oscons target.

From-SVN: r193240

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 6c4a5c85ed56ccd4f164d4575aa956b6d2b198b0..6172aad82cc240e43a3f8b272bbbcd7c5fa48073 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-30  Arnaud Charlet  <charlet@adacore.com>
+
+       * Makefile.in (osconstool): Revert previous change, still needed
+       after all. Add call to copy-s-oscons target.
+
 2012-10-30  Arnaud Charlet  <charlet@adacore.com>
 
        * Makefile.in (osconstool): Removed, no longer needed.

diff --git a/libada/Makefile.in b/libada/Makefile.in
index 2b778e0c98e045acc9eb0772e35611321a60bf5a..863b136fc85150350dc116de88346362473c9af6 100644 (file)
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -94,7 +94,7 @@ LIBADA_FLAGS_TO_PASS = \
 .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
 gnatlib: @default_gnatlib_target@
 
-gnatlib-plain: $(GCC_DIR)/ada/Makefile
+gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
        test -f stamp-libada || \
        $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
        && touch stamp-libada
@@ -103,7 +103,7 @@ gnatlib-plain: $(GCC_DIR)/ada/Makefile
        $(LN_S) $(ADA_RTS_DIR) adainclude
        $(LN_S) $(ADA_RTS_DIR) adalib
 
-gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile
+gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
        test -f stamp-libada || \
        $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
        && touch stamp-libada
@@ -112,6 +112,10 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile
        $(LN_S) $(ADA_RTS_DIR) adainclude
        $(LN_S) $(ADA_RTS_DIR) adalib
 
+osconstool:
+       $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads
+       $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) copy-s-oscons
+
 install-gnatlib: $(GCC_DIR)/ada/Makefile
        $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib