newlib: switch to multilib.am

We use the common config-ml.in for configure, so switch the makefile
over to the common multilib.am.  It's almost exactly the same code,
but there are two differences:
* Common code hooks install-exec-local for install-multi, but newlib
  doesn't currently install any executables, so that doesn't fire.
  Newlib already has install-data-local that inlined install-multi,
  so switch that to the common install-multi.
* Common code doesn't provide a check-multi at all.  Keep ours for
  now.  Some day common code might get it.  Or not.  Who knows.

1 files changed, 5 insertions, 31 deletions

diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 6a28215d3..6edc9abc2 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -7,14 +7,6 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 PHONY =
 noinst_DATA =
 
-# Multilib support variables.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
 LIBTOOL_VERSION_INFO = 0:0:0
 
 # The newlib hardware floating-point routines have been disabled due to
@@ -312,13 +304,15 @@ stmp-targ-include: config.status
 
 CLEANFILES = stmp-targ-include
 
-install-data-local:	install-toollibLIBRARIES
+## We hook install-multi because this Makefile doesn't have any exec targets,
+## only data targets.  If that ever changes, this should be removed and the
+## install-exec-local in ../multilib.am will kick in.
+install-data-local: install-toollibLIBRARIES install-multi
 if USE_LIBTOOL
 else
 	rm -f $(DESTDIR)$(toollibdir)/libg.a
 	ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
 endif
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
 	-if [ -z "$(MULTISUBDIR)" ]; then \
 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \
 	  for i in $(srcdir)/libc/include/*.h; do \
@@ -442,30 +436,10 @@ install-man:
 
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 
-# Multilib support.
-PHONY += all-multi check-multi mostlyclean-multi clean-multi distclean-multi \
-	maintainer-clean-multi
-
-all-recursive: all-multi
-check-recursive: check-multi
-mostlyclean-recursive: mostlyclean-multi
-clean-recursive: clean-multi
-distclean-recursive: distclean-multi
-maintainer-clean-recursive: maintainer-clean-multi
+include ../multilib.am
 
-# The $(MAKE) comments below are to enable parallel building.
-all-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
 check-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=check multi-do # $(MAKE)
-mostlyclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
-distclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
-maintainer-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
 
 MAKEOVERRIDES=