libgloss: merge lm32 into top-level Makefile

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.

2 files changed, 7 insertions, 98 deletions

diff --git a/libgloss/lm32/Makefile.in b/libgloss/lm32/Makefile.in
deleted file mode 100644
index dfb6f67dd..000000000
--- 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 000000000..c741e815e
--- /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