From c336d2c7ff465c4f262122895710874afa422e8c Mon Sep 17 00:00:00 2001 From: Thomas Quinot Date: Tue, 5 Aug 2008 13:29:05 +0000 Subject: [PATCH] Makefile.in (gnatlib*): Now depend on oscons target. * Makefile.in (gnatlib*): Now depend on oscons target. (oscons): New target. From-SVN: r138706 --- libada/ChangeLog | 5 +++++ libada/Makefile.in | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libada/ChangeLog b/libada/ChangeLog index 6c60719ec31..7e8be0a080f 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,8 @@ +2008-08-05 Thomas Quinot + + * Makefile.in (gnatlib*): Now depend on oscons target. + (oscons): New target. + 2008-08-01 Paolo Bonzini * configure.ac (warn_cflags): Substitute. diff --git a/libada/Makefile.in b/libada/Makefile.in index 5e5792db559..452723b7a40 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -68,10 +68,10 @@ FLAGS_TO_PASS = \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" # Rules to build gnatlib. -.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared +.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons gnatlib: @default_gnatlib_target@ -gnatlib-plain: $(GCC_DIR)/ada/Makefile +gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ GNATLIBFLAGS="$(GNATLIBFLAGS)" \ @@ -82,7 +82,7 @@ gnatlib-plain: $(GCC_DIR)/ada/Makefile gnatlib \ && touch stamp-libada -gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile +gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ GNATLIBFLAGS="$(GNATLIBFLAGS)" \ @@ -93,6 +93,9 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile $@ \ && touch stamp-libada +oscons: + $(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" ada/s-oscons.ads + # Check uninstalled version. check: