[PATCH] libgloss: merge csky configure script up a level

[Mike Frysinger]

Now that the csky-specific logic ($DO) has been deleted, we can fold
it up a level easily enough.
---
 libgloss/Makefile.in       |   16 +-
 libgloss/configure         |    5 +-
 libgloss/configure.ac      |    3 +-
 libgloss/csky/Makefile.in  |    9 +-
 libgloss/csky/aclocal.m4   |  384 ----
 libgloss/csky/configure    | 3932 ------------------------------------
 libgloss/csky/configure.ac |   50 -
 7 files changed, 17 insertions(+), 4382 deletions(-)
 delete mode 100644 libgloss/csky/aclocal.m4
 delete mode 100755 libgloss/csky/configure
 delete mode 100644 libgloss/csky/configure.ac

diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 7c50e73bd5e7..45915e7e2c99 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -42,7 +42,8 @@ case "${target}" in
 	subdirs="$subdirs arc"
 	;;
   csky*-*-*)
-	AC_CONFIG_SUBDIRS(csky)
+	AC_CONFIG_FILES([csky/Makefile])
+	subdirs="$subdirs csky"
 	;;
   epiphany-*-*)
 	AC_CONFIG_FILES([epiphany/Makefile])
diff --git a/libgloss/csky/Makefile.in b/libgloss/csky/Makefile.in
index 911dd40add39..ebf7ef2cd47e 100644
--- a/libgloss/csky/Makefile.in
+++ b/libgloss/csky/Makefile.in
@@ -115,14 +115,11 @@ clean mostlyclean:
 	rm -f a.out core *.i *~ *.a *.o *-test *.srec *.dis *.x *.map
 
 distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
+	rm -f Makefile
 
 info dvi doc:
 install-info:
 clean-info:
 
-Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
+Makefile: Makefile.in ../config.status
+	cd .. && $(SHELL) config.status
diff --git a/libgloss/csky/configure.ac b/libgloss/csky/configure.ac
deleted file mode 100644
index ad29287ecf64..000000000000
--- a/libgloss/csky/configure.ac
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 1995, 1996 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.
-#
-# process this file with autoconf to produce a configure script.
-AC_INIT(crt0.S)
-
-AC_CONFIG_AUX_DIR(../..)
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-LIB_AM_PROG_AS
-
-host_makefile_frag=${srcdir}/../config/default.mh
-target_makefile_frag=${srcdir}/../config/default.mt
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-target_makefile_frag_path=$target_makefile_frag
-AC_SUBST(target_makefile_frag_path)
-AC_SUBST_FILE(target_makefile_frag)
-
-AM_ENABLE_MULTILIB(, ../..)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-- 
2.34.1