(toplev)

[platform/upstream/binutils.git] / Makefile.tpl

diff --git a/Makefile.tpl b/Makefile.tpl
index 31ee233..ce1ef74 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -372,6 +372,10 @@ all: all.normal
 .PHONY: all
 
 #### host and target specific makefile fragments come in here.
+@target_makefile_frag@
+@alphaieee_frag@
+@ospace_frag@
+@host_makefile_frag@
 ###
 
 # Flags to pass down to all sub-makes.
@@ -643,7 +647,7 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f multilib.out multilib.ts multilib.tmp
+       -rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
@@ -1413,14 +1417,13 @@ multilib.ts: maybe-all-gcc
 $(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
        cd $(srcdir) && autogen Makefile.def
 
-# with the gnu make, this is done automatically.
-
-host_makefile_frag=@host_makefile_frag@
-target_makefile_frag=@target_makefile_frag@
-
-Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger)
-       $(SHELL) ./config.status
+# Rebuilding Makefile.
+Makefile: Makefile.in configure $(gcc_version_trigger)
+       $(SHELL) ./config.status --recheck
 
+# Rebuilding configure.
+configure: configure.in
+       cd $(srcdir) && autoconf
 #
 
 .NOEXPORT: