Simulator consolidation

diff --git a/Makefile.in b/Makefile.in
index 668e206..66c88c2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -319,7 +319,7 @@ install-dir.info:
 
 all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
        all-byacc all-flex all-opcodes all-bfd all-ld all-gas all-tgas \
-       all-gcc all-binutils  all-libg++ all-readline all-z8ksim all-h8300sim all-gdb \
+       all-gcc all-binutils  all-libg++ all-readline all-sim all-gdb \
        all-make all-rcs all-cvs all-diff all-grep \
        all-patch all-emacs all-ispell all-etc \
        all-tcl all-tk all-expect \
@@ -333,7 +333,7 @@ all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
 
 
 all.cross: all-libiberty all-mmalloc all-gas all-byacc all-flex all-ld \
-       all-opcodes all-z8ksim all-h8300sim all-bfd all-readline \
+       all-opcodes all-bfd all-readline all-sim \
        all-gdb all-binutils all-gcc all-newlib \
        $(start-sanitize-chill) \
        all-chillrt \
@@ -407,8 +407,7 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
        install-tcl \
        install-texinfo \
        install-tk  \
-       install-z8ksim \
-       install-h8300sim \
+       install-sim \
        install-fileutils install-find install-gawk install-m4 install-sed install-shellutils \
        install-textutils install-time install-wdiff install-uudecode
 
@@ -1133,45 +1132,25 @@ install-expect: force
                true ; \
        fi
 
-### z8ksim
-all-z8ksim: all-bfd 
-       @if [ -f ./z8ksim/Makefile ] ; then \
+### sim
+all-sim: all-bfd 
+       @if [ -f ./sim/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
-               (cd ./z8ksim; \
+               (cd ./sim; \
                $(MAKE) $(FLAGS_TO_PASS) all) ; \
        else \
                true ; \
        fi
 
-install-z8ksim: force
-       @if [ -f ./z8ksim/Makefile ] ; then \
+install-sim: force
+       @if [ -f ./sim/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
-               (cd ./z8ksim; \
+               (cd ./sim; \
                $(MAKE) $(FLAGS_TO_PASS) install) ; \
        else \
                true ; \
        fi
 
-### h8300sim:
-all-h8300sim:  all-bfd 
-       @if [ -f ./h8300sim/Makefile ] ; then \
-               rootme=`pwd` ; export rootme ; \
-               (cd ./h8300sim; \
-               $(MAKE) $(FLAGS_TO_PASS) all) ; \
-       else \
-               true ; \
-       fi
-
-install-h8300sim: force
-       @if [ -f ./h8300sim/Makefile ] ; then \
-               rootme=`pwd` ; export rootme ; \
-               (cd ./h8300sim; \
-               $(MAKE) $(FLAGS_TO_PASS) install) ; \
-       else \
-               true ; \
-       fi
-
-
 ### fileutils
 all-fileutils: force
        @if [ -f ./fileutils/Makefile ] ; then \