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

Avoid a recursive make to speed things up a bit.
---
 libgloss/Makefile.am         |   3 +
 libgloss/Makefile.in         | 181 +++++++++++++++++++++++++++++----
 libgloss/aclocal.m4          |  20 ++++
 libgloss/configure           | 189 +++++++++++++++++++++++++++++++----
 libgloss/configure.ac        |   7 +-
 libgloss/iq2000/Makefile.in  | 149 ---------------------------
 libgloss/iq2000/Makefile.inc |  11 ++
 7 files changed, 368 insertions(+), 192 deletions(-)
 delete mode 100644 libgloss/iq2000/Makefile.in
 create mode 100644 libgloss/iq2000/Makefile.inc

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 1209ec9d8d85..42d7b7ffb4b8 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -53,6 +53,9 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 if HAVE_DOC
 include doc/Makefile.inc
 endif
+if CONFIG_IQ2000
+include iq2000/Makefile.inc
+endif
 if CONFIG_LIBNOSYS
 include libnosys/Makefile.inc
 endif
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 1c04d92a44aa..21871f954444 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -207,8 +207,7 @@ case "${target}" in
 	config_testsuite=false
 	;;
   iq2000-*-*)
-	AC_CONFIG_FILES([iq2000/Makefile])
-	subdirs="$subdirs iq2000"
+	config_iq2000=true
 	;;
   or1k-*-* | or1knd-*-* )
 	AC_CONFIG_FILES([or1k/Makefile])
@@ -224,6 +223,8 @@ case "${target}" in
 	;;
 esac
 
+AM_CONDITIONAL(CONFIG_IQ2000, test x$config_iq2000 = xtrue)
+
 dnl For now, don't bother configuring testsuite
 dnl
 dnl if test "${config_testsuite}" = "true";
@@ -241,7 +242,7 @@ AC_SUBST(AR)
 LD=${LD-ld}
 AC_SUBST(LD)
 AC_PROG_RANLIB
-LIB_AM_PROG_AS
+AM_PROG_AS
 
 AC_DEFINE(HAVE_GNU_LD, 1, [Using GNU LD])
 
diff --git a/libgloss/iq2000/Makefile.inc b/libgloss/iq2000/Makefile.inc
new file mode 100644
index 000000000000..97c91421cbed
--- /dev/null
+++ b/libgloss/iq2000/Makefile.inc
@@ -0,0 +1,11 @@
+multilibtool_DATA += %D%/crt0.o %D%/sim.ld
+multilibtool_LIBRARIES += %D%/libeval.a
+libobjs_a_SOURCES += %D%/crt0.S %D%/test.o
+
+%C%_libeval_a_SOURCES = \
+	%D%/_exit.c %D%/access.c %D%/chmod.c %D%/close.c %D%/crt1.c \
+	%D%/fstat.c %D%/getpid.c %D%/gettime.c %D%/isatty.c \
+	%D%/kill.c %D%/lseek.c %D%/open.c %D%/read.c \
+	%D%/sbrk.c %D%/stat.c %D%/time.c %D%/trap.c %D%/unlink.c %D%/utime.c %D%/write.c
+
+check_PROGRAMS += %D%/test
-- 
2.34.1