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

gcc/ada/ChangeLog

+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

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

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)