[PATCH] libgloss: merge lm32 into top-level Makefile

[Mike Frysinger <vapier@gentoo.org>]

Avoid a recursive make to speed things up a bit.

This drops the header install logic because the lm32/ subdir doesn't
actually have any header files to install.
---
 libgloss/Makefile.am       |  3 ++
 libgloss/Makefile.in       | 76 +++++++++++++++++++++--------
 libgloss/configure         | 19 ++++++--
 libgloss/configure.ac      |  5 +-
 libgloss/lm32/Makefile.in  | 98 --------------------------------------
 libgloss/lm32/Makefile.inc |  7 +++
 6 files changed, 82 insertions(+), 126 deletions(-)
 delete mode 100644 libgloss/lm32/Makefile.in
 create mode 100644 libgloss/lm32/Makefile.inc

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index ac536ee183fe..43da838f0f39 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -68,6 +68,9 @@ endif
 if CONFIG_LIBNOSYS
 include libnosys/Makefile.inc
 endif
+if CONFIG_LM32
+include lm32/Makefile.inc
+endif
 if CONFIG_WINCE
 include wince/Makefile.inc
 endif
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 6ed848dd563a..3d8d2b031d09 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -147,8 +147,7 @@ case "${target}" in
 	subdirs="$subdirs ft32"
 	;;
   lm32*-*-*)
-	AC_CONFIG_FILES([lm32/Makefile])
-	subdirs="$subdirs lm32"
+	config_lm32=true
 	;;
   mcore-*-*)
 	AC_CONFIG_FILES([mcore/Makefile])
@@ -240,7 +239,7 @@ esac
 dnl These subdirs have converted to non-recursive make.  Hopefully someday all
 dnl the ports above will too!
 m4_foreach_w([SUBDIR], [
-  bfin iq2000 libnosys wince
+  bfin iq2000 libnosys lm32 wince
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])
diff --git a/libgloss/lm32/Makefile.in b/libgloss/lm32/Makefile.in
deleted file mode 100644
index dfb6f67dd437..000000000000
--- a/libgloss/lm32/Makefile.in
+++ /dev/null
@@ -1,98 +0,0 @@
-
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-OBJS        = isatty.o scall.o 
-SCRIPTS     = sim.ld  
-CRT0S       = crt0.o 
-BSPS        = libgloss.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0S) $(BSPS)
-
-libgloss.a: $(OBJS)
-	${AR} ${ARFLAGS} $@ $(OBJS)
-	${RANLIB} $@
-
-#
-# Standard targets
-#
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile *~
-
-.PHONY: install info install-info clean-info
-install: install-scripts # install-includes 
-	@for crt0 in ${CRT0S}; do\
-	 $(INSTALL_PROGRAM) $${crt0} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-	@for bsp in ${BSPS}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-
-install-includes:
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/excess; \
-	for i in $(srcdir)/*.h; do \
-	 $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/excess/`basename $$i`; \
-	done; 
-	
-install-scripts:
-	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) ${srcdir}/$${script} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-	
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status
diff --git a/libgloss/lm32/Makefile.inc b/libgloss/lm32/Makefile.inc
new file mode 100644
index 000000000000..c741e815ed8b
--- /dev/null
+++ b/libgloss/lm32/Makefile.inc
@@ -0,0 +1,7 @@
+multilibtool_DATA += %D%/crt0.o %D%/sim.ld
+multilibtool_LIBRARIES += %D%/libgloss.a
+libobjs_a_SOURCES += %D%/crt0.S
+
+%C%_libgloss_a_SOURCES = \
+	%D%/isatty.c \
+	%D%/scall.S
-- 
2.34.1