The previous patch is further cleaned up by removing the osconstool
target in libada/Makefile.in which was hard to maintain.
Tested on x86_64-pc-linux-gnu, committed on trunk.
libada/
* Makefile.in (osconstool): Removed, no longer needed.
ada/
* gcc-interface/Makefile.in: Improve handling of s-oscons.ads.
--
Index: libada/Makefile.in
===================================================================
--- libada/Makefile.in (revision 193215)
+++ libada/Makefile.in (working copy)
@@ -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: osconstool $(GCC_DIR)/ada/Makefile
+gnatlib-plain: $(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: osconstool $(GCC_DIR)/ada
$(LN_S) $(ADA_RTS_DIR) adainclude
$(LN_S) $(ADA_RTS_DIR) adalib
-gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
+gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
&& touch stamp-libada
@@ -112,9 +112,6 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared:
$(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
-
install-gnatlib: $(GCC_DIR)/ada/Makefile
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
Index: gcc-interface/Makefile.in
===================================================================
--- gcc-interface/Makefile.in (revision 193215)
+++ gcc-interface/Makefile.in (working copy)
@@ -2577,13 +2604,14 @@
$(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));)
# Copy tsystem.h
$(CP) $(srcdir)/tsystem.h $(RTSDIR)
-# Copy generated target dependent sources
- $(RM) $(RTSDIR)/s-oscons.ads
- (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads)
$(RM) ../stamp-gnatlib-$(RTSDIR)
touch ../stamp-gnatlib1-$(RTSDIR)
-gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR)
+$(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR)
+ $(RM) $(RTSDIR)/s-oscons.ads
+ (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads)
+
+gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR)
$(RTSDIR)/s-oscons.ads
# C files
$(MAKE) -C $(RTSDIR) \
CC="`echo \"$(GCC_FOR_TARGET)\" \
