[PATCH 4/4] libgloss: merge d30v into top-level Makefile

Avoid a recursive make to speed things up a bit.
---
 libgloss/Makefile.am       |   3 +
 libgloss/Makefile.in       | 112 +++++++++++++++++++++++---------
 libgloss/configure         |  19 ++++--
 libgloss/configure.ac      |   5 +-
 libgloss/d30v/Makefile.in  | 129 -------------------------------------
 libgloss/d30v/Makefile.inc |  12 ++++
 6 files changed, 112 insertions(+), 168 deletions(-)
 delete mode 100644 libgloss/d30v/Makefile.in
 create mode 100644 libgloss/d30v/Makefile.inc

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index f5016dcd4b3e..9d047b255582 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -72,6 +72,9 @@ endif
 if CONFIG_BFIN
 include bfin/Makefile.inc
 endif
+if CONFIG_D30V
+include d30v/Makefile.inc
+endif
 if CONFIG_IQ2000
 include iq2000/Makefile.inc
 endif
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index ef7b57854bd8..59230edc9917 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -141,8 +141,7 @@ case "${target}" in
 	subdirs="$subdirs crx"
 	;;
   d30v-*-*)
-	AC_CONFIG_FILES([d30v/Makefile])
-	subdirs="$subdirs d30v"
+	config_d30v=true
 	;;
   fr30-*-*)
 	AC_CONFIG_FILES([fr30/Makefile])
@@ -250,7 +249,7 @@ AC_SUBST(subdirs)
 dnl These subdirs have converted to non-recursive make.  Hopefully someday all
 dnl the ports above will too!
 m4_foreach_w([SUBDIR], [
-  aarch64 arc arm bfin iq2000 libnosys lm32 riscv wince
+  aarch64 arc arm bfin d30v iq2000 libnosys lm32 riscv wince
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])
diff --git a/libgloss/d30v/Makefile.in b/libgloss/d30v/Makefile.in
deleted file mode 100644
index a27e720ff8bb..000000000000
--- a/libgloss/d30v/Makefile.in
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (c) 1997 Cygnus Support
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-#
-
-#
-# This currently works with the D30V simulator.
-#
-
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL =	/bin/sh
-
-mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs
-
-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 print.o putnum.o sbrk.o
-CFLAGS		= -g
-SCRIPTS		= ${SIM_SCRIPTS}
-
-# Here is all of the simulator stuff
-SIM_SCRIPTS	=
-SIM_LDFLAGS	=
-SIM_BSP		= libsim.a
-SIM_CRT0	= crt0.o
-SIM_OBJS	= syscalls.o outbyte.o inbyte.o
-SIM_TEST	=
-SIM_INSTALL	= install-sim
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-all: 	${SIM_CRT0} ${SIM_BSP}
-
-#
-# here's where we build the board support packages for each target
-#
-
-${SIM_BSP}: ${OBJS} ${SIM_OBJS}
-	${AR} ${ARFLAGS} $@ ${SIM_OBJS} ${OBJS}
-	${RANLIB} $@
-
-#
-# here's where we build the test programs for each target
-#
-.PHONY: test
-test:	${SIM_TEST}
-
-crt0.o: crt0.S
-syscalls.o: syscalls.c $(srcdir)/../syscall.h
-outbyte.o: outbyte.c
-inbyte.o: inbyte.c
-
-isatty.o: $(srcdir)/../isatty.c
-print.o: $(srcdir)/../print.c
-putnum.o: $(srcdir)/../putnum.c
-sbrk.o: $(srcdir)/../sbrk.c
-
-clean mostlyclean:
-	rm -f a.out core *.[oais] *-test *.srec *.dis *.x syscall.h
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile *~
-
-.PHONY: install info install-info clean-info
-install: ${SIM_INSTALL}
-
-install-sim:
-	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
-	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status
diff --git a/libgloss/d30v/Makefile.inc b/libgloss/d30v/Makefile.inc
new file mode 100644
index 000000000000..2b12739d749f
--- /dev/null
+++ b/libgloss/d30v/Makefile.inc
@@ -0,0 +1,12 @@
+multilibtool_LIBRARIES += %D%/libsim.a
+%C%_libsim_a_SOURCES = \
+	isatty.c \
+	print.c \
+	putnum.c \
+	sbrk.c \
+	%D%/inbyte.c \
+	%D%/outbyte.c \
+	%D%/syscalls.c
+
+multilibtool_DATA += \
+	%D%/crt0.o
-- 
2.38.1