Makefile.in, [...]: Revert previous change, not needed after all.

2008-08-08  Thomas Quinot  <quinot@adacore.com>

	* gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Revert
	previous change, not needed after all.

From-SVN: r138871

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e275cd38897558bdc1f2e82e7cdb09f20444bb7a..eda74581182783129baaea6f6e3f8b5a7c537696 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-08  Thomas Quinot  <quinot@adacore.com>
+
+       * gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Revert
+       previous change, not needed after all.
+
 2008-08-08  Ed Schonberg  <schonberg@adacore.com>
 
        * exp_ch4.adb (Expand_Allocator_Expression): add check if null

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 9af841d291595a40fced46ceccb823b686e1d9ef..cff834b5e1db3a9483e2adaad59a3fc453ff685c 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -938,7 +938,7 @@ OSCONS_CPP=$(GCC_FOR_TARGET) -E -C \
 OSCONS_EXTRACT=$(GCC_FOR_TARGET) -S s-oscons-tmplt.i
 endif
 
-ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb
+ada/s-oscons.ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb
        -$(MKDIR) ada/bldtools/oscons
        $(RM) $(addprefix ada/bldtools/oscons/,$(notdir $^))
        $(CP) $^ ada/bldtools/oscons
@@ -947,8 +947,8 @@ ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons
                $(OSCONS_CPP) ; \
                $(OSCONS_EXTRACT) ; \
                ./xoscons ; \
-               $(RM) ../../s-oscons-$(THREAD_KIND).ads ; \
-               $(CP) s-oscons.ads ../../s-oscons-$(THREAD_KIND).ads)
+               $(RM) ../../s-oscons.ads ; \
+               $(CP) s-oscons.ads ../../s-oscons.ads)
 
 update-sources : ada/treeprs.ads ada/einfo.h ada/sinfo.h ada/nmake.adb \
        ada/nmake.ads

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 49a32cc917154cc5424d0879b85f60073e182690..ac5955e1e11a327cf5e0fdc990fd57b4cef2fd86 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1931,7 +1931,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
                        $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));)
 # Copy generated target dependent sources
        $(RM) $(RTSDIR)/s-oscons.ads
-       (cd $(RTSDIR); $(LN_S) ../s-oscons-$(THREAD_KIND).ads s-oscons.ads)
+       (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads)
        $(RM) ../stamp-gnatlib-$(RTSDIR)
        touch ../stamp-gnatlib1-$(RTSDIR)