From 612e38f1c6c6cda325c4082fe4f4396168fab142 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Fri, 2 Sep 2016 22:17:51 +0200
Subject: [PATCH] Remove the old make-based build system, plus some big chunks
 of horribly obsolete protomake build system.

---
 Makefile                         | 105 -----------
 first/core.mk                    | 219 ----------------------
 first/cp_dir                     |  18 --
 first/create_dir                 |  13 --
 first/em_path.h.src              |  11 --
 first/first                      | 208 ---------------------
 first/get_answer                 |   7 -
 first/get_makepars               | 106 -----------
 first/get_sys                    | 157 ----------------
 first/get_sysvax                 |  23 ---
 first/install_tail               |  93 ----------
 first/limit_enquire              | 209 ---------------------
 first/limit_impl                 | 208 ---------------------
 first/lint_params                |  19 --
 first/local.h.src                |  19 --
 first/mk_config                  | 133 --------------
 first/mk_makefile                |  35 ----
 first/mk_target                  |  41 -----
 first/target_comp                |  28 ---
 first/util_comp                  |  23 ---
 lang/basic/build.mk              |   3 -
 lang/basic/lib/build.mk          |  48 -----
 lang/basic/src/build.mk          |  44 -----
 lang/cem/build.mk                |   6 -
 lang/cem/cemcom.ansi/build.mk    | 156 ----------------
 lang/cem/cpp.ansi/build.mk       | 104 -----------
 lang/cem/libcc.ansi/build.mk     | 275 ----------------------------
 lang/m2/build.mk                 |   3 -
 lang/m2/comp/build.mk            | 129 -------------
 lang/m2/libm2/build.mk           | 103 -----------
 lang/pc/build.mk                 |   3 -
 lang/pc/comp/build.mk            | 132 --------------
 lang/pc/libpc/build.mk           |  92 ----------
 mach/i386/build.mk               |  53 ------
 mach/i80/build.mk                |  47 -----
 mach/i86/build.mk                |  68 -------
 mach/m68020/build.mk             |  33 ----
 mach/powerpc/build.mk            |   0
 mach/proto/as/build.mk           |  43 -----
 mach/proto/cg/build.mk           |  46 -----
 mach/proto/ncg/build.mk          |  48 -----
 mach/proto/top/build.mk          |  15 --
 mach/vc4/build.mk                |  11 --
 modules/h/proto.make             |  33 ----
 modules/src/alloc/build.mk       |  23 ---
 modules/src/alloc/proto.make     |  87 ---------
 modules/src/assert/proto.make    |  43 -----
 modules/src/em_code/build.mk     |  92 ----------
 modules/src/em_code/proto.make   | 128 -------------
 modules/src/em_data/build.mk     |  34 ----
 modules/src/em_data/proto.make   |  49 -----
 modules/src/em_mes/build.mk      |  26 ---
 modules/src/em_mes/proto.make    | 110 ------------
 modules/src/em_opt/proto.make    | 241 -------------------------
 modules/src/flt_arith/build.mk   |  29 ---
 modules/src/flt_arith/proto.make | 117 ------------
 modules/src/idf/build.mk         |  14 --
 modules/src/idf/proto.make       |  29 ---
 modules/src/input/build.mk       |  20 ---
 modules/src/input/proto.make     |  52 ------
 modules/src/malloc/proto.make    |  53 ------
 modules/src/object/build.mk      |  27 ---
 modules/src/object/proto.make    |  95 ----------
 modules/src/print/build.mk       |  22 ---
 modules/src/print/proto.make     |  62 -------
 modules/src/read_em/build.mk     |  54 ------
 modules/src/read_em/proto.make   | 123 -------------
 modules/src/string/build.mk      |  19 --
 modules/src/string/proto.make    | 110 ------------
 modules/src/system/build.mk      |  29 ---
 modules/src/system/proto.make    | 109 -----------
 plat/build.mk                    |  68 -------
 plat/cpm/build.mk                |  42 -----
 plat/linux/libsys/build.mk       |  27 ---
 plat/linux386/build.mk           |  28 ---
 plat/linux68k/build.mk           |  25 ---
 plat/linuxppc/build.mk           |  31 ----
 plat/pc86/build.mk               |  38 ----
 plat/rpi/build.mk                |  52 ------
 util/LLgen/build.mk              |  56 ------
 util/ack/build.mk                |  57 ------
 util/ack/proto.make              | 187 -------------------
 util/amisc/build.mk              |  23 ---
 util/amisc/proto.make            |  48 -----
 util/arch/build.mk               |  24 ---
 util/arch/proto.make             |  62 -------
 util/cgg/build.mk                |  25 ---
 util/cmisc/build.mk              |  32 ----
 util/cmisc/proto.make            |  69 -------
 util/ego/bo/proto.make           |  77 --------
 util/ego/build.mk                | 205 ---------------------
 util/ego/ca/proto.make           |  89 ---------
 util/ego/cf/proto.make           | 117 ------------
 util/ego/cj/proto.make           |  76 --------
 util/ego/cs/proto.make           | 251 --------------------------
 util/ego/descr/proto.make        |  79 --------
 util/ego/em_ego/proto.make       |  43 -----
 util/ego/ic/proto.make           | 137 --------------
 util/ego/il/proto.make           | 223 -----------------------
 util/ego/lv/proto.make           |  84 ---------
 util/ego/ra/proto.make           | 234 ------------------------
 util/ego/share/proto.make        | 241 -------------------------
 util/ego/sp/proto.make           |  75 --------
 util/ego/sr/proto.make           | 176 ------------------
 util/ego/ud/proto.make           | 158 ----------------
 util/led/build.mk                |  34 ----
 util/misc/build.mk               |  49 -----
 util/ncgg/build.mk               |  43 -----
 util/ncgg/proto.make             | 255 --------------------------
 util/opt/build.mk                |  84 ---------
 util/opt/proto.make              | 300 -------------------------------
 util/topgen/build.mk             |  50 ------
 util/topgen/proto.make           |  60 -------
 113 files changed, 9001 deletions(-)
 delete mode 100644 first/core.mk
 delete mode 100755 first/cp_dir
 delete mode 100755 first/create_dir
 delete mode 100644 first/em_path.h.src
 delete mode 100755 first/first
 delete mode 100755 first/get_answer
 delete mode 100755 first/get_makepars
 delete mode 100755 first/get_sys
 delete mode 100755 first/get_sysvax
 delete mode 100644 first/install_tail
 delete mode 100644 first/limit_enquire
 delete mode 100755 first/limit_impl
 delete mode 100644 first/lint_params
 delete mode 100644 first/local.h.src
 delete mode 100755 first/mk_config
 delete mode 100755 first/mk_makefile
 delete mode 100755 first/mk_target
 delete mode 100644 first/target_comp
 delete mode 100644 first/util_comp
 delete mode 100644 lang/basic/build.mk
 delete mode 100644 lang/basic/lib/build.mk
 delete mode 100644 lang/basic/src/build.mk
 delete mode 100644 lang/cem/build.mk
 delete mode 100644 lang/cem/cemcom.ansi/build.mk
 delete mode 100644 lang/cem/cpp.ansi/build.mk
 delete mode 100644 lang/cem/libcc.ansi/build.mk
 delete mode 100644 lang/m2/build.mk
 delete mode 100644 lang/m2/comp/build.mk
 delete mode 100644 lang/m2/libm2/build.mk
 delete mode 100644 lang/pc/build.mk
 delete mode 100644 lang/pc/comp/build.mk
 delete mode 100644 lang/pc/libpc/build.mk
 delete mode 100644 mach/i386/build.mk
 delete mode 100644 mach/i80/build.mk
 delete mode 100644 mach/i86/build.mk
 delete mode 100644 mach/m68020/build.mk
 delete mode 100644 mach/powerpc/build.mk
 delete mode 100644 mach/proto/as/build.mk
 delete mode 100644 mach/proto/cg/build.mk
 delete mode 100644 mach/proto/ncg/build.mk
 delete mode 100644 mach/proto/top/build.mk
 delete mode 100644 mach/vc4/build.mk
 delete mode 100644 modules/h/proto.make
 delete mode 100644 modules/src/alloc/build.mk
 delete mode 100644 modules/src/alloc/proto.make
 delete mode 100644 modules/src/assert/proto.make
 delete mode 100644 modules/src/em_code/build.mk
 delete mode 100644 modules/src/em_code/proto.make
 delete mode 100644 modules/src/em_data/build.mk
 delete mode 100644 modules/src/em_data/proto.make
 delete mode 100644 modules/src/em_mes/build.mk
 delete mode 100644 modules/src/em_mes/proto.make
 delete mode 100644 modules/src/em_opt/proto.make
 delete mode 100644 modules/src/flt_arith/build.mk
 delete mode 100644 modules/src/flt_arith/proto.make
 delete mode 100644 modules/src/idf/build.mk
 delete mode 100644 modules/src/idf/proto.make
 delete mode 100644 modules/src/input/build.mk
 delete mode 100644 modules/src/input/proto.make
 delete mode 100644 modules/src/malloc/proto.make
 delete mode 100644 modules/src/object/build.mk
 delete mode 100644 modules/src/object/proto.make
 delete mode 100644 modules/src/print/build.mk
 delete mode 100644 modules/src/print/proto.make
 delete mode 100644 modules/src/read_em/build.mk
 delete mode 100644 modules/src/read_em/proto.make
 delete mode 100644 modules/src/string/build.mk
 delete mode 100644 modules/src/string/proto.make
 delete mode 100644 modules/src/system/build.mk
 delete mode 100644 modules/src/system/proto.make
 delete mode 100644 plat/build.mk
 delete mode 100644 plat/cpm/build.mk
 delete mode 100644 plat/linux/libsys/build.mk
 delete mode 100644 plat/linux386/build.mk
 delete mode 100644 plat/linux68k/build.mk
 delete mode 100644 plat/linuxppc/build.mk
 delete mode 100644 plat/pc86/build.mk
 delete mode 100644 plat/rpi/build.mk
 delete mode 100644 util/LLgen/build.mk
 delete mode 100644 util/ack/build.mk
 delete mode 100644 util/ack/proto.make
 delete mode 100644 util/amisc/build.mk
 delete mode 100644 util/amisc/proto.make
 delete mode 100644 util/arch/build.mk
 delete mode 100644 util/arch/proto.make
 delete mode 100644 util/cgg/build.mk
 delete mode 100644 util/cmisc/build.mk
 delete mode 100644 util/cmisc/proto.make
 delete mode 100644 util/ego/bo/proto.make
 delete mode 100644 util/ego/build.mk
 delete mode 100644 util/ego/ca/proto.make
 delete mode 100644 util/ego/cf/proto.make
 delete mode 100644 util/ego/cj/proto.make
 delete mode 100644 util/ego/cs/proto.make
 delete mode 100644 util/ego/descr/proto.make
 delete mode 100644 util/ego/em_ego/proto.make
 delete mode 100644 util/ego/ic/proto.make
 delete mode 100644 util/ego/il/proto.make
 delete mode 100644 util/ego/lv/proto.make
 delete mode 100644 util/ego/ra/proto.make
 delete mode 100644 util/ego/share/proto.make
 delete mode 100644 util/ego/sp/proto.make
 delete mode 100644 util/ego/sr/proto.make
 delete mode 100644 util/ego/ud/proto.make
 delete mode 100644 util/led/build.mk
 delete mode 100644 util/misc/build.mk
 delete mode 100644 util/ncgg/build.mk
 delete mode 100644 util/ncgg/proto.make
 delete mode 100644 util/opt/build.mk
 delete mode 100644 util/opt/proto.make
 delete mode 100644 util/topgen/build.mk
 delete mode 100644 util/topgen/proto.make

diff --git a/Makefile b/Makefile
index 33362a470..db2297cb7 100644
--- a/Makefile
+++ b/Makefile
@@ -98,108 +98,3 @@ $(BUILDDIR)/build.$(BUILDSYSTEM): first/ackbuilder.lua Makefile $(BUILD_FILES)
 clean:
 	@rm -rf $(BUILDDIR)
 
-#
-#CC = gcc
-#AR = ar
-#RM = rm -f
-#CP = cp
-#
-#hide = @
-#
-#CFLAGS += \
-#	-I$(INCDIR) \
-#	-Imodules/h \
-#	-Ih
-#
-#LDFLAGS +=
-#
-#ACKFLAGS = -Ih
-#
-#all: installables
-#
-#.DELETE_ON_ERROR:
-#
-#include first/core.mk
-#
-#include modules/src/object/build.mk
-#include modules/src/alloc/build.mk
-#include modules/src/input/build.mk
-#include modules/src/idf/build.mk
-#include modules/src/system/build.mk
-#include modules/src/string/build.mk
-#include modules/src/print/build.mk
-#include modules/src/flt_arith/build.mk
-#include modules/src/em_code/build.mk
-#include modules/src/em_mes/build.mk
-#include modules/src/read_em/build.mk
-#
-#include util/amisc/build.mk
-#include util/cmisc/build.mk
-#include util/ack/build.mk
-#include util/LLgen/build.mk
-#include util/data/build.mk
-#include util/opt/build.mk
-#include util/ncgg/build.mk
-#include util/arch/build.mk
-#include util/misc/build.mk
-#include util/led/build.mk
-#include util/topgen/build.mk
-#include util/ego/build.mk
-#
-#include lang/cem/build.mk
-#include lang/basic/build.mk
-#include lang/pc/build.mk
-#include lang/m2/build.mk
-#
-#include mach/proto/as/build.mk
-#include mach/proto/ncg/build.mk
-#include mach/proto/top/build.mk
-#
-#include plat/linux/liblinux/build.mk
-#
-#include mach/i80/build.mk
-#include mach/i386/build.mk
-#include mach/i86/build.mk
-#include mach/m68020/build.mk
-## include mach/powerpc/build.mk
-#include mach/vc4/build.mk
-#
-#include plat/build.mk
-#include plat/pc86/build.mk
-#include plat/cpm/build.mk
-#include plat/linux386/build.mk
-#include plat/linux68k/build.mk
-## include plat/linuxppc/build.mk
-#include plat/rpi/build.mk
-#
-#.PHONY: installables
-#installables: $(INSTALLABLES)
-#	@echo ""
-#	@echo "Build completed successfully."
-#
-#.PHONY: install
-#install: installables
-#	@echo INSTALLING into $(PREFIX)
-#	$(hide) tar cf - -C $(INSDIR) . | tar xvf - -C $(PREFIX)
-#
-#.PHONY: clean
-#clean:
-#	@echo CLEAN
-#	$(hide) $(RM) $(CLEANABLES)
-#
-#$(INCDIR)/local.h:
-#	@echo LOCAL
-#	@mkdir -p $(dir $@)
-#	$(hide) echo '#define VERSION 3' > $@
-#	$(hide) echo '#define ACKM "$(DEFAULT_PLATFORM)"' >> $@
-#	$(hide) echo '#define BIGMACHINE 1' >> $@
-#	$(hide) echo '#define SYS_5' >> $@
-#
-#$(INCDIR)/em_path.h:
-#	@echo EM_PATH
-#	@mkdir -p $(dir $@)
-#	$(hide) echo '#define TMP_DIR "$(ACK_TEMP_DIR)"' > $@
-#	$(hide) echo '#define EM_DIR "$(PREFIX)"' >> $@
-#	$(hide) echo '#define ACK_PATH "share/ack/descr"' >> $@
-#
-#-include $(DEPENDS)
diff --git a/first/core.mk b/first/core.mk
deleted file mode 100644
index 6c386d0f5..000000000
--- a/first/core.mk
+++ /dev/null
@@ -1,219 +0,0 @@
-define reset
-	$(eval q :=)
-	$(eval o :=)
-	$(eval s :=)
-	$(eval cflags :=)
-	$(eval ackflags :=)
-	$(eval ldflags :=)
-	$(eval objdir :=)
-endef
-
-# --- Host compiler
-
-define cfile-rule
-$o: $s
-	@echo CC $o
-	@mkdir -p $(dir $o)
-	@$(CC) $(CFLAGS) $(cflags) -MM -MQ $o -o $d $s
-	$(hide) $(CC) $(CFLAGS) $(cflags) -c -o $o $s
-endef
-
-define cfile
-	$(eval s := $1)
-	$(eval o := $(OBJDIR)/$(objdir)/$(1:.c=.o))
-	$(eval d := $(OBJDIR)/$(objdir)/$(1:.c=.d))
-	$(eval DEPENDS += $d)
-	$(eval CLEANABLES += $o $d)
-	$(eval q += $o)
-	$(eval $(cfile-rule))
-endef
-
-# --- Host preprocessor
-
-define cppfile-rule
-$o: $s
-	@echo CPP $o
-	@mkdir -p $(dir $o)
-	@$(CC) $(CFLAGS) $(cflags) -MM -MQ $o -o $d -x c $s
-	$(hide) $(CC) $(CFLAGS) $(cflags) -E -P -o $o -x c $s
-endef
-
-define cppfile
-	$(eval s := $1)
-	$(eval o := $(OBJDIR)/$(objdir)/$(1:=.m))
-	$(eval d := $(OBJDIR)/$(objdir)/$(1:=.d))
-	$(eval DEPENDS += $d)
-	$(eval CLEANABLES += $o $d)
-	$(eval q += $o)
-	$(eval $(cppfile-rule))
-endef
-
-# --- ACK compiler
-
-define ackfile-rule
-$o: $s $(ACK) \
-		$(CCOMPILER) \
-		$(PLATFORM_$(PLATFORM)) \
-		$(ACK_CORE_TOOLS)
-	@echo ACK $o
-	@mkdir -p $(dir $o)
-	$(hide) ACKDIR=$(INSDIR) $(ACK) $(ACKFLAGS) $(ackflags) -m$(PLATFORM) -c -o $o $s
-endef
-
-define ackfile
-	$(eval s := $1)
-	$(eval o := $(OBJDIR)/$(objdir)/$(basename $1).o)
-	$(eval d := $(OBJDIR)/$(objdir)/$(basename $1).d)
-	$(eval DEPENDS += $d)
-	$(eval CLEANABLES += $o $d)
-	$(eval q += $o)
-	$(eval $(ackfile-rule))
-endef
-
-# --- Add a raw to the queue
-
-define rawfile
-	$(eval q += $1)
-endef
-
-# --- Host compiler linking
-
-define cprogram-rule
-$o: $s
-	@echo CPROGRAM $o
-	@mkdir -p $(dir $o)
-	$(hide) $(CC) $(CFLAGS) $(cflags) $(LDFLAGS) $(ldflags) -o $o $s
-endef
-
-define cprogram
-	$(eval o := $1)
-	$(eval s := $q)
-	$(eval CLEANABLES += $o)
-	$(eval q := $o)
-	$(eval $(cprogram-rule))
-endef
-
-# --- Host library linking
-
-define clibrary-rule
-$o: $s
-	@echo CLIBRARY $o
-	@mkdir -p $(dir $o)
-	@$(RM) $o
-	$(hide) $(AR) qsc $o $s
-endef
-
-define clibrary
-	$(eval o := $1)
-	$(eval s := $q)
-	$(eval CLEANABLES += $o)
-	$(eval q := $o)
-	$(eval $(clibrary-rule))
-endef
-
-# --- ACK library linking
-
-define acklibrary-rule
-$o: $s $(AAL)
-	@echo ACKLIBRARY $o
-	@mkdir -p $(dir $o)
-	@$(RM) $o
-	$(hide) $(AAL) q $o $s
-endef
-
-define acklibrary
-	$(eval o := $1)
-	$(eval s := $q)
-	$(eval CLEANABLES += $o)
-	$(eval q := $o)
-	$(eval $(acklibrary-rule))
-endef
-
-# --- Copies a file.
-
-define copyto-rule
-$o: $s
-	@echo CP $o
-	@mkdir -p $(dir $o)
-	$(hide) $(CP) $s $o
-endef
-
-define copyto
-	$(eval o := $1)
-	$(eval s := $q)
-	$(eval CLEANABLES += $o)
-	$(eval q := $o)
-	$(eval $(copyto-rule))
-endef
-
-# --- Installs a file (copies it and adds it to INSTALLABLES).
-
-define installto-rule
-$o: $s
-	@echo INSTALL $o
-	@mkdir -p $(dir $o)
-	$(hide) $(CP) $s $o
-endef
-
-define installto
-	$(eval o := $1)
-	$(eval s := $q)
-	$(eval CLEANABLES += $o)
-	$(eval INSTALLABLES += $o)
-	$(eval q := $o)
-	$(eval $(installto-rule))
-endef
-
-# --- Adds a dependency for the last object file
-
-define dependson
-	$(eval $o: $1)
-endef
-
-# --- Runs yacc.
-
-#  $1: directory to put output files
-#  $2: input files
-#
-# Output files are compiled via cfile and queued.
-
-define yacc-impl
-	$(eval o := $1/y.tab.c)
-	$(eval CLEANABLES += $o $1/y.tab.h)
-
-$o: $2
-	@echo YACC $o
-	@mkdir -p $(dir $o)
-	$(hide) yacc -t -b $1/y -d $2
-
-	$(call cfile, $o)
-
-$1/y.tab.h: $o
-
-endef
-
-yacc = $(eval $(call yacc-impl,$1,$2))
-
-# --- Runs flex.
-
-#  $1: directory to put output files
-#  $2: input files
-#
-# Output files are compiled via cfile and queued.
-
-define flex-impl
-
-$(eval o := $1/lex.yy.c)
-$(eval CLEANABLES += $o)
-
-$o: $2
-	@echo FLEX $o
-	@mkdir -p $(dir $o)
-	$(hide) flex -s -t $2 > $o
-
-$(call cfile, $o)
-
-endef
-
-flex = $(eval $(call flex-impl,$1,$2))
-
diff --git a/first/cp_dir b/first/cp_dir
deleted file mode 100755
index a5c66906f..000000000
--- a/first/cp_dir
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-trap "rm -f /tmp/xx$$" 0 1 2 3 15
-case $2 in
-/*)	target_dir=$2
-	;;
-*)	target_dir=`pwd`/$2
-	;;
-esac
-cd $1
-tar cf /tmp/xx$$ .
-if [ -d $target_dir ]
-then :
-else mkdir $target_dir
-fi
-cd $target_dir
-tar xf /tmp/xx$$
diff --git a/first/create_dir b/first/create_dir
deleted file mode 100755
index 4f60bfba0..000000000
--- a/first/create_dir
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if ( cd $1 ) 2>/dev/null
-then
-	:
-elif mkdir $1 2>/dev/null
-then
-	:
-else
-	echo $0: could not create directory $1 1>&2
-	exit 1
-fi
-exit 0
diff --git a/first/em_path.h.src b/first/em_path.h.src
deleted file mode 100644
index 3da9a8acc..000000000
--- a/first/em_path.h.src
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $Id$ */
-/*
- * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
- * See the copyright notice in the ACK home directory, in the file "Copyright".
- */
-/* Intended as a common directory for ALL temporary files */
-#define TMP_DIR		"/tmp"
-
-/* Access to the ACK tree and parts thereof */
-#define EM_DIR		"/usr/em"	/* The root directory for EM stuff */
-#define ACK_PATH	"lib/descr"
diff --git a/first/first b/first/first
deleted file mode 100755
index 0d06efba0..000000000
--- a/first/first
+++ /dev/null
@@ -1,208 +0,0 @@
-#! /bin/sh
-
-case $0 in
-*/first)
-	FDIR=`expr $0 : '\(.*\)/first'`
-	;;
-first)	FDIR=.
-	;;
-esac
-
-if echo 'a\c' | grep 'c' >/dev/null ; then
-	: We have BSD-like echo command.
-	E_FLAG='-n'
-	E_SFX=''
-else
-	: We have SystemV-like echo command.
-	E_FLAG=''
-	E_SFX='\c'
-fi
-export E_FLAG E_SFX
-
-echo check write-ability of /tmp ...
-if ( >/tmp/aaax.$$ )
-then
-	rm /tmp/aaax.$$
-else
-	echo /tmp must exist and be writable.
-	exit 2
-fi
-echo "/tmp ok"
-
-if [ -f macros ]
-then
-	. macros
-fi
-
-: "Now get system name and directories"
-. $FDIR/get_sys
-
-: "Take action according to the system used"
-BM=1
-OLDACM=$ACM
-OLDSYS=$SYS
-case $SYSNAME in
-vax_bsd4_1a)    ACM=vax4 ; SYS=BSD4_1 ; BYTE_ORDER=0123 ; MACH=vax4 ;;
-vax_bsd4_2)	ACM=vax4 ; SYS=BSD4_2 ; BYTE_ORDER=0123 ; MACH=vax4 ;;
-vax_sysV_2)	ACM=vax4 ; SYS=SYS_5 ; BYTE_ORDER=0123 ; MACH=vax4 ;;
-i386)		ACM=i386 ; SYS=SYS_5 ; BYTE_ORDER=0123 ; MACH=i386 ;;
-sun3)		ACM=sun3 ; SYS=BSD4_2; BYTE_ORDER=3210 ; MACH=m68020 ;;
-sun2)		ACM=sun2 ; SYS=BSD4_2; BYTE_ORDER=3210 ; MACH=m68k4 ;;
-m68_unisoft|m68k2)	ACM=m68k2 ; SYS=V7; BYTE_ORDER=3210 ; MACH=m68k2 ;;
-m68_sysV_0|mantra)	ACM=mantra ; SYS=SYS_5; BYTE_ORDER=3210 ; MACH=m68k4 ;;
-m68020)		ACM=m68020 ; SYS=SYS_5; BYTE_ORDER=3210 ; MACH=m68020 ;;
-sparc)		ACM=sparc ; SYS=BSD4_2; BYTE_ORDER=3210 ; MACH=sparc ;;
-sparc_solaris)	ACM=sparc_solaris ; SYS=SYS_5; BYTE_ORDER=3210 ; MACH=sparc_solaris ;;
-i86)		ACM=i86 ; SYS=SYS_5; BYTE_ORDER=0123 ; MACH=i86 ;;
-xenix3)		ACM=xenix3 ; SYS=SYS_5; BYTE_ORDER=0123 ; MACH=i86 ;;
-minix)		ACM=minix ; SYS=V7; BYTE_ORDER=0123 ; MACH=i86 ;;
-pmds)		ACM=pmds ; SYS=V7; BYTE_ORDER=3210 ; MACH=m68k2 ;;
-pmds4)		ACM=pmds4 ; SYS=V7; BYTE_ORDER=3210 ; MACH=m68k4 ;;
-minixST)	ACM=minixST ; SYS=V7; BYTE_ORDER=3210 ; MACH=m68k2 ;;
-m68k4)		ACM=m68k4 ; SYS=V7; BYTE_ORDER=3210 ; MACH=m68k4 ;;
-*)		ACM=XXX ; SYS=XXX ; BYTE_ORDER=XXX ; MACH=XXX ;;
-esac
-
-: do not change the order in MACH_LIST. check limit_enquire first.
-MACH_LIST="i86 xenix3 minix i386 6500 6800 6805 6809 i80 em22 em24 em44 m68k2 pmds minixST m68k4 pmds4 sun2 mantra m68020 sun3 sparc sparc_solaris ns pdp s2650 vax4 z80 z8000 arm"
-
-while :
-do
-	for i in $MACH_LIST
-	do
-		if [ $i = "$ACM" ]
-		then break
-		fi
-	done
-	if [ $i = "$ACM" ]
-	then break
-	fi
-	echo "This installation script has no knowledge about $SYSNAME.
-You will have to specify the default machine that you want ACK to
-compile for. Choices:"
-	l=
-	x=
-	for i in $MACH_LIST
-	do
-		l="$l $i"
-		x=x$x
-		case $x in
-		xxxxxxxxxx)	echo $l
-				x=
-				l=
-				;;
-		esac
-	done
-	ACM=$OLDACM
-	echo $l
-	echo $E_FLAG "Your choice: [$OLDACM] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$ACM";;
-	esac
-	ACM="$ANS"
-done
-while :
-do
-case $SYS in
-V7|BSD4_1|BSD4_2|SYS_5)
-	break
-	;;
-*)
-	SYS=$OLDSYS
-	echo 'What kind of Unix is the target system running?
-Choices:
-	V7	for Unix V7, BSD 2.*
-	BSD4_1	for Berkeley 4.1
-	BSD4_2	for Berkeley 4.2, 4.3, SunOs 3, SunOs 4
-	SYS_5	for Xenix, System III, System V, SunOs 5'
-	echo $E_FLAG "Your choice (V7|BSD4_1|BSD4_2|SYS_5): [$OLDSYS] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$SYS";;
-	esac
-	SYS="$ANS"
-	;;
-esac
-done
-rm -f local.h
-sed -e /ACKM/s/'".*"'/'"'$ACM'"'/ -e /BIGMACH/s/'[01]'/$BM/ -e /SYSTEM/s/'^#[ 	]*define[ 	]*[a-zA-Z_][a-zA-Z0-9_]*'/"#	define $SYS"/ < $FDIR/local.h.src >local.h
-case $BYTE_ORDER in
-XXX)	;;
-*)	echo '/* Optional definition of BYTE_ORDER: */' >> local.h
-	echo "#define BYTE_ORDER 0x$BYTE_ORDER" >> local.h
-	;;
-esac
-
-echo "Your default machine to compile for is $ACM"
-
-echo "Installation of the complete ACK takes a long time. Limiting the
-number of languages, runtime libraries, back-ends, and assemblers to be
-installed may save a lot of time. If you want to install everything,
-answer no to the next question. Otherwise, answer yes, and you will be
-prompted for details"
-while :
-do
-	echo $E_FLAG "Do you want to limit the installation in any way? (y/n) [$LIMIT] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$LIMIT";;
-	esac
-	case X$ANS in
-	Xj*|Xy|X)
-		LIMIT=y
-		. $FDIR/limit_enquire
-		break
-		;;
-	Xn*)	. $FDIR/get_sysvax
-		LIMIT=n
-		DO_MACHINE_INDEP=y
-		DO_FAST=n
-		DISABLE_LANG=
-		DISABLE_SUP=
-		if [ $TARGET_HOME = $UTIL_HOME ]
-		then
-			case $ACM in
-			sun3|m68020|i386|vax*)
-				DO_FAST=y
-				;;
-			esac
-		fi
-		break
-		;;
-	*)	echo "I do not understand your answer ($ANS). Try again."
-		;;
-	esac
-done
-
-. $FDIR/get_makepars
-
-echo "TARGET_HOME=\"$TARGET_HOME\"; export TARGET_HOME" > macros
-echo "UTIL_HOME=\"$UTIL_HOME\"; export UTIL_HOME" >> macros
-echo "SRC_HOME=\"$SRC_HOME\"; export SRC_HOME" >> macros
-echo "SYSNAME=\"$SYSNAME\"; export SYSNAME" >> macros
-echo "ACM=\"$ACM\"; export ACM" >> macros
-echo "CURRENT=\"$CURRENT\"; export CURRENT" >> macros
-echo "SYS=\"$SYS\"; export SYS" >> macros
-echo "LIMIT=\"$LIMIT\"; export LIMIT" >> macros
-echo "CONFIG=\"$CONFIG\"; export CONFIG" >> macros
-echo "DISABLE_LANG=\"$DISABLE_LANG\"; export DISABLE_LANG" >> macros
-echo "DISABLE_SUP=\"$DISABLE_SUP\"; export DISABLE_SUP" >> macros
-echo "DO_MACHINE_INDEP=\"$DO_MACHINE_INDEP\"; export DO_MACHINE_INDEP" >> macros
-echo "MACH_LIST=\"$MACH_LIST\"; export MACH_LIST" >> macros
-echo "SYSVAX=\"$SYSVAX\"; export SYSVAX" >> macros
-echo "MACH=\"$MACH\"; export MACH" >> macros
-echo "WS=\"$WS\"; export WS" >> macros
-echo "PS=\"$PS\"; export PS" >> macros
-echo "DO_FAST=\"$DO_FAST\"; export DO_FAST" >> macros
-
-cat macros $FDIR/install_tail > INSTALL
-chmod +x INSTALL
-
-echo "
-A shell-script called 'INSTALL' has been created. Running it
-installs ACK. Note that this may take a (very) long time, so run it
-in the background, with its output redirected, f.i.:
-	sh INSTALL > INSTALL.out 2>&1 &
-"
-exit 0
diff --git a/first/get_answer b/first/get_answer
deleted file mode 100755
index 672deccd2..000000000
--- a/first/get_answer
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if read ANS
-then	echo
-else	echo "Sorry, got EOF when reading your answer"
-	exit 1
-fi
diff --git a/first/get_makepars b/first/get_makepars
deleted file mode 100755
index cadbf31c9..000000000
--- a/first/get_makepars
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-know_target=0
-case $SYSNAME in
-vax*|i386|sun*|sparc*|m68_sysV_0|m68020|mantra|pmds4|m68k4)
-	WS=4 ; PS=4
-	know_target=1
-	;;
-m68_unisoft|m68k2|minixST|pmds)
-	WS=2 ; PS=4
-	know_target=1
-	;;
-i86|minix|xenix3)
-	WS=2 ; PS=2
-	know_target=1
-	;;
-*)	trap "rm -f ws.c ws.o a.out t$$" 0 1 2 3 15
-		cat > ws.c <<'EOF'
-#include <stdio.h>
-main()
-{
-	printf("WS=%d ; PS=%d\n", sizeof(int), sizeof(char *));
-	exit(0);
-}
-EOF
-	if [ $TARGET_HOME = $UTIL_HOME ] && cc ws.c 2>/dev/null
-	then
-		: We can find out ourselves what the word-size and
-		: the pointer-size of the target machine is.
-		cc ws.c 2>/dev/null
-		./a.out > t$$
-		. t$$
-		rm -f t$$ a.out ws.[co]
-	else
-		: we will have to ask installer.
-		echo $E_FLAG "Please give the word-size of the target-machine (sizeof(int)) in bytes: [$WS] $E_SFX"
-		. $FDIR/get_answer
-		case $ANS in
-		'')	ANS="$WS";;
-		esac
-		WS="$ANS"
-		echo $E_FLAG "Please give the pointer-size of the target-machine (sizeof(char *)) in bytes: [$PS] $E_SFX"
-		. $FDIR/get_answer
-		case $ANS in
-		'')	ANS="$PS";;
-		esac
-		PS="$ANS"
-	fi
-	;;
-esac
-
-echo "# Paths:
-SRC_HOME = $SRC_HOME
-TARGET_HOME = $TARGET_HOME
-UTIL_HOME = $UTIL_HOME
-
-# Machine independent part created?
-DO_MACHINE_INDEP = $DO_MACHINE_INDEP
-
-# Target machine, only needed for fast compilers
-MACH = $MACH
-" > make_macros
-
-if [ $TARGET_HOME = $UTIL_HOME ]
-then	
-	if [ -f /bin/ranlib -o -f /usr/bin/ranlib -o -f /usr/ucb/ranlib ]
-	then
-		sed "s/^COPTIONS.*\$/COPTIONS=-O -D_EM_WSIZE=$WS -D_EM_PSIZE=$PS -D__${MACH}__/" < $FDIR/target_comp >> make_macros
-	else
-		sed -e "s/^COPTIONS.*\$/COPTIONS=-O -D_EM_WSIZE=$WS -D_EM_PSIZE=$PS -D__${MACH}__/" -e "s/^# RANLIB=:/RANLIB=:/" < $FDIR/target_comp >> make_macros
-	fi
-	case $ACM in
-	sun3|sparc)
-		ed -s make_macros <<'EOF'
-/cc-and-mkdep.sun/s/^..//
-w
-q
-EOF
-		;;
-	esac
-	cat $FDIR/util_comp >> make_macros
-else
-	case $know_target in
-	1)	sed -e "s/^COPTIONS.*\$/COPTIONS=-O -D_EM_WSIZE=$WS -D_EM_PSIZE=$PS -D__${MACH}__/" -e "/cc-and-mkdep.ack/s/^..//" -e "s/^CC=cc/CC=acc -m$ACM/" -e "s/^# AR=aal/AR=aal/" -e "s/^# RANLIB=:/RANLIB=:/" < $FDIR/target_comp >> make_macros
-		;;
-	*)	if [ -f /bin/ranlib -o -f /usr/bin/ranlib -o -f /usr/ucb/ranlib ]
-		then
-			sed "s/^COPTIONS.*\$/COPTIONS=-O -D_EM_WSIZE=$WS -D_EM_PSIZE=$PS -D__${MACH}__/" < $FDIR/target_comp >> make_macros
-		else
-			sed -e "s/^COPTIONS.*\$/COPTIONS=-O -D_EM_WSIZE=$WS -D_EM_PSIZE=$PS -D__${MACH}__/" -e "s/^# RANLIB=:/RANLIB=:/" < $FDIR/target_comp >> make_macros
-		fi
-		;;
-	esac
-	sed "s/^#U/U/" < $FDIR/util_comp >> make_macros
-fi
-
-cat $FDIR/lint_params >> make_macros
-
-echo "A file called 'make_macros' has been created. This file defines some
-'make' variables that parameterize all Makefiles in ACK. You may want
-to check it before attempting to actually install ACK."
-case $know_target in
-0)	echo "In fact, this installation script does not know much about
-your target machine, so expect some things to be wrong"
-	;;
-esac
diff --git a/first/get_sys b/first/get_sys
deleted file mode 100755
index c2358e4d2..000000000
--- a/first/get_sys
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-rm -f em_path.h
-echo "You will now be asked for the root directory of the ACK sources.
-This directory will not be changed by the installation process.
-"
-while :
-do
-	echo $E_FLAG "Please give the root of the ACK source tree,
-an absolute path: [$SRC_HOME] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'') 	ANS="$SRC_HOME" ;;
-	esac
-	SRC_HOME="$ANS"
-	case $SRC_HOME in
-	/*)	break;
-		;;
-	*)	echo "$SRC_HOME is not an absolute path; try again"
-		;;
-	esac
-done
-echo "You will now be asked for a configuration directory. This is
-the directory in which the compilations will take place. The tree that
-resides in it will have the same structure as the ACK source tree, but
-the directories will usually only contain Makefiles and .o files.
-"
-while :
-do
-	echo $E_FLAG "Please give the root of the configuration tree,
-an absolute path: [$CONFIG] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$CONFIG";;
-	esac
-	CONFIG="$ANS"
-	case $CONFIG in
-	/*)	break;
-		;;
-	*)	echo "$CONFIG is not an absolute path; try again"
-		;;
-	esac
-done
-echo "You will now be asked for the root directory of the ACK binaries. After
-installation, this directory will have subdirectories bin, lib, lib.bin,
-man, h, config, include, modules, doc.
-Four of these directories will contain stuff that depends on the machine
-for which the ACK binaries are made: bin, modules, config, and lib.bin. The
-other sub-directories (lib, man, h, include and doc) will contain
-machine-independent stuff.
-This information may be useful if you want to use ACK on different platforms
-and you have a shared file system. See the installation manual.
-"
-while :
-do
-	echo $E_FLAG "Please give the root of the ACK binaries,
-an absolute path: [$TARGET_HOME] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$TARGET_HOME";;
-	esac
-	TARGET_HOME="$ANS"
-	case $TARGET_HOME in
-	/*)	break;
-		;;
-	*)	echo "$TARGET_HOME is not an absolute path; try again"
-		;;
-	esac
-done
-sed -e "/^#define[ 	]*EM_DIR/s@\".*\"@\"$TARGET_HOME\"@" <$FDIR/em_path.h.src >em_path.h
-
-echo "You will now be asked for the type of the system that you want
-ACK binaries produced for. This is not neccessarily the system you
-run this program on. In this case, if you have not done so already,
-you will have to install ACK on the current machine first.
-"
-echo "Give me the type of the system, the current choice is:
-vax_bsd4_1a	VAX11 with BSD4.1a
-vax_bsd4_2	VAX11 with BSD4.2
-vax_sysV_2	VAX11 with System V.2
-i386		Intel 80386 system running Xenix System V
-sun3		Sun 3 M68020 workstation 
-sun2		Sun 2 M68000 workstation
-m68_sysV_0	Motorola 68000 with Uniplus System V.0 Unix
-m68020		Motorola M68020 VME131 running Unix System V/68 R2V2.1
-sparc		SUN SPARC workstation running SunOs 4
-sparc_solaris	SUN SPARC workstation running solaris 2
-ANY		Neither of the above
-"
-echo $E_FLAG "system type: [$SYSNAME] $E_SFX"
-. $FDIR/get_answer
-case $ANS in
-'')	ANS="$SYSNAME";;
-esac
-SYSNAME="$ANS"
-
-while :
-do
-echo $E_FLAG "Is this the system you are running on? (y/n) [$CURRENT] $E_SFX"
-. $FDIR/get_answer
-case $ANS in
-'')	ANS="$CURRENT";;
-esac
-case X$ANS in
-Xj*|Xy*|X)	UTIL_HOME=$TARGET_HOME
-	CURRENT=y
-	break
-	;;
-Xn*)	CURRENT=n
-	echo "You will now be asked for the root directory of ACK on the current machine.
-This tree will not be changed by the installation process.
-"
-	while :
-	do
-		echo $E_FLAG "Please give the root of a runnable ACK tree,
-an absolute path: [$UTIL_HOME] $E_SFX"
-		. $FDIR/get_answer
-		case $ANS in
-		'')	ANS="$UTIL_HOME" ;;
-		esac
-		UTIL_HOME="$ANS"
-		case $UTIL_HOME in
-		/*)	break;
-			;;
-		*)	echo "$UTIL_HOME is not an absolute path; try again"
-			;;
-		esac
-	done
-	break
-	;;
-*)	echo "I do not understand your answer ($ANS). Try again."
-	;;
-esac
-done
-
-while :
-do
-echo "The system to install ACK for is $SYSNAME,
-the root of the ACK source tree is $SRC_HOME,
-the root of the configuration tree is $CONFIG,
-the root of the ACK binary tree to be created is $TARGET_HOME,
-and the root of a runnable ACK binary tree is $UTIL_HOME.
-If the machine to compile ACK for is the current machine, the last two names
-may be identical."
-echo $E_FLAG "Are you satisfied with all this? (y/n) $E_SFX"
-. $FDIR/get_answer
-case X$ANS in
-Xj*|Xy*|X)	break
-	;;
-Xn*)	echo Ok, I will give you another chance....
-	. $0
-	break
-	;;
-*)	echo "I do not understand your answer ($ANS). Try again."
-	;;
-esac
-done
diff --git a/first/get_sysvax b/first/get_sysvax
deleted file mode 100755
index ed92a123c..000000000
--- a/first/get_sysvax
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-while :
-do
-	echo $E_FLAG "Which system-call library do you want to install for the VAX?
-You can choose between
-	libbsd4_1a	for Berkeley Unix 4.1
-	libbsd4_2	for Berkeley Unix 4.2 or newer, or Ultrix
-	libsysV_2	for Unix System V
-Your choice: [$SYSVAX] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$SYSVAX";;
-	esac
-	SYSVAX="$ANS"
-	case $SYSVAX in
-	libbsd4_1a|libbsd4_2|libsysV_2)
-		break
-		;;
-	*)	echo "I do not understand your answer ($SYSVAX). Try again"
-		;;
-	esac
-done
diff --git a/first/install_tail b/first/install_tail
deleted file mode 100644
index bcd6d3957..000000000
--- a/first/install_tail
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=::$CONFIG/bin:$UTIL_HOME/bin:/usr/ccs/bin:/usr/ucb:$PATH
-export PATH
-
-$SRC_HOME/first/create_dir $CONFIG
-$SRC_HOME/first/create_dir $CONFIG/bin
-
-(
-	# Slight complication here to ensure that the #! magic at the
-	# beginning of TakeAction is preserved correctly.
-
-	head -1 $SRC_HOME/TakeAction
-	echo "PATH=:$CONFIG/bin:$UTIL_HOME/bin:$PATH; export PATH"
-	tail +2 $SRC_HOME/TakeAction
-) > $CONFIG/bin/TakeAction
-
-sed '/^#PARAMS/r make_macros' < $SRC_HOME/first/mk_makefile > $CONFIG/bin/mk_makefile
-cp $SRC_HOME/first/create_dir $CONFIG/bin/create_dir
-cp $SRC_HOME/first/cp_dir $CONFIG/bin/cp_dir
-chmod +x $CONFIG/bin/*
-
-$SRC_HOME/first/mk_config
-
-$SRC_HOME/first/mk_target
-
-$SRC_HOME/first/limit_impl
-
-case $SYSNAME in
-i386)
-	ed -s $TARGET_HOME/lib/descr/fe << 'ABC'
-1,$s/-D{NAME}/-D{NAME} -DNO_PROTOTYPE/
-w
-q
-ABC
-	;;
-esac
-
-: find varargs include file
-: if not present use our own
-
-if test -f /usr/include/varargs.h
-then
-	:
-else
-	cp $SRC_HOME/include/_tail_cc/varargs.h $TARGET_HOME/modules/h
-fi
-
-case X$SYSVAX in
-Xvax_sysV_2)
-	ed -s $TARGET_HOME/lib/vax4/descr << 'ABC'
-/CPP_F/s/$/ -D__USG/
-w
-q
-ABC
-	ed -s $CONFIG/mach/vax4/Action << 'ABC'
-/libbsd4_2/s/libbsd4_2/libsysV_2/
-w
-q
-ABC
-	( cd $CONFIG/mach/vax4
-	  for i in libcc libcc.ansi
-	  do
-	  	ed -s $i/Makefile << 'ABC'
-/BFS/s/BFS/UFS/
-w
-q
-ABC
-	  done
-	)
-	;;
-Xvax_bsd4_2)
-	ed -s $TARGET_HOME/lib/vax4/descr << 'ABC'
-/CPP_F/s/$/ -D__BSD4_2/
-w
-q
-ABC
-	;;
-Xvax_bsd4_1a)
-	ed -s $CONFIG/mach/vax4/Action << 'ABC'
-/libbsd4_2/s/libbsd4_2/libbsd4_1a/
-w
-q
-ABC
-	;;
-esac
-
-: and finally installing ...
-cd $CONFIG
-set +e
-exec TakeAction
diff --git a/first/limit_enquire b/first/limit_enquire
deleted file mode 100644
index e93e19db3..000000000
--- a/first/limit_enquire
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/bin/sh
-
-while :
-do
-	echo "The libraries will end up in the machine-independent part of the
-ACK binary tree. You may already have them from a previous ACK installation
-on a different machine, in particular if you have an NFS file system.
-Therefore, it may not be neccessary to install them again. As this part
-of the ACK installation takes the most time, you are given the opportunity
-to disable installation of the machine-independent part"
-	echo $E_FLAG \
-	"Do you want to install the machine-independent part? (y/n) [$DO_MACHINE_INDEP] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$DO_MACHINE_INDEP" ;;
-	esac
-	case X$ANS in
-	Xj*|Xy*|X)	DO_MACHINE_INDEP=y
-		echo "machine-independent part will be installed"
-		echo
-		break
-		;;
-	Xn*)	DO_MACHINE_INDEP=n
-		echo "machine-independent part will not be installed"
-		echo
-		break
-		;;
-	*)	echo "I do not understand your answer ($ANS). Try again."
-		;;
-	esac
-done
-OLD_DIS_LANG="$DISABLE_LANG"
-DISABLE_LANG=
-case X$OLD_DIS_LANG in
-X)	;;
-*)	set $OLD_DIS_LANG
-	;;
-esac
-for i in Modula-2 Pascal Occam Basic ANSI-C C Fortran
-do
-    DEF=y
-    if [ $# != 0 -a X$i = X$1 ]
-    then
-	DEF=n
-	shift
-    fi
-    while :
-    do
-	echo $E_FLAG "Do you want to install $i? (y/n) [$DEF] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$DEF";;
-	esac
-	case X$ANS in
-	Xj*|Xy*)
-		echo "$i will be installed"
-		echo
-		break
-		;;
-	Xn*)	DISABLE_LANG=$DISABLE_LANG" $i"
-		echo "$i will not be installed"
-		echo
-		break
-		;;
-	*)	echo "I do not understand your answer ($ANS). Try again."
-		;;
-	esac
-    done
-done
-OLD_DIS_SUP="$DISABLE_SUP"
-DISABLE_SUP=
-set $MACH_LIST
-while test $# != 0
-do
-    DEF=y
-    for i in $OLD_DIS_SUP
-    do
-	if [ X$i = X$1 ]
-	then
-		DEF=n
-		break
-	fi
-    done
-    while :
-    do
-	case $1 in
-	i86)	echo "not installing i86 will disable installation of xenix3 and minix."
-		;;
-	m68k2)	echo "not installing m68k2 will disable installation of pmds, minixST,
-m68k4, pmds4, sun2, and mantra."
-		;;
-	m68k4)	echo "not installing m68k4 will disable installation of pmds4, sun2, and mantra."
-		;;
-	m68020)	echo "not installing m68020 will disable installation of sun3."
-		;;
-	esac
-	echo $E_FLAG "Do you want to install the $1 support? (y/n) [$DEF] $E_SFX"
-	. $FDIR/get_answer
-	case $ANS in
-	'')	ANS="$DEF";;
-	esac
-	case X$ANS in
-	Xj*|Xy*)
-		echo "The $1 support will be installed"
-		echo
-		case $1 in
-		vax4)	case $SYSNAME in
-			vax_bsd4_1a)	SYSVAX=libbsd4_1a
-					;;
-			vax_bsd4_2)	SYSVAX=libbsd4_2
-					;;
-			vax_sysV_2)	SYSVAX=libsysV_2
-					;;
-			*)		if [ $DO_MACHINE_INDEP = y ]
-					then
-						. $FDIR/get_sysvax
-					fi
-					;;
-			esac
-			;;
-		sparc)	shift
-			;;
-		esac
-		break
-		;;
-	Xn*)	DISABLE_SUP=$DISABLE_SUP" $1"
-		echo "The $1 support will not be installed"
-		echo
-		case $1 in
-		i86)
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			;;
-		m68k2)
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			;;
-		m68k4)
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			;;
-		sparc)
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			;;
-		m68020)
-			shift
-			DISABLE_SUP=$DISABLE_SUP" $1"
-			;;
-		esac
-		break
-		;;
-	*)	echo "I do not understand your answer ($ANS). Try again."
-		;;
-	esac
-    done
-    shift
-done
-
-if [ $TARGET_HOME = $UTIL_HOME ] 
-then
-	case $ACM in
-	sun3|m68020|i386|vax*)
-		while :
-		do
-			echo $E_FLAG "Do you want to install the fast compilers? (y/n) [$DO_FAST] $E_SFX"
-        		. $FDIR/get_answer
-        		case $ANS in
-        		'')     ANS="$DO_FAST" ;;
-        		esac
-        		case X$ANS in
-        		Xj*|Xy*)
-				DO_FAST=y
-				echo "The fast compilers will be installed"
-				break
-				;;
-			Xn*)
-				DO_FAST=n
-				echo "The fast compilers will not be installed"
-				break
-				;;
-			*)	echo "I do not understand your answer ($ANS). Try again."
-				;;
-			esac
-		done
-		;;
-	*)
-		DO_FAST=n
-		;;
-	esac
-else
-	DO_FAST=n
-fi
diff --git a/first/limit_impl b/first/limit_impl
deleted file mode 100755
index 284f2c15e..000000000
--- a/first/limit_impl
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/sh
-
-for i in $DISABLE_LANG
-do
-	ed -s $CONFIG/Action <<EOF
-/^name "$i/;/^end/s/^/!/
-w
-q
-EOF
-	case $i in
-	Modula-2)
-		ed -s $CONFIG/Action <<EOF
-/^name "$i definition/;/^end/s/^/!/
-/^name "$i makefile/;/^end/s/^/!/
-w
-q
-EOF
-		;;
-	ANSI-C)	: install compiler anyway
-		ed -s $CONFIG/Action <<EOF
-/^!name "$i frontend/;/^!end/s/^!//
-w
-q
-EOF
-		;;
-	C)	: install compiler anyway
-		ed -s $CONFIG/Action <<EOF
-/^!name "$i frontend/;/^!end/s/^!//
-w
-q
-EOF
-		;;
-	esac
-done
-for i in Modula-2 Pascal Basic Occam ANSI-C C Fortran
-do
-	if [ $DO_MACHINE_INDEP = n ]
-	then
-		continue
-	fi
-	for j in $DISABLE_LANG
-	do
-		case $i in
-		$j)	i=X
-			break
-			;;
-		esac
-	done
-	case $i in
-	X)	continue
-		;;
-	Modula-2)
-		lib=libm2
-		;;
-	Pascal)
-		lib=libpc
-		;;
-	Basic)
-		lib=libbc
-		;;
-	Occam)
-		lib=liboc
-		;;
-	ANSI-C)
-		lib=libcc.ansi
-		;;
-	C)
-		lib=libcc
-		;;
-	Fortran)
-		lib=libf77
-		;;
-	esac
-	( cd $CONFIG/mach
-	  for j in $MACH_LIST
-	  do
-		case $j in
-		6800|6805|6809|s2650)	continue
-					;;
-		esac
-		: do not install fortran for 2-byte integer machines
-		case $i in
-		Fortran)	case $j in
-				em2*|i8*|m68k2|minix*|pdp|pmds|xenix3|z80*)
-					continue
-					;;
-				esac
-				;;
-		esac
-		case $j in
-		sparc*)
-			( cd $j
-	      		  cat >> Action <<EOF
-name "$j $i libraries"
-system "$j"
-dir $lib
-end
-EOF
-	        	)
-			;;
-		*)
-	    		( cd $j
-	      		  cat >> Action <<EOF
-name "$j $i libraries"
-dir $lib
-end
-EOF
-	       		)
-			;;
-		esac
-	  done
-	)
-done
-DISABLE_INT=0
-for i in $DISABLE_SUP
-do
-	ed -s $CONFIG/Action <<EOF
-/^dir .*$i\$/;?^name?;/^end/s/^/!/
-w
-q
-EOF
-	case $i in
-	m68k2)
-		DISABLE_INT=1
-		;;
-	m68k4)
-		case $SYSNAME in
-		m68_sysV_0|sun2)
-			DISABLE_INT=1
-			;;
-		esac
-		;;
-	mantra)
-		if test $SYSNAME = m68_sysV_0
-		then
-			DISABLE_INT=1
-		fi
-		;;
-	sun2)
-		if test $SYSNAME = sun2
-		then
-			DISABLE_INT=1
-		fi
-		;;
-	sun3)
-		if test $SYSNAME = sun3
-		then
-			DISABLE_INT=1
-		fi
-		;;
-	pmds4)
-		case $SYSNAME in
-		pmds*)
-			DISABLE_INT=1
-			;;
-		esac
-		;;
-	m68020)
-		case $SYSNAME in
-		m68020|sun3)
-			DISABLE_INT=1
-			;;
-		esac
-		;;
-	esac
-done
-case $SYSNAME in
-m68*|sun2|sun3|pmds*)
-	;;
-*)	DISABLE_INT=1
-	;;
-esac
-if test $DISABLE_INT = 1
-then
-	ed -s $CONFIG/Action <<EOF
-/68000 interpreters/;/^end/s/^/!/
-w
-q
-EOF
-fi
-
-if [ $DO_MACHINE_INDEP = n ]
-then
-	for i in $CONFIG/mach/*/Action
-	do
-		for j in libem libend libfp libdb libsys libmon libbsd4_2 libbsd4_1a libsysV_2 libce
-		do
-			if fgrep -s $j $i
-			then
-				ed -s $i <<EOF
-/$j/;?^name?,/^end/s/^/!/
-w
-q
-EOF
-			fi
-		done
-	done
-fi
-
-if [ $DO_FAST = n ]
-then
-	ed -s $CONFIG/Action <<'EOF'
-/^name "Peephole optimizer lib/;/^end/s/^/!/
-/^name "Fast/;$s/^/!/
-w
-q
-EOF
-fi
diff --git a/first/lint_params b/first/lint_params
deleted file mode 100644
index c849b3fc9..000000000
--- a/first/lint_params
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/make
-
-# There are two choices for lint here: ACK lint and Unix lint.
-# The current setup is for ACK lint. If you want to use the Unix lint,
-# put '#' signs on the next 4 lines that have ACK in them.
-
-LINT=/usr/bin/lint#		# Unix lint
-LINT=$(UTIL_HOME)/bin/lint#	# ACK lint
-
-LINTOPTIONS=#			# options always passed to lint
-
-LINTPREF=llib-l#		# prefix of unix lint libraries
-LINTPREF=#			# ACK lint libraries do not have a prefix
-
-LINTSUF=ln#			# suffix of Unix lint libraries
-LINTSUF=llb#			# suffix of ACK lint libraries
-
-MK_LINT_LIB=lint-lib.unix#	# for Unix lint
-MK_LINT_LIB=lint-lib.ack#	# for ACK lint
diff --git a/first/local.h.src b/first/local.h.src
deleted file mode 100644
index 4e569a8dd..000000000
--- a/first/local.h.src
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $Id$ */
-/*
- * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
- * See the copyright notice in the ACK home directory, in the file "Copyright".
- */
-/* collection of options, selected by including or excluding 'defines' */
-
-/* Version number of the EM object code */
-#	define	VERSION		3	/* 16 bits number */
-
-/* The default machine used by ack, acc, apc */
-#	define	ACKM		"sun3"
-
-/* size of local machine, either 0 (for 16 bit address space), or 1 */
-#	define BIGMACHINE	1
-
-/* operating system, SYS_5, V7, BSD4_1 or BSD4_2; Do NOT delete the comment
-   in the next line! */
-#	define BSD4_2		1	/* SYSTEM */
diff --git a/first/mk_config b/first/mk_config
deleted file mode 100755
index 43953fd90..000000000
--- a/first/mk_config
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-
-set -e
-
-create_dir $CONFIG
-
-create_dir $CONFIG/bin
-echo "#!/bin/sh" > $CONFIG/bin/ack_sys
-echo "echo $SYSNAME" >> $CONFIG/bin/ack_sys
-chmod +x $CONFIG/bin/ack_sys
-
-cd $SRC_HOME
-find . -type d -perm -555 -print > $CONFIG/dir_list
-
-cd $CONFIG
-for i in mach/*/libsys
-do
-	rm -rf $i
-done
-
-for i in `cat dir_list`
-do
-	create_dir $i
-	rm -f $i/No*
-	if [ -f $i/Makefile ]
-	then
-		( cd $i ; if make clean ; then exit 0 ; else exit 0 ; fi ) > /dev/null 2>&1 
-	fi
-	if [ -f $SRC_HOME/$i/proto.make ]
-	then mk_makefile $SRC_HOME/$i/proto.make > $i/Makefile
-	fi
-	if [ -f $SRC_HOME/$i/Action ]
-	then
-		cd $SRC_HOME/$i
-		cp Action* $CONFIG/$i
-		chmod +w $CONFIG/$i/Action*
-		cd $CONFIG
-	fi
-done
-
-cd $CONFIG
-
-for i in lang/cem/cemcom.ansi lang/cem/cemcom lang/m2/comp
-do
-	cp $SRC_HOME/$i/BigPars $CONFIG/$i/Parameters
-	chmod +w $CONFIG/$i/Parameters
-done
-for i in lang/pc/comp lang/cem/cpp.ansi
-do
-	cp $SRC_HOME/$i/Parameters $CONFIG/$i/Parameters
-	chmod +w $CONFIG/$i/Parameters
-done
-
-cd $CONFIG/mach
-for i in *
-do
-    if [ -d $i ]
-    then
-	if [ -d $i/as ]
-	then
-		cd $i/as
-		mk_makefile $SRC_HOME/mach/proto/as/proto.make | sed -e "/#MACH_DEFINE/,/^MACH/s/=.*/= $i/" > Makefile
-		cd ../..
-	fi
-	if [ -d $i/top ]
-	then
-		cd $i/top
-		mk_makefile $SRC_HOME/mach/proto/top/proto.make | sed -e "/#MACH_DEFINE/,/^MACH/s/=.*/= $i/" > Makefile
-		cd ../..
-	fi
-	if [ -d $i/cg ]
-	then
-		cd $i/cg
-		mk_makefile $SRC_HOME/mach/proto/cg/proto.make | sed -e "/#MACH_DEFINE/,/^MACH/s/=.*/= $i/" > Makefile
-		cd ../..
-	fi
-	if [ -d $i/ncg ]
-	then
-		cd $i/ncg
-		mk_makefile $SRC_HOME/mach/proto/ncg/proto.make | sed -e "/#MACH_DEFINE/,/^MACH/s/=.*/= $i/" > Makefile
-		if [ -f $SRC_HOME/mach/$i/ncg/table_dir ]
-		then
-			ed -s Makefile <<EOF
-/^#TABLE_DEFINE/+1r $SRC_HOME/mach/$i/ncg/table_dir
-w
-q
-EOF
-		fi
-		cd ../..
-	fi
-	if [ -f $SRC_HOME/mach/$i/mach_params ]
-	then	:
-	else	continue
-	fi
-	for j in libem libend libmon libfp libsys libdb
-	do
-	    if [ -d $i/$j ]
-	    then
-		cd $i/$j
-		mk_makefile $SRC_HOME/mach/proto/libg/proto.$j | sed -e "/#MACH_PARAMS/r $SRC_HOME/mach/$i/mach_params" > Makefile
-		cd ../..
-	    fi
-	done
-	for j in libbsd4_1a libbsd4_2 libsysV_2
-	do
-	    if [ -d $i/$j ]
-	    then
-		cd $i/$j
-		mk_makefile $SRC_HOME/mach/proto/libg/proto.libsys | sed -e "/#MACH_PARAMS/r $SRC_HOME/mach/$i/mach_params" -e "s/libsys/$j/g" > Makefile
-		cd ../..
-	    fi
-	done
-	for j in libcc libcc.ansi libm2 libpc libbc liboc libf77
-	do
-	    create_dir $i/$j
-	    rm -f $i/$j/No*
-	    cd $i/$j
-	    mk_makefile $SRC_HOME/mach/proto/libg/proto.$j | sed -e "/#MACH_PARAMS/r $SRC_HOME/mach/$i/mach_params" > Makefile
-	    cd ../..
-	done
-	if [ $i = vax4 ]
-	then :
-	elif [ -d $i/libsys ]
-	then :
-	else 
-		create_dir $i/libsys
-		rm -f $i/libsys/No*
-		cd $i/libsys
-		mk_makefile $SRC_HOME/mach/proto/libg/proto.sysmon | sed -e "/#MACH_PARAMS/r $SRC_HOME/mach/$i/mach_params" > Makefile
-		cd ../..
-	fi
-    fi
-done
diff --git a/first/mk_makefile b/first/mk_makefile
deleted file mode 100755
index ae0946bf1..000000000
--- a/first/mk_makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-: '$Id$'
-
-: This shell script inserts make macros after a line
-: starting with #PARAMS in "make_proto", and produces the result on
-: standard output.
-
-trap "rm -f /tmp/mk_mak$$" 0 1 2 3 15
-case $# in
-1)	;;
-*)	echo "Usage: $0 <make_proto>" 1>&2
-	exit 1
-	;;
-esac
-
-cp $1 /tmp/mk_mak$$
-
-ed -s /tmp/mk_mak$$ << 'EOF'
-/^#PARAMS/c
-#PARAMS		do not remove this line!
-.
-w
-q
-EOF
-case `ack_sys` in
-sparc_solaris)
-	ed -s /tmp/mk_mak$$ << 'EOF'
-g/^EXTRALIB/s/=/= -lelf/
-w
-q
-EOF
-	;;
-esac
-cat /tmp/mk_mak$$
-exit 0
diff --git a/first/mk_target b/first/mk_target
deleted file mode 100755
index 8ab62a4b6..000000000
--- a/first/mk_target
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-: machine-dependant stuff
-
-create_dir $TARGET_HOME
-create_dir $TARGET_HOME/config
-create_dir $TARGET_HOME/lib.bin
-create_dir $TARGET_HOME/modules
-create_dir $TARGET_HOME/modules/h
-create_dir $TARGET_HOME/bin
-
-cp local.h em_path.h $TARGET_HOME/config
-cp_dir $SRC_HOME/bin $TARGET_HOME/bin
-cp $CONFIG/bin/cp_dir $TARGET_HOME/bin/cp_dir
-echo "echo $SYSNAME" > $TARGET_HOME/bin/ack_sys
-chmod +x $TARGET_HOME/bin/ack_sys
-
-: machine-independant stuff
-
-if [ $DO_MACHINE_INDEP = n ]
-then
-	exit 0
-fi
-
-create_dir $TARGET_HOME/lib
-create_dir $TARGET_HOME/etc
-create_dir $TARGET_HOME/h
-create_dir $TARGET_HOME/include
-create_dir $TARGET_HOME/doc
-
-cp $SRC_HOME/etc/ip_spec.t $TARGET_HOME/etc/ip_spec.t
-cp_dir $SRC_HOME/lib $TARGET_HOME/lib
-cp_dir $SRC_HOME/h $TARGET_HOME/h
-cp_dir $SRC_HOME/include $TARGET_HOME/include
-
-cd $TARGET_HOME
-find . -type f -exec chmod +w {} \;
-
-exit 0
diff --git a/first/target_comp b/first/target_comp
deleted file mode 100644
index db980dcfc..000000000
--- a/first/target_comp
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# compiler set for target machine
-
-CC=cc#				# compiler to be used for compiling ACK
-
-# always passed to $(CC) -c.
-COPTIONS=-O -D_EM_WSIZE=4 -D_EM_PSIZE=4
-
-# passed to $(CC) -c when compiling modules.
-LIBOPTIONS=#
-# LIBOPTIONS=-LIB -L		# when $(CC) is ACK
-
-CC_AND_MKDEP=cc-and-mkdep.all#	# when $(CC) is neither ACK or SUN,
-# CC_AND_MKDEP=cc-and-mkdep.ack## when $(CC) is an ACK-derived C compiler,
-# CC_AND_MKDEP=cc-and-mkdep.sun## when $(CC) is a SUN C compiler
-
-LDOPTIONS=#			# always passed to $(CC) when linking
-
-SUF=o#				# suffix of files produced with $(CC) -c
-
-AR=ar#				# archiver for Unix format objects
-# AR=aal#			# archiver for ACK .o format objects
-# AR=arch#			# archiver for ACK .s format objects
-
-RANLIB=ranlib#			# when ranlib required
-# RANLIB=:# 			# when ranlib not required
-
-LIBSUF=a#			# suffix of object libraries
diff --git a/first/util_comp b/first/util_comp
deleted file mode 100644
index 8f046f627..000000000
--- a/first/util_comp
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# compiler set for producing runnable binaries (possibly using $(UTIL_HOME)).
-# This must describe the compiler with which $(UTIL_HOME) has been compiled.
-# If $(TARGET_HOME) is identical to $(UTIL_HOME), which usually will be
-# the case, this part does not have to be changed. Otherwise (when you are
-# cross-compiling ACK), you will have to change this part. Probable
-# replacements are given in comments. Maybe the installation script
-# has already changed them, but they should be checked to be sure.
-
-UCC=$(CC)
-#UCC=cc#			# compiler to be used
-
-UCOPTIONS=$(COPTIONS)
-#UCOPTIONS=-O#			# always passed to $(UCC) -c.
-
-ULDOPTIONS=$(LDOPTIONS)
-#ULDOPTIONS=#			# always passed to $(UCC) when linking
-
-USUF=$(SUF)
-#USUF=o#			# suffix of files produced with $(UCC) -c
-
-ULIBSUF=$(LIBSUF)
-#ULIBSUF=a#			# suffix of object libraries for $(UCC)
diff --git a/lang/basic/build.mk b/lang/basic/build.mk
deleted file mode 100644
index c14c7f358..000000000
--- a/lang/basic/build.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include lang/basic/lib/build.mk
-include lang/basic/src/build.mk
-
diff --git a/lang/basic/lib/build.mk b/lang/basic/lib/build.mk
deleted file mode 100644
index 9f54a4b4e..000000000
--- a/lang/basic/lib/build.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-define build-runtime-libbasic-impl
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-
-$(call ackfile, lang/basic/lib/fif.e)
-$(call ackfile, lang/basic/lib/fef.e)
-$(call ackfile, lang/basic/lib/setline.e)
-$(call ackfile, lang/basic/lib/abs.c)
-$(call ackfile, lang/basic/lib/asc.c)
-$(call ackfile, lang/basic/lib/asrt.c)
-$(call ackfile, lang/basic/lib/atn.c)
-$(call ackfile, lang/basic/lib/chr.c)
-$(call ackfile, lang/basic/lib/conversion.c)
-$(call ackfile, lang/basic/lib/error.c)
-$(call ackfile, lang/basic/lib/exp.c)
-$(call ackfile, lang/basic/lib/file.c)
-$(call ackfile, lang/basic/lib/hlt.c)
-$(call ackfile, lang/basic/lib/io.c)
-$(call ackfile, lang/basic/lib/log.c)
-$(call ackfile, lang/basic/lib/mki.c)
-$(call ackfile, lang/basic/lib/oct.c)
-$(call ackfile, lang/basic/lib/peek.c)
-$(call ackfile, lang/basic/lib/power.c)
-$(call ackfile, lang/basic/lib/print.c)
-$(call ackfile, lang/basic/lib/random.c)
-$(call ackfile, lang/basic/lib/read.c)
-$(call ackfile, lang/basic/lib/return.c)
-$(call ackfile, lang/basic/lib/salloc.c)
-$(call ackfile, lang/basic/lib/sgn.c)
-$(call ackfile, lang/basic/lib/sin.c)
-$(call ackfile, lang/basic/lib/sqt.c)
-$(call ackfile, lang/basic/lib/stop.c)
-$(call ackfile, lang/basic/lib/string.c)
-$(call ackfile, lang/basic/lib/swap.c)
-$(call ackfile, lang/basic/lib/trace.c)
-$(call ackfile, lang/basic/lib/trap.c)
-$(call ackfile, lang/basic/lib/write.c)
-
-$(call acklibrary, $(LIBDIR)/$(PLATFORM)/libbasic.a)
-$(call installto, $(PLATIND)/$(PLATFORM)/libbasic.a)
-
-endef
-
-build-runtime-libbasic = $(eval $(build-runtime-libbasic-impl))
-
-$(eval RUNTIMES += libbasic)
-
diff --git a/lang/basic/src/build.mk b/lang/basic/src/build.mk
deleted file mode 100644
index 95019babd..000000000
--- a/lang/basic/src/build.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-D := lang/basic/src
-
-define build-bem-impl
-
-$(call reset)
-$(eval cflags += -I$(OBJDIR)/$D -I$D)
-
-$(call cfile, $D/bem.c)
-$(call cfile, $D/symbols.c)
-$(call cfile, $D/initialize.c)
-$(call cfile, $D/compile.c)
-$(call cfile, $D/parsepar.c)
-$(call cfile, $D/gencode.c)
-$(call cfile, $D/util.c)
-$(call cfile, $D/graph.c)
-$(call cfile, $D/eval.c)
-$(call cfile, $D/func.c)
-
-$(call llgen, $(OBJDIR)/$D, $D/basic.g)
-
-$(eval g := $(OBJDIR)/$D/tokentab.h)
-$(eval $q: $g)
-$(eval CLEANABLES += $g)
-$g: $D/maketokentab $(OBJDIR)/$D/Lpars.h
-	@echo TOKENTAB $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) cd $(OBJDIR)/$D && $(abspath $$^)
-
-$(eval $q: $(OBJDIR)/$D/Lpars.h)
-$(eval $q: $(INCDIR)/print.h)
-
-$(call rawfile, $(LIBEM_MES))
-$(call rawfile, $(LIBEMK))
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBALLOC))
-$(call rawfile, $(LIBPRINT))
-$(call rawfile, $(LIBSTRING))
-$(call rawfile, $(LIBSYSTEM))
-$(call cprogram, $(BINDIR)/em_bem)
-$(call installto, $(PLATDEP)/em_bem)
-
-endef
-
-$(eval $(build-bem-impl))
diff --git a/lang/cem/build.mk b/lang/cem/build.mk
deleted file mode 100644
index 23e0dba95..000000000
--- a/lang/cem/build.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-include lang/cem/cpp.ansi/build.mk
-include lang/cem/cemcom.ansi/build.mk
-include lang/cem/libcc.ansi/build.mk
-
-$(eval CCOMPILER := $(CPPANSI) $(CEMCOMANSI) $(LIBCCANSIHEADERS))
-
diff --git a/lang/cem/cemcom.ansi/build.mk b/lang/cem/cemcom.ansi/build.mk
deleted file mode 100644
index 1f2b483ec..000000000
--- a/lang/cem/cemcom.ansi/build.mk
+++ /dev/null
@@ -1,156 +0,0 @@
-D := lang/cem/cemcom.ansi
-
-define build-cemcom-ansi-allocd-header
-$(eval g := $(OBJDIR)/$D/$(strip $1).h)
-$g: $D/$(strip $1).str $D/make.allocd
-	@echo ALLOCD $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.allocd < $$^ > $$@
-
-$(eval CLEANABLES += $g)
-$(eval $q: $g)
-endef
-
-define build-cemcom-ansi-next
-$(eval CLEANABLES += $(OBJDIR)/$D/next.c)
-$(OBJDIR)/$D/next.c: $D/make.next $1
-	@echo NEXT $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $$^ > $$@
-$(call cfile, $(OBJDIR)/$D/next.c)
-
-$(foreach f, $1, $(call build-cemcom-ansi-allocd-header, \
-	$(basename $(notdir $f))))
-endef
-
-define build-cemcom-ansi-impl
-
-$(call reset)
-$(eval cflags += -I$(OBJDIR)/$D -I$D)
-
-$(call cfile, $D/arith.c)
-$(call dependson, $(INCDIR)/flt_arith.h)
-
-$(call cfile, $D/blocks.c)
-$(call dependson, $(INCDIR)/em_codeEK.h)
-
-$(call cfile, $D/LLlex.c)
-$(call cfile, $D/LLmessage.c)
-
-$(call cfile, $D/ch3.c)
-$(call cfile, $D/ch3bin.c)
-$(call cfile, $D/ch3mon.c)
-$(call cfile, $D/code.c)
-$(call cfile, $D/conversion.c)
-$(call cfile, $D/cstoper.c)
-$(call cfile, $D/dataflow.c)
-$(call cfile, $D/declarator.c)
-$(call cfile, $D/decspecs.c)
-$(call cfile, $D/domacro.c)
-$(call cfile, $D/dumpidf.c)
-$(call cfile, $D/error.c)
-$(call cfile, $D/eval.c)
-$(call cfile, $D/expr.c)
-$(call cfile, $D/field.c)
-$(call cfile, $D/fltcstoper.c)
-$(call cfile, $D/idf.c)
-$(call cfile, $D/init.c)
-$(call cfile, $D/input.c)
-$(call cfile, $D/l_comment.c)
-$(call cfile, $D/l_ev_ord.c)
-$(call cfile, $D/l_lint.c)
-$(call cfile, $D/l_misc.c)
-$(call cfile, $D/l_outdef.c)
-$(call cfile, $D/l_states.c)
-$(call cfile, $D/label.c)
-$(call cfile, $D/main.c)
-$(call cfile, $D/options.c)
-$(call cfile, $D/pragma.c)
-$(call cfile, $D/proto.c)
-$(call cfile, $D/replace.c)
-$(call cfile, $D/skip.c)
-$(call cfile, $D/stab.c)
-$(call cfile, $D/stack.c)
-$(call cfile, $D/struct.c)
-$(call cfile, $D/switch.c)
-$(call cfile, $D/tokenname.c)
-$(call cfile, $D/type.c)
-$(call cfile, $D/util.c)
-
-$(call llgen, $(OBJDIR)/$D, \
-	$(OBJDIR)/$D/tokenfile.g \
-	$D/program.g \
-	$D/declar.g \
-	$D/expression.g \
-	$D/statement.g \
-	$D/ival.g)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/tokenfile.g)
-$(OBJDIR)/$D/tokenfile.g: $D/make.tokfile $D/tokenname.c
-	@echo TOKENFILE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) sh $D/make.tokfile < $D/tokenname.c > $$@
-
-$(call tabgen, $D/char.tab)
-
-$(eval $q: $(OBJDIR)/$D/parameters.h)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/parameters.h)
-$(OBJDIR)/$D/parameters.h: $D/BigPars
-	@echo PARAMETERS $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) echo '#ifndef PARAMETERS_H' > $$@
-	$(hide) echo '#define PARAMETERS_H' >> $$@
-	$(hide) grep -v '^!' < $D/BigPars >> $$@
-	$(hide) echo '#endif' >> $$@
-
-$(eval CLEANABLES += $(OBJDIR)/$D/symbol2str.c)
-$(OBJDIR)/$D/symbol2str.c: $D/make.tokcase $D/tokenname.c
-	@echo TOKCASE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.tokcase < $D/tokenname.c > $$@
-$(call cfile, $(OBJDIR)/$D/symbol2str.c)
-
-$(call build-cemcom-ansi-next, \
-		$D/code.str \
-		$D/declar.str \
-		$D/def.str \
-		$D/expr.str \
-		$D/field.str \
-		$D/estack.str \
-		$D/util.str \
-		$D/proto.str \
-		$D/replace.str \
-		$D/idf.str \
-		$D/macro.str \
-		$D/stack.str \
-		$D/stmt.str \
-		$D/struct.str \
-		$D/switch.str \
-		$D/type.str \
-		$D/l_brace.str \
-		$D/l_state.str \
-		$D/l_outdef.str)
-
-$(eval $q: $(OBJDIR)/$D/Lpars.h)
-
-$(call rawfile, $(LIBEM_MES))
-$(call rawfile, $(LIBEMK))
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBINPUT))
-$(call rawfile, $(LIBASSERT))
-$(call rawfile, $(LIBALLOC))
-$(call rawfile, $(LIBFLT_ARITH))
-$(call rawfile, $(LIBPRINT))
-$(call rawfile, $(LIBSYSTEM))
-$(call rawfile, $(LIBSTRING))
-$(call cprogram, $(BINDIR)/cemcom.ansi)
-$(call installto, $(PLATDEP)/em_cemcom.ansi)
-$(eval CEMCOMANSI := $o)
-
-$(call reset)
-$(eval q := $D/cemcom.ansi.1)
-$(call installto, $(INSDIR)/share/man/man1/cemcom.6)
-endef
-
-$(eval $(build-cemcom-ansi-impl))
diff --git a/lang/cem/cpp.ansi/build.mk b/lang/cem/cpp.ansi/build.mk
deleted file mode 100644
index be03bc958..000000000
--- a/lang/cem/cpp.ansi/build.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-D := lang/cem/cpp.ansi
-
-define build-cpp-ansi-allocd-header
-$1: $2 $D/make.allocd
-	@echo ALLOCD $1
-	@mkdir -p $(dir $1)
-	$(hide) $D/make.allocd < $2 > $1
-
-$(eval CLEANABLES += $1)
-endef
-
-define build-cpp-ansi-tokfile
-$(OBJDIR)/$D/tokenfile.g: $D/make.tokfile $D/tokenname.c
-	@echo TOKENFILE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) sh $D/make.tokfile < $D/tokenname.c > $$@
-
-$(eval CLEANABLES += $(OBJDIR)/$D/tokenfile.g)
-endef
-
-define build-cpp-ansi-tokcase
-$(OBJDIR)/$D/symbol2str.c: $D/make.tokcase $D/tokenname.c
-	@echo TOKCASE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) sh $D/make.tokcase < $D/tokenname.c > $$@
-
-$(eval CLEANABLES += $(OBJDIR)/$D/symbol2str.c)
-endef
-
-define build-cpp-ansi-next
-$(OBJDIR)/$D/next.c: $D/make.next $D/macro.str $D/replace.str
-	@echo NEXT $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) sh $D/make.next $D/macro.str $D/replace.str > $$@
-
-$(eval CLEANABLES += $(OBJDIR)/$D/next.c)
-endef
-
-define build-cpp-ansi-impl
-	$(eval $(call build-cpp-ansi-next))
-	$(eval $(call build-cpp-ansi-tokcase))
-	$(eval $(call build-cpp-ansi-tokfile))
-	$(eval $(call build-cpp-ansi-allocd-header, \
-	    $(OBJDIR)/$D/macro.h, $D/macro.str \
-	))
-	$(eval $(call build-cpp-ansi-allocd-header, \
-	    $(OBJDIR)/$D/replace.h, $D/replace.str \
-	))
-
-	$(call reset)
-	$(eval cflags += -I$(OBJDIR)/$D -I$D)
-
-	$(call cfile, $D/LLlex.c)
-	$(call cfile, $D/LLmessage.c)
-	$(call cfile, $D/ch3bin.c)
-	$(call cfile, $D/ch3mon.c)
-	$(call cfile, $D/domacro.c)
-	$(call cfile, $D/error.c)
-	$(call cfile, $D/idf.c)
-	$(call cfile, $D/init.c)
-	$(call cfile, $D/input.c)
-	$(call cfile, $D/main.c)
-	$(call cfile, $D/options.c)
-	$(call cfile, $D/preprocess.c)
-	$(call cfile, $D/replace.c)
-	$(call cfile, $D/skip.c)
-	$(call cfile, $D/tokenname.c)
-	$(call cfile, $D/expr.c)
-	$(call cfile, $(OBJDIR)/$D/symbol2str.c)
-	$(call cfile, $(OBJDIR)/$D/next.c)
-
-	$(call llgen, $(OBJDIR)/$D, $(OBJDIR)/$D/tokenfile.g $D/expression.g)
-
-	$(call rawfile, $(LIBINPUT))
-	$(call rawfile, $(LIBASSERT))
-	$(call rawfile, $(LIBALLOC))
-	$(call rawfile, $(LIBPRINT))
-	$(call rawfile, $(LIBSYSTEM))
-	$(call rawfile, $(LIBSTRING))
-
-	$(call tabgen, $D/char.tab)
-
-	$(eval $q: \
-		$(OBJDIR)/$D/macro.h \
-		$(OBJDIR)/$D/Lpars.h \
-		$(INCDIR)/alloc.h \
-		$(INCDIR)/inp_pkg.spec \
-		$(INCDIR)/idf_pkg.spec \
-		$(OBJDIR)/$D/replace.h \
-		$(INCDIR)/system.h \
-		$(INCDIR)/inp_pkg.body \
-		$(INCDIR)/inp_pkg.spec \
-		$(INCDIR)/idf_pkg.body)
-
-	$(call cprogram, $(BINDIR)/cpp.ansi)
-	$(call installto, $(PLATDEP)/cpp.ansi)
-	$(eval CPPANSI := $o)
-
-	$(call reset)
-	$(eval q := $D/ncpp.6)
-	$(call installto, $(INSDIR)/share/man/man6/cpp.ansi.6)
-endef
-
-$(eval $(build-cpp-ansi-impl))
diff --git a/lang/cem/libcc.ansi/build.mk b/lang/cem/libcc.ansi/build.mk
deleted file mode 100644
index d4300311d..000000000
--- a/lang/cem/libcc.ansi/build.mk
+++ /dev/null
@@ -1,275 +0,0 @@
-define build-libcc-ansi-headers-install-one-impl
-	$(call reset)
-	$(eval q := lang/cem/libcc.ansi/headers/$(strip $1))
-	$(call installto, $(PLATIND)/include/ansi/$(strip $1))
-	$(eval LIBCCANSIHEADERS += $o)
-endef
-
-define build-libcc-ansi-headers-impl
-	$(eval g := \
-		sys/time.h \
-		sys/ioctl.h \
-		assert.h \
-		ctype.h \
-		errno.h \
-		fcntl.h \
-		float.h \
-		limits.h \
-		math.h \
-		malloc.h \
-		setjmp.h \
-		signal.h \
-		stdarg.h \
-		stddef.h \
-		stdint.h \
-		stdio.h \
-		stdlib.h \
-		string.h \
-		time.h \
-		iso646.h \
-		stdbool.h \
-		locale.h \
-		tgmath.h)
-
-	$(eval LIBCCANSIHEADERS :=)
-	$(foreach f,$g,$(call build-libcc-ansi-headers-install-one-impl,$f))
-endef
-
-$(eval $(build-libcc-ansi-headers-impl))
-
-define build-runtime-libcc-ansi-impl
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-
-# Assert
-
-$(call ackfile, lang/cem/libcc.ansi/assert/assert.c)
-
-# CType
-
-$(call ackfile, lang/cem/libcc.ansi/ctype/tolower.c)
-$(call ackfile, lang/cem/libcc.ansi/ctype/toupper.c)
-$(call acktabgen, lang/cem/libcc.ansi/ctype/char.tab)
-
-$(eval g := \
-	isalnum.c \
-	isalpha.c \
-	iscntrl.c \
-	isdigit.c \
-	isgraph.c \
-	islower.c \
-	isprint.c \
-	ispunct.c \
-	isspace.c \
-	isupper.c \
-	isxdigit.c \
-	isascii.c)
-$(eval g := $(addprefix $(OBJDIR)/$(objdir)/ctype/, $g))
-
-$(wordlist 2, $(words $g), $g): $(firstword $g)
-$(firstword $g): lang/cem/libcc.ansi/ctype/genfiles
-	@echo GENFILES $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) cd $$(dir $$@) && sh $$(abspath $$^)
-
-$(eval CLEANABLES += $g)
-$(foreach f, $g, $(call ackfile, $f))
-
-# errno
-
-$(call ackfile, lang/cem/libcc.ansi/errno/errlist.c)
-
-# locale
-
-$(call ackfile, lang/cem/libcc.ansi/locale/localeconv.c)
-$(call ackfile, lang/cem/libcc.ansi/locale/setlocale.c)
-
-# math
-
-$(call ackfile, lang/cem/libcc.ansi/math/asin.c)
-$(call ackfile, lang/cem/libcc.ansi/math/atan2.c)
-$(call ackfile, lang/cem/libcc.ansi/math/atan.c)
-$(call ackfile, lang/cem/libcc.ansi/math/ceil.c)
-$(call ackfile, lang/cem/libcc.ansi/math/fabs.c)
-$(call ackfile, lang/cem/libcc.ansi/math/pow.c)
-$(call ackfile, lang/cem/libcc.ansi/math/log10.c)
-$(call ackfile, lang/cem/libcc.ansi/math/log.c)
-$(call ackfile, lang/cem/libcc.ansi/math/sin.c)
-$(call ackfile, lang/cem/libcc.ansi/math/sinh.c)
-$(call ackfile, lang/cem/libcc.ansi/math/sqrt.c)
-$(call ackfile, lang/cem/libcc.ansi/math/tan.c)
-$(call ackfile, lang/cem/libcc.ansi/math/tanh.c)
-$(call ackfile, lang/cem/libcc.ansi/math/exp.c)
-$(call ackfile, lang/cem/libcc.ansi/math/ldexp.c)
-$(call ackfile, lang/cem/libcc.ansi/math/fmod.c)
-$(call ackfile, lang/cem/libcc.ansi/math/floor.c)
-$(call ackfile, lang/cem/libcc.ansi/math/hugeval.c)
-$(call ackfile, lang/cem/libcc.ansi/math/frexp.e)
-$(call ackfile, lang/cem/libcc.ansi/math/modf.e)
-$(call ackfile, lang/cem/libcc.ansi/math/isnan.c)
-
-# Misc
-
-$(call ackfile, lang/cem/libcc.ansi/misc/environ.c)
-# (lots of stuff missing here, as not being appropriate on modern systems)
-
-# setjmp
-
-$(call ackfile, lang/cem/libcc.ansi/setjmp/setjmp.e)
-
-# signal
-
-$(call ackfile, lang/cem/libcc.ansi/signal/raise.c)
-
-# stdio
-
-$(call ackfile, lang/cem/libcc.ansi/stdio/tmpfile.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/tmpnam.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fopen.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/freopen.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/setbuf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/setvbuf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/perror.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/printf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/sprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/snprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/vfprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/vprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/vsprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/vsnprintf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/doprnt.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/icompute.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fscanf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/scanf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/sscanf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/doscan.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fgetc.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fgets.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/getc.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/getchar.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/gets.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/putc.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/putchar.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fputc.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/puts.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fputs.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/ungetc.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fread.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fwrite.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fgetpos.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fsetpos.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/rewind.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fseek.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/ftell.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/clearerr.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/feof.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/ferror.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fileno.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fltpr.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/ecvt.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fillbuf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fclose.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/flushbuf.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/fflush.c)
-$(call ackfile, lang/cem/libcc.ansi/stdio/data.c)
-
-# stdlib
-
-$(call ackfile, lang/cem/libcc.ansi/stdlib/abort.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/abs.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/atof.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/atoi.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/atol.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/bsearch.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/div.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/atexit.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/exit.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/getenv.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/setenv.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/labs.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/ldiv.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/mblen.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/mbstowcs.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/mbtowc.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/qsort.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/rand.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/strtod.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/strtol.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/wcstombs.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/wctomb.c)
-$(call ackfile, lang/cem/libcc.ansi/stdlib/ext_comp.c)
-
-$(eval g := $(OBJDIR)/$(objdir)/malloc.c)
-$(eval CLEANABLES += $g)
-$(eval srcs := \
-	READ_ME size_type.h param.h impl.h check.h \
-	log.h phys.h mal.c log.c phys.c check.c)
-$(eval srcs := $(addprefix lang/cem/libcc.ansi/stdlib/malloc/, $(srcs)))
-
-$g: lang/cem/libcc.ansi/stdlib/malloc/add_file $(srcs)
-	@echo MALLOC $g
-	@mkdir -p $(dir $g)
-	$(hide) $(RM) $g && for i in $(srcs); do \
-		lang/cem/libcc.ansi/stdlib/malloc/add_file $$$$i >> $g; done
-
-$(call ackfile, $g)
-
-# String
-
-$(call ackfile, lang/cem/libcc.ansi/string/memchr.c)
-$(call ackfile, lang/cem/libcc.ansi/string/memcmp.c)
-$(call ackfile, lang/cem/libcc.ansi/string/memcpy.c)
-$(call ackfile, lang/cem/libcc.ansi/string/memmove.c)
-$(call ackfile, lang/cem/libcc.ansi/string/memset.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strcat.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strchr.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strcmp.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strcoll.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strcpy.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strcspn.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strerror.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strncat.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strncpy.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strrchr.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strstr.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strlen.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strtok.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strpbrk.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strspn.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strncmp.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strxfrm.c)
-$(call ackfile, lang/cem/libcc.ansi/string/strdup.c)
-
-# Time
-
-$(call ackfile, lang/cem/libcc.ansi/time/ctime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/asctime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/localtime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/clock.c)
-$(call ackfile, lang/cem/libcc.ansi/time/difftime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/gmtime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/mktime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/strftime.c)
-$(call ackfile, lang/cem/libcc.ansi/time/time.c)
-$(call ackfile, lang/cem/libcc.ansi/time/tzset.c)
-$(call ackfile, lang/cem/libcc.ansi/time/misc.c)
-
-$(call acklibrary, $(LIBDIR)/$(PLATFORM)/libc.a)
-$(call installto, $(PLATIND)/$(PLATFORM)/libc.a)
-
-# CRT
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-$(eval ackflags += -Ih)
-$(call ackfile, lang/cem/libcc.ansi/head_ac.e)
-$(call installto, $(PLATIND)/$(PLATFORM)/c-ansi.o)
-
-endef
-
-build-runtime-libcc-ansi = $(eval $(build-runtime-libcc-ansi-impl))
-
-$(eval RUNTIMES += libcc-ansi)
-
diff --git a/lang/m2/build.mk b/lang/m2/build.mk
deleted file mode 100644
index 9d3f87be8..000000000
--- a/lang/m2/build.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include lang/m2/libm2/build.mk
-include lang/m2/comp/build.mk
-
diff --git a/lang/m2/comp/build.mk b/lang/m2/comp/build.mk
deleted file mode 100644
index 18ca8b7dd..000000000
--- a/lang/m2/comp/build.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-D := lang/m2/comp
-
-define build-m2-allocd-header
-$2: $1 $D/make.allocd
-	@echo ALLOCD $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.allocd < $$^ > $$@
-
-$(eval CLEANABLES += $2)
-$(eval $q: $2)
-endef
-
-define build-m2-next
-$(eval CLEANABLES += $(OBJDIR)/$D/next.c)
-$(OBJDIR)/$D/next.c: $D/make.next $1
-	@echo NEXT $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $$^ > $$@
-$(call cfile, $(OBJDIR)/$D/next.c)
-
-$(foreach f, $1, $(call build-m2-allocd-header, \
-	$f, $(OBJDIR)/$(basename $f).h))
-endef
-
-define build-m2-impl
-
-$(call reset)
-$(eval cflags += -I$(OBJDIR)/$D -I$D)
-
-$(call cfile, $D/LLlex.c)
-$(call cfile, $D/LLmessage.c)
-$(call cfile, $D/chk_expr.c)
-$(call cfile, $D/code.c)
-$(call cfile, $D/cstoper.c)
-$(call cfile, $D/def.c)
-$(call cfile, $D/defmodule.c)
-$(call cfile, $D/desig.c)
-$(call cfile, $D/enter.c)
-$(call cfile, $D/error.c)
-$(call cfile, $D/idf.c)
-$(call cfile, $D/input.c)
-$(call cfile, $D/lookup.c)
-$(call cfile, $D/main.c)
-$(call cfile, $D/misc.c)
-$(call cfile, $D/node.c)
-$(call cfile, $D/options.c)
-$(call cfile, $D/stab.c)
-$(call cfile, $D/tokenname.c)
-$(call cfile, $D/type.c)
-$(call cfile, $D/typequiv.c)
-$(call cfile, $D/walk.c)
-
-$(call llgen, $(OBJDIR)/$D, \
-	$(OBJDIR)/$D/tokenfile.g \
-	$D/program.g \
-	$D/declar.g \
-	$D/expression.g \
-	$D/statement.g)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/tokenfile.g)
-$(OBJDIR)/$D/tokenfile.g: $D/make.tokfile $D/tokenname.c
-	@echo TOKENFILE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) sh $D/make.tokfile < $D/tokenname.c > $$@
-
-$(call tabgen, $D/char.tab)
-
-$(eval $q: $(OBJDIR)/$D/parameters.h)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/parameters.h)
-$(OBJDIR)/$D/parameters.h: $D/BigPars
-	@echo PARAMETERS $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) echo '#ifndef PARAMETERS_H' > $$@
-	$(hide) echo '#define PARAMETERS_H' >> $$@
-	$(hide) grep -v '^!' < $$^ >> $$@
-	$(hide) echo '#endif' >> $$@
-
-$(eval CLEANABLES += $(OBJDIR)/$D/symbol2str.c)
-$(OBJDIR)/$D/symbol2str.c: $D/make.tokcase $D/tokenname.c
-	@echo TOKCASE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.tokcase < $D/tokenname.c > $$@
-$(call cfile, $(OBJDIR)/$D/symbol2str.c)
-
-$(call build-m2-next, \
-		$D/def.H \
-		$D/type.H \
-		$D/real.H \
-		$D/node.H)
-
-$(call build-m2-allocd-header, $D/tmpvar.C, $(OBJDIR)/$D/tmpvar.c)
-$(call cfile, $(OBJDIR)/$D/tmpvar.c)
-
-$(call build-m2-allocd-header, $D/casestat.C, $(OBJDIR)/$D/casestat.c)
-$(call cfile, $(OBJDIR)/$D/casestat.c)
-
-$(call build-m2-allocd-header, $D/scope.C, $(OBJDIR)/$D/scope.c)
-$(call cfile, $(OBJDIR)/$D/scope.c)
-
-$(eval $q: $(OBJDIR)/$D/Lpars.h)
-$(eval $q: $(INCDIR)/idf_pkg.spec)
-$(eval $q: $(INCDIR)/idf_pkg.body)
-$(eval $q: $(INCDIR)/inp_pkg.spec)
-$(eval $q: $(INCDIR)/inp_pkg.body)
-$(eval $q: $(INCDIR)/alloc.h)
-$(eval $q: $(INCDIR)/em_codeEK.h)
-$(eval $q: $(INCDIR)/print.h)
-$(eval $q: $(INCDIR)/system.h)
-
-$(call rawfile, $(LIBEM_MES))
-$(call rawfile, $(LIBEMK))
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBINPUT))
-$(call rawfile, $(LIBASSERT))
-$(call rawfile, $(LIBALLOC))
-$(call rawfile, $(LIBFLT_ARITH))
-$(call rawfile, $(LIBPRINT))
-$(call rawfile, $(LIBSYSTEM))
-$(call rawfile, $(LIBSTRING))
-$(call cprogram, $(BINDIR)/em_m2)
-$(call installto, $(PLATDEP)/em_m2)
-
-$(call reset)
-$(eval q := $D/em_m2.6)
-$(call installto, $(INSDIR)/share/man/man6/em_m2.6)
-endef
-
-$(eval $(build-m2-impl))
diff --git a/lang/m2/libm2/build.mk b/lang/m2/libm2/build.mk
deleted file mode 100644
index e7c27eac4..000000000
--- a/lang/m2/libm2/build.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-define build-runtime-libmodula2-impl
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-
-$(call ackfile, lang/m2/libm2/Arguments.c)
-$(call ackfile, lang/m2/libm2/ArraySort.mod)
-$(call ackfile, lang/m2/libm2/CSP.mod)
-$(call ackfile, lang/m2/libm2/Conversion.mod)
-$(call ackfile, lang/m2/libm2/EM.e)
-$(call ackfile, lang/m2/libm2/InOut.mod)
-$(call ackfile, lang/m2/libm2/LtoUset.e)
-$(call ackfile, lang/m2/libm2/MathLib0.mod)
-$(call ackfile, lang/m2/libm2/Mathlib.mod)
-$(call ackfile, lang/m2/libm2/PascalIO.mod)
-$(call ackfile, lang/m2/libm2/Processes.mod)
-$(call ackfile, lang/m2/libm2/RealConver.mod)
-$(call ackfile, lang/m2/libm2/RealInOut.mod)
-$(call ackfile, lang/m2/libm2/SYSTEM.c)
-$(call ackfile, lang/m2/libm2/Semaphores.mod)
-$(call ackfile, lang/m2/libm2/Storage.mod)
-$(call ackfile, lang/m2/libm2/StrAss.c)
-$(call ackfile, lang/m2/libm2/Streams.mod)
-$(call ackfile, lang/m2/libm2/Strings.mod)
-$(call ackfile, lang/m2/libm2/Termcap.mod)
-$(call ackfile, lang/m2/libm2/Traps.mod)
-$(call ackfile, lang/m2/libm2/XXTermcap.c)
-$(call ackfile, lang/m2/libm2/absd.c)
-$(call ackfile, lang/m2/libm2/absf.e)
-$(call ackfile, lang/m2/libm2/absi.c)
-$(call ackfile, lang/m2/libm2/absl.c)
-$(call ackfile, lang/m2/libm2/blockmove.c)
-$(call ackfile, lang/m2/libm2/cap.c)
-$(call ackfile, lang/m2/libm2/catch.c)
-$(call ackfile, lang/m2/libm2/confarray.c)
-$(call ackfile, lang/m2/libm2/dvi.c)
-$(call ackfile, lang/m2/libm2/halt.c)
-$(call ackfile, lang/m2/libm2/init.c)
-$(call ackfile, lang/m2/libm2/load.c)
-$(call ackfile, lang/m2/libm2/par_misc.e)
-$(call ackfile, lang/m2/libm2/random.mod)
-$(call ackfile, lang/m2/libm2/rcka.c)
-$(call ackfile, lang/m2/libm2/rcki.c)
-$(call ackfile, lang/m2/libm2/rckil.c)
-$(call ackfile, lang/m2/libm2/rcku.c)
-$(call ackfile, lang/m2/libm2/rckul.c)
-$(call ackfile, lang/m2/libm2/sigtrp.c)
-$(call ackfile, lang/m2/libm2/stackprio.c)
-$(call ackfile, lang/m2/libm2/store.c)
-$(call ackfile, lang/m2/libm2/ucheck.c)
-
-$(eval $q: $(EM_M2))
-
-$(call acklibrary, $(LIBDIR)/$(PLATFORM)/libmodula2.a)
-$(call installto, $(PLATIND)/$(PLATFORM)/libmodula2.a)
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-$(call ackfile, lang/m2/libm2/head_m2.e)
-$(call installto, $(PLATIND)/$(PLATFORM)/modula2.o)
-
-endef
-
-build-runtime-libmodula2 = $(eval $(build-runtime-libmodula2-impl))
-
-$(eval RUNTIMES += libmodula2)
-
-define build-headers-libmodula2-impl
-
-$(eval g := \
-	Arguments.def \
-	ArraySort.def \
-	ASCII.def \
-	Conversion.def \
-	CSP.def \
-	EM.def \
-	Epilogue.def \
-	InOut.def \
-	MathLib0.def \
-	Mathlib.def \
-	PascalIO.def \
-	Processes.def \
-	random.def \
-	RealConver.def \
-	RealInOut.def \
-	Semaphores.def \
-	Storage.def \
-	Streams.def \
-	Strings.def \
-	StripUnix.def \
-	Termcap.def \
-	Traps.def \
-	Unix.def \
-	XXTermcap.def)
-
-$(foreach f, $g, \
-	$(call reset) \
-	$(call rawfile, lang/m2/libm2/$f) \
-	$(call installto, $(PLATIND)/include/modula2/$f))
-
-endef
-
-$(eval $(build-headers-libmodula2-impl))
diff --git a/lang/pc/build.mk b/lang/pc/build.mk
deleted file mode 100644
index 82b8f2d5f..000000000
--- a/lang/pc/build.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-include lang/pc/libpc/build.mk
-include lang/pc/comp/build.mk
-
diff --git a/lang/pc/comp/build.mk b/lang/pc/comp/build.mk
deleted file mode 100644
index c3b4dd918..000000000
--- a/lang/pc/comp/build.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-D := lang/pc/comp
-
-define build-pc-allocd-header
-$2: $1 $D/make.allocd
-	@echo ALLOCD $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.allocd < $$^ > $$@
-
-$(eval CLEANABLES += $2)
-$(eval $q: $2)
-endef
-
-define build-pc-next
-$(eval CLEANABLES += $(OBJDIR)/$D/next.c)
-$(OBJDIR)/$D/next.c: $D/make.next $1
-	@echo NEXT $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $$^ > $$@
-$(call cfile, $(OBJDIR)/$D/next.c)
-
-$(foreach f, $1, $(call build-pc-allocd-header, \
-	$f, $(OBJDIR)/$(basename $f).h))
-endef
-
-define build-pc-impl
-
-$(call reset)
-$(eval cflags += -I$(OBJDIR)/$D -I$D -DSTATIC=static)
-
-$(call cfile, $D/LLlex.c)
-$(call cfile, $D/LLmessage.c)
-$(call cfile, $D/body.c)
-$(call cfile, $D/chk_expr.c)
-$(call cfile, $D/code.c)
-$(call cfile, $D/cstoper.c)
-$(call cfile, $D/def.c)
-$(call cfile, $D/desig.c)
-$(call cfile, $D/enter.c)
-$(call cfile, $D/error.c)
-$(call cfile, $D/idf.c)
-$(call cfile, $D/input.c)
-$(call cfile, $D/label.c)
-$(call cfile, $D/lookup.c)
-$(call cfile, $D/main.c)
-$(call cfile, $D/misc.c)
-$(call cfile, $D/node.c)
-$(call cfile, $D/options.c)
-$(call cfile, $D/progs.c)
-$(call cfile, $D/readwrite.c)
-$(call cfile, $D/scope.c)
-$(call cfile, $D/stab.c)
-$(call cfile, $D/tokenname.c)
-$(call cfile, $D/type.c)
-$(call cfile, $D/typequiv.c)
-
-$(call llgen, $(OBJDIR)/$D, \
-	$(OBJDIR)/$D/tokenfile.g \
-	$D/program.g \
-	$D/declar.g \
-	$D/expression.g \
-	$D/statement.g)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/tokenfile.g)
-$(OBJDIR)/$D/tokenfile.g: $D/make.tokfile $D/tokenname.c
-	@echo TOKENFILE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) sh $D/make.tokfile < $D/tokenname.c > $$@
-
-$(call tabgen, $D/char.tab)
-
-$(eval $q: $(OBJDIR)/$D/parameters.h)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/parameters.h)
-$(OBJDIR)/$D/parameters.h: $D/Parameters
-	@echo PARAMETERS $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) echo '#ifndef PARAMETERS_H' > $$@
-	$(hide) echo '#define PARAMETERS_H' >> $$@
-	$(hide) grep -v '^!' < $$^ >> $$@
-	$(hide) echo '#endif' >> $$@
-
-$(eval CLEANABLES += $(OBJDIR)/$D/symbol2str.c)
-$(OBJDIR)/$D/symbol2str.c: $D/make.tokcase $D/tokenname.c
-	@echo TOKCASE $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.tokcase < $D/tokenname.c > $$@
-$(call cfile, $(OBJDIR)/$D/symbol2str.c)
-
-$(call build-pc-next, \
-		$D/def.H \
-		$D/type.H \
-		$D/node.H \
-		$D/scope.H \
-		$D/desig.H \
-		$D/tmpvar.C \
-		$D/casestat.C)
-
-$(call build-pc-allocd-header, $D/tmpvar.C, $(OBJDIR)/$D/tmpvar.c)
-$(call cfile, $(OBJDIR)/$D/tmpvar.c)
-
-$(call build-pc-allocd-header, $D/casestat.C, $(OBJDIR)/$D/casestat.c)
-$(call cfile, $(OBJDIR)/$D/casestat.c)
-
-$(eval $q: $(OBJDIR)/$D/Lpars.h)
-$(eval $q: $(INCDIR)/idf_pkg.spec)
-$(eval $q: $(INCDIR)/idf_pkg.body)
-$(eval $q: $(INCDIR)/inp_pkg.spec)
-$(eval $q: $(INCDIR)/inp_pkg.body)
-$(eval $q: $(INCDIR)/alloc.h)
-$(eval $q: $(INCDIR)/em_codeEK.h)
-$(eval $q: $(INCDIR)/print.h)
-$(eval $q: $(INCDIR)/system.h)
-
-$(call rawfile, $(LIBEM_MES))
-$(call rawfile, $(LIBEMK))
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBINPUT))
-$(call rawfile, $(LIBASSERT))
-$(call rawfile, $(LIBALLOC))
-$(call rawfile, $(LIBFLT_ARITH))
-$(call rawfile, $(LIBPRINT))
-$(call rawfile, $(LIBSYSTEM))
-$(call rawfile, $(LIBSTRING))
-$(call cprogram, $(BINDIR)/em_pc)
-$(call installto, $(PLATDEP)/em_pc)
-
-$(call reset)
-$(eval q := $D/em_pc.6)
-$(call installto, $(INSDIR)/share/man/man6/em_pc.6)
-endef
-
-$(eval $(build-pc-impl))
diff --git a/lang/pc/libpc/build.mk b/lang/pc/libpc/build.mk
deleted file mode 100644
index bfb9d545f..000000000
--- a/lang/pc/libpc/build.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-define build-runtime-libpascal-impl
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-
-$(call ackfile, lang/pc/libpc/abi.c)
-$(call ackfile, lang/pc/libpc/abl.c)
-$(call ackfile, lang/pc/libpc/abr.c)
-$(call ackfile, lang/pc/libpc/arg.c)
-$(call ackfile, lang/pc/libpc/ass.c)
-$(call ackfile, lang/pc/libpc/asz.c)
-$(call ackfile, lang/pc/libpc/atn.c)
-$(call ackfile, lang/pc/libpc/bcp.c)
-$(call ackfile, lang/pc/libpc/bts.e)
-$(call ackfile, lang/pc/libpc/buff.c)
-$(call ackfile, lang/pc/libpc/catch.c)
-$(call ackfile, lang/pc/libpc/clock.c)
-$(call ackfile, lang/pc/libpc/cls.c)
-$(call ackfile, lang/pc/libpc/cvt.c)
-$(call ackfile, lang/pc/libpc/diag.c)
-$(call ackfile, lang/pc/libpc/dis.c)
-$(call ackfile, lang/pc/libpc/efl.c)
-$(call ackfile, lang/pc/libpc/eln.c)
-$(call ackfile, lang/pc/libpc/encaps.e)
-$(call ackfile, lang/pc/libpc/exp.c)
-$(call ackfile, lang/pc/libpc/fef.e)
-$(call ackfile, lang/pc/libpc/fif.e)
-$(call ackfile, lang/pc/libpc/get.c)
-$(call ackfile, lang/pc/libpc/gto.e)
-$(call ackfile, lang/pc/libpc/hlt.c)
-$(call ackfile, lang/pc/libpc/hol0.e)
-$(call ackfile, lang/pc/libpc/incpt.c)
-$(call ackfile, lang/pc/libpc/ini.c)
-$(call ackfile, lang/pc/libpc/log.c)
-$(call ackfile, lang/pc/libpc/mdi.c)
-$(call ackfile, lang/pc/libpc/mdl.c)
-$(call ackfile, lang/pc/libpc/new.c)
-$(call ackfile, lang/pc/libpc/nfa.c)
-$(call ackfile, lang/pc/libpc/nobuff.c)
-$(call ackfile, lang/pc/libpc/notext.c)
-$(call ackfile, lang/pc/libpc/opn.c)
-$(call ackfile, lang/pc/libpc/outcpt.c)
-$(call ackfile, lang/pc/libpc/pac.c)
-$(call ackfile, lang/pc/libpc/pclose.c)
-$(call ackfile, lang/pc/libpc/pcreat.c)
-$(call ackfile, lang/pc/libpc/pentry.c)
-$(call ackfile, lang/pc/libpc/perrno.c)
-$(call ackfile, lang/pc/libpc/pexit.c)
-$(call ackfile, lang/pc/libpc/popen.c)
-$(call ackfile, lang/pc/libpc/put.c)
-$(call ackfile, lang/pc/libpc/rcka.c)
-$(call ackfile, lang/pc/libpc/rdc.c)
-$(call ackfile, lang/pc/libpc/rdi.c)
-$(call ackfile, lang/pc/libpc/rdl.c)
-$(call ackfile, lang/pc/libpc/rdr.c)
-$(call ackfile, lang/pc/libpc/rf.c)
-$(call ackfile, lang/pc/libpc/rln.c)
-$(call ackfile, lang/pc/libpc/rnd.c)
-$(call ackfile, lang/pc/libpc/sav.e)
-$(call ackfile, lang/pc/libpc/sig.e)
-$(call ackfile, lang/pc/libpc/sin.c)
-$(call ackfile, lang/pc/libpc/sqt.c)
-$(call ackfile, lang/pc/libpc/string.c)
-$(call ackfile, lang/pc/libpc/trap.e)
-$(call ackfile, lang/pc/libpc/trp.e)
-$(call ackfile, lang/pc/libpc/unp.c)
-$(call ackfile, lang/pc/libpc/uread.c)
-$(call ackfile, lang/pc/libpc/uwrite.c)
-$(call ackfile, lang/pc/libpc/wdw.c)
-$(call ackfile, lang/pc/libpc/wf.c)
-$(call ackfile, lang/pc/libpc/wrc.c)
-$(call ackfile, lang/pc/libpc/wrf.c)
-$(call ackfile, lang/pc/libpc/wri.c)
-$(call ackfile, lang/pc/libpc/wrl.c)
-$(call ackfile, lang/pc/libpc/wrr.c)
-$(call ackfile, lang/pc/libpc/wrs.c)
-$(call ackfile, lang/pc/libpc/wrz.c)
-
-$(call acklibrary, $(LIBDIR)/$(PLATFORM)/libpascal.a)
-$(call installto, $(PLATIND)/$(PLATFORM)/libpascal.a)
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-$(call ackfile, lang/pc/libpc/head_pc.e)
-$(call installto, $(PLATIND)/$(PLATFORM)/pascal.o)
-
-endef
-
-build-runtime-libpascal = $(eval $(build-runtime-libpascal-impl))
-
-$(eval RUNTIMES += libpascal)
-
diff --git a/mach/i386/build.mk b/mach/i386/build.mk
deleted file mode 100644
index acd5e51eb..000000000
--- a/mach/i386/build.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-arch-libem-i386 = \
-	adi.s \
-	and.s \
-	blm.s \
-	cii.s \
-	cms.s \
-	com.s \
-	csa4.s \
-	csb4.s \
-	cuu.s \
-	dup.s \
-	dvi.s \
-	dvu.s \
-	error.s \
-	exg.s \
-	fp8087.s \
-	fat.s \
-	gto.s \
-	iaar.s \
-	ilar.s \
-	inn.s \
-	ior.s \
-	isar.s \
-	lar4.s \
-	loi.s \
-	mli.s \
-	mon.s \
-	ngi.s \
-	nop.s \
-	print.s \
-	rck.s \
-	rmi.s \
-	rmu.s \
-	rol.s \
-	ror.s \
-	sar4.s \
-	sbi.s \
-	set.s \
-	sli.s \
-	sri.s \
-	sti.s \
-	strhp.s \
-	trp.s \
-	unknown.s \
-	xor.s
-
-arch-libend-i386 = \
-	edata.s \
-	em_end.s \
-	end.s \
-	etext.s
-
-
diff --git a/mach/i80/build.mk b/mach/i80/build.mk
deleted file mode 100644
index ce9b07c67..000000000
--- a/mach/i80/build.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-arch-libem-i80 = \
-	aar2.s \
-	adi4.s \
-	and.s \
-	blm.s \
-	cii.s \
-	cmi4.s \
-	cms.s \
-	com.s \
-	csa.s \
-	csb.s \
-	dup.s \
-	dvi2.s \
-	exg.s \
-	flp.s \
-	inn.s \
-	ior.s \
-	lar2.s \
-	mli2.s \
-	mli4.s \
-	mlu2.s \
-	ngi4.s \
-	nop.s \
-	rol4.s \
-	ror4.s \
-	sar2.s \
-	sbi4.s \
-	set.s \
-	set2.s \
-	sli2.s \
-	sli4.s \
-	sri2.s \
-	sri4.s \
-	xor.s \
-	loi.s \
-	sti.s \
-	dvi4.s \
-	rck.s
-
-arch-libend-i80 = \
-	edata.s \
-	em_end.s \
-	end.s \
-	etext.s
-
-arch-top-i80 = yes
-
diff --git a/mach/i86/build.mk b/mach/i86/build.mk
deleted file mode 100644
index 1613b651f..000000000
--- a/mach/i86/build.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-arch-libem-i86 := \
-	adi.s \
-	and.s \
-	cii.s \
-	cms.s \
-	cmi4.s \
-	cmu4.s \
-	com.s \
-	csa2.s \
-	csb2.s \
-	csa4.s \
-	csb4.s \
-	cuu.s \
-	dup.s \
-	dvi.s \
-	dvi4.s \
-	dvu.s \
-	dvu4.s \
-	exg.s \
-	fp8087.s \
-	gto.s \
-	iaar.s \
-	ilar.s \
-	inn.s \
-	ior.s \
-	isar.s \
-	lar2.s \
-	loi.s \
-	mli.s \
-	mli4.s \
-	mon.s \
-	ngi.s \
-	nop.s \
-	rck.s \
-	rmi.s \
-	rmi4.s \
-	rmu.s \
-	rmu4.s \
-	rol.s \
-	ror.s \
-	sar2.s \
-	sbi.s \
-	set.s \
-	sli.s \
-	sri.s \
-	sti.s \
-	strhp.s \
-	xor.s \
-	error.s \
-	unknown.s \
-	fat.s \
-	trp.s \
-	print.s \
-	ret6.s \
-	ret8.s \
-	lfr6.s \
-	lfr8.s \
-	retarea.s \
-	blm.s \
-	return.s
-
-arch-libend-i86 = \
-	edata.s \
-	em_end.s \
-	end.s \
-	etext.s
-
-
diff --git a/mach/m68020/build.mk b/mach/m68020/build.mk
deleted file mode 100644
index 5dac37653..000000000
--- a/mach/m68020/build.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-arch-libem-m68020 = \
-	fp68881.s \
-	aar.s \
-	lar.s \
-	sar.s \
-	csa.s \
-	csb.s \
-	shp.s \
-	set.s \
-	inn.s \
-	fat.s \
-	trp.s \
-	trpstr.c \
-	mon.s \
-	nop.s \
-	dia.s \
-	cii.s \
-	cuu.s \
-	cmi.s \
-	cms.s \
-	cmu.s \
-	cvf.s \
-	exg.s \
-	los.s \
-	sts.s
-
-arch-libend-m68020 = \
-	edata.s \
-	em_end.s \
-	end.s \
-	etext.s
-
-
diff --git a/mach/powerpc/build.mk b/mach/powerpc/build.mk
deleted file mode 100644
index e69de29bb..000000000
diff --git a/mach/proto/as/build.mk b/mach/proto/as/build.mk
deleted file mode 100644
index 64c75cf91..000000000
--- a/mach/proto/as/build.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-define build-as-impl
-    $(call reset)
-
-    $(eval cflags += -Imach/$(ARCH)/as -I$(OBJDIR)/$D)
-    $(eval objdir := $(ARCH))
-
-    $(call cfile, mach/proto/as/comm3.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-    $(call cfile, mach/proto/as/comm4.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-    $(call cfile, mach/proto/as/comm5.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-    $(call cfile, mach/proto/as/comm6.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-    $(call cfile, mach/proto/as/comm7.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-    $(call cfile, mach/proto/as/comm8.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-	$(call yacc, $(OBJDIR)/$D, $(OBJDIR)/$D/preprocessed-comm2.y)
-
-	$(call rawfile, $(LIBOBJECT))
-    $(call cprogram, $(BINDIR)/$(PLATFORM)/as)
-    $(call installto, $(PLATDEP)/$(PLATFORM)/as)
-
-	$(call reset)
-    $(eval cflags += -Imach/$(ARCH)/as -I$(OBJDIR)/$D)
-    $(eval objdir := $(ARCH))
-	$(call cppfile, mach/proto/as/comm2.y)
-	$(call installto, $(OBJDIR)/$D/preprocessed-comm2.y)
-
-    $(call reset)
-    $(call rawfile, man/$(ARCH)_as.6)
-    $(call installto, $(INSDIR)/share/man/man6/$(ARCH)_as.6)
-endef
-
-build-as = $(eval $(build-as-impl))
-
diff --git a/mach/proto/cg/build.mk b/mach/proto/cg/build.mk
deleted file mode 100644
index 2327009e0..000000000
--- a/mach/proto/cg/build.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-define build-cg-impl
-
-$(call reset)
-
-$(eval cflags += -Imach/$(ARCH)/cg -I$(OBJDIR)/$D -Imach/proto/cg)
-$(eval objdir := $(ARCH))
-
-$(call cfile, mach/proto/cg/codegen.c)
-$(call cfile, mach/proto/cg/compute.c)
-$(call cfile, mach/proto/cg/equiv.c)
-$(call cfile, mach/proto/cg/fillem.c)
-$(call cfile, mach/proto/cg/gencode.c)
-$(call cfile, mach/proto/cg/glosym.c)
-$(call cfile, mach/proto/cg/main.c)
-$(call cfile, mach/proto/cg/move.c)
-$(call cfile, mach/proto/cg/nextem.c)
-$(call cfile, mach/proto/cg/reg.c)
-$(call cfile, mach/proto/cg/regvar.c)
-$(call cfile, mach/proto/cg/salloc.c)
-$(call cfile, mach/proto/cg/state.c)
-$(call cfile, mach/proto/cg/subr.c)
-$(call cfile, mach/proto/cg/var.c)
-
-$(eval $q: $(OBJDIR)/$D/tables.h)
-$(eval CLEANABLES += $(OBJDIR)/$D/tables.h $(OBJDIR)/$D/tables.c)
-$(OBJDIR)/$D/tables.c: $(OBJDIR)/$D/tables.h
-$(OBJDIR)/$D/tables.h: $(CGG) $(CPPANSI) mach/$(ARCH)/cg/table
-	@echo CGG $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) cd $$(dir $$@) && \
-		$(abspath $(CPPANSI)) -I$(abspath mach/$(ARCH)/cg) $(abspath mach/$(ARCH)/cg/table) | $(abspath $(CGG))
-
-$(call cfile, $(OBJDIR)/$D/tables.c)
-
-$(eval $q: $(INCDIR)/flt_arith.h)
-
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBFLT_ARITH))
-
-$(call cprogram, $(BINDIR)/$(PLATFORM)/cg)
-$(call installto, $(PLATDEP)/$(PLATFORM)/cg)
-
-endef
-
-build-cg = $(eval $(build-cg-impl))
-
diff --git a/mach/proto/ncg/build.mk b/mach/proto/ncg/build.mk
deleted file mode 100644
index 0056452c1..000000000
--- a/mach/proto/ncg/build.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-define build-ncg-impl
-
-$(call reset)
-
-$(eval cflags += -Imach/$(ARCH)/ncg -I$(OBJDIR)/$D -Imach/proto/ncg)
-$(eval objdir := $(ARCH))
-
-$(call cfile, mach/proto/ncg/codegen.c)
-$(call cfile, mach/proto/ncg/compute.c)
-$(call cfile, mach/proto/ncg/equiv.c)
-$(call cfile, mach/proto/ncg/fillem.c)
-$(call cfile, mach/proto/ncg/gencode.c)
-$(call cfile, mach/proto/ncg/glosym.c)
-$(call cfile, mach/proto/ncg/label.c)
-$(call cfile, mach/proto/ncg/main.c)
-$(call cfile, mach/proto/ncg/move.c)
-$(call cfile, mach/proto/ncg/nextem.c)
-$(call cfile, mach/proto/ncg/reg.c)
-$(call cfile, mach/proto/ncg/regvar.c)
-$(call cfile, mach/proto/ncg/salloc.c)
-$(call cfile, mach/proto/ncg/state.c)
-$(call cfile, mach/proto/ncg/subr.c)
-$(call cfile, mach/proto/ncg/var.c)
-
-$(eval $q: $(OBJDIR)/$D/tables.h)
-$(eval CLEANABLES += $(OBJDIR)/$D/tables.h $(OBJDIR)/$D/tables.c)
-$(OBJDIR)/$D/tables.c: $(OBJDIR)/$D/tables.h
-$(OBJDIR)/$D/tables.h: $(NCGG) $(CPPANSI) mach/$(ARCH)/ncg/table
-	@echo NCGG $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) cd $$(dir $$@) && \
-		$(abspath $(CPPANSI)) -I$(abspath mach/$(ARCH)/ncg) $(abspath mach/$(ARCH)/ncg/table) | $(abspath $(NCGG))
-	$(hide) mv $(OBJDIR)/$D/tables.H $(OBJDIR)/$D/tables.h
-
-$(call cfile, $(OBJDIR)/$D/tables.c)
-
-$(eval $q: $(INCDIR)/flt_arith.h)
-
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBFLT_ARITH))
-
-$(call cprogram, $(BINDIR)/$(PLATFORM)/ncg)
-$(call installto, $(PLATDEP)/$(PLATFORM)/ncg)
-
-endef
-
-build-ncg = $(eval $(build-ncg-impl))
-
diff --git a/mach/proto/top/build.mk b/mach/proto/top/build.mk
deleted file mode 100644
index 56f41c276..000000000
--- a/mach/proto/top/build.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-define build-top-impl
-	$(call reset)
-	$(eval cflags += -I$(OBJDIR)/$(PLATFORM)/top)
-
-	$(call cfile, mach/proto/top/queue.c)
-	$(call cfile, mach/proto/top/top.c)
-	$(eval $q: $(OBJDIR)/$(PLATFORM)/top/gen.h)
-
-	$(call topgen, $(OBJDIR)/$(PLATFORM)/top, mach/$(ARCH)/top/table)
-
-	$(call cprogram, $(OBJDIR)/$(PLATFORM)/top/top)
-	$(call installto, $(PLATDEP)/$(PLATFORM)/top)
-endef
-
-build-top = $(eval $(build-top-impl))
diff --git a/mach/vc4/build.mk b/mach/vc4/build.mk
deleted file mode 100644
index b7ca860d8..000000000
--- a/mach/vc4/build.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-arch-libem-vc4 := \
-	csa.s \
-	csb.s
-
-arch-libend-vc4 = \
-	edata.s \
-	em_end.s \
-	end.s \
-	etext.s
-
-
diff --git a/modules/h/proto.make b/modules/h/proto.make
deleted file mode 100644
index 48f61cdc4..000000000
--- a/modules/h/proto.make
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-#PARAMS		do not delete this line!
-
-SRC_DIR = $(SRC_HOME)/modules/h
-MOD_DIR = $(TARGET_HOME)/modules
-FILES = \
-	$(SRC_DIR)/ansi.h \
-	$(SRC_DIR)/em.h \
-	$(SRC_DIR)/em_arith.h \
-	$(SRC_DIR)/em_code.h \
-	$(SRC_DIR)/em_label.h \
-	$(SRC_DIR)/em_codeCE.h \
-	$(SRC_DIR)/emO_code.h \
-	$(SRC_DIR)/em_codeO.h \
-	$(SRC_DIR)/em_mesX.h
-
-all:
-
-install:	all
-		-mkdir $(MOD_DIR)/h
-		cp $(FILES) $(MOD_DIR)/h
-
-cmp:		all
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(FILES)
-
-opr:
-		make pr | opr
-
-clean:
-lintlib:
diff --git a/modules/src/alloc/build.mk b/modules/src/alloc/build.mk
deleted file mode 100644
index 808dcca4a..000000000
--- a/modules/src/alloc/build.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-D := modules/src/alloc
-
-define build-liballoc-impl
-	$(call reset)
-	$(call cfile, $D/Malloc.c)
-	$(call cfile, $D/Salloc.c)
-	$(call cfile, $D/Srealloc.c)
-	$(call cfile, $D/Realloc.c)
-	$(call cfile, $D/botch.c)
-	$(call cfile, $D/clear.c)
-	$(call cfile, $D/st_alloc.c)
-	$(call cfile, $D/std_alloc.c)
-	$(call cfile, $D/No_Mem.c)
-	$(call clibrary, $(LIBDIR)/liballoc.a)
-	LIBALLOC := $o
-
-	$(call reset)
-	$(eval q := $D/alloc.h)
-	$(call copyto, $(INCDIR)/alloc.h)
-endef
-
-$(eval $(build-liballoc-impl))
-
diff --git a/modules/src/alloc/proto.make b/modules/src/alloc/proto.make
deleted file mode 100644
index bd419ce71..000000000
--- a/modules/src/alloc/proto.make
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/alloc
-MOD_DIR = $(TARGET_HOME)/modules
-INCLUDES = -I$(SRC_DIR) -I$(MOD_DIR)/h
-CFLAGS = $(INCLUDES) $(COPTIONS)
-
-CSRC =		$(SRC_DIR)/Malloc.c\
-		$(SRC_DIR)/Salloc.c\
-		$(SRC_DIR)/Srealloc.c\
-		$(SRC_DIR)/Realloc.c\
-		$(SRC_DIR)/botch.c\
-		$(SRC_DIR)/clear.c\
-		$(SRC_DIR)/st_alloc.c\
-		$(SRC_DIR)/std_alloc.c \
-		$(SRC_DIR)/No_Mem.c
-SOURCES =	$(SRC_DIR)/alloc.h\
-		$(CSRC)
-
-OBJECTS =	botch.$(SUF) clear.$(SUF) st_alloc.$(SUF) Malloc.$(SUF) \
-		Salloc.$(SUF) \
-		Srealloc.$(SUF) Realloc.$(SUF) std_alloc.$(SUF) No_Mem.$(SUF)
-
-
-LIBALLOC =	liballoc.$(LIBSUF)
-
-all:		$(LIBALLOC)
-
-$(LIBALLOC):	$(OBJECTS)
-		rm -f $(LIBALLOC)
-		$(AR) r $(LIBALLOC) $(OBJECTS)
-		$(RANLIB) $(LIBALLOC)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(LIBALLOC) $(MOD_DIR)/lib/$(LIBALLOC)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBALLOC)
-		cp $(SRC_DIR)/alloc.h $(MOD_DIR)/h/alloc.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/alloc.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(LIBALLOC) $(MOD_DIR)/lib/$(LIBALLOC)
-		-cmp $(SRC_DIR)/alloc.h $(MOD_DIR)/h/alloc.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SOURCES)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF)
-
-lintlib:
-		$(MK_LINT_LIB) alloc $(MOD_DIR)/lib $(INCLUDES) $(CSRC)
-
-st_alloc.$(SUF):	$(SRC_DIR)/alloc.h $(SRC_DIR)/st_alloc.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/st_alloc.c
-
-std_alloc.$(SUF):	$(SRC_DIR)/alloc.h $(SRC_DIR)/std_alloc.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/std_alloc.c
-
-Malloc.$(SUF):		$(SRC_DIR)/alloc.h $(SRC_DIR)/Malloc.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/Malloc.c
-
-No_Mem.$(SUF):		$(SRC_DIR)/No_Mem.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/No_Mem.c
-
-Realloc.$(SUF):		$(SRC_DIR)/Realloc.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/Realloc.c
-
-Salloc.$(SUF):		$(SRC_DIR)/Salloc.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/Salloc.c
-
-Srealloc.$(SUF):	$(SRC_DIR)/Srealloc.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/Srealloc.c
-
-botch.$(SUF):		$(SRC_DIR)/botch.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/botch.c
-
-clear.$(SUF):		$(SRC_DIR)/clear.c
-			$(CC) -c $(CFLAGS) $(SRC_DIR)/clear.c
diff --git a/modules/src/assert/proto.make b/modules/src/assert/proto.make
deleted file mode 100644
index cf63c41f2..000000000
--- a/modules/src/assert/proto.make
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/assert
-MOD_DIR = $(TARGET_HOME)/modules
-INCLUDES = -I$(SRC_DIR) -I$(MOD_DIR)/h
-CFLAGS = $(COPTIONS) $(INCLUDES)
-
-all:		libassert.$(LIBSUF)
-
-libassert.$(LIBSUF):	BadAssert.$(SUF)
-		$(AR) r libassert.$(LIBSUF) BadAssert.$(SUF)
-		$(RANLIB) libassert.$(LIBSUF)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp libassert.$(LIBSUF) $(MOD_DIR)/lib/libassert.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libassert.$(LIBSUF)
-		cp $(SRC_DIR)/assert.h $(MOD_DIR)/h/assert.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/assert.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp libassert.$(LIBSUF) $(MOD_DIR)/lib/libassert.$(LIBSUF)
-		-cmp $(SRC_DIR)/assert.h $(MOD_DIR)/h/assert.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/assert.h $(SRC_DIR)/BadAssert.c
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(LIBSUF) *.$(SUF)
-
-lintlib:
-		$(MK_LINT_LIB) assert $(MOD_DIR)/lib $(INCLUDES) $(SRC_DIR)/BadAssert.c
-
-BadAssert.$(SUF):	$(SRC_DIR)/BadAssert.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/BadAssert.c
diff --git a/modules/src/em_code/build.mk b/modules/src/em_code/build.mk
deleted file mode 100644
index 0fca5191c..000000000
--- a/modules/src/em_code/build.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-D := modules/src/em_code
-
-# $1 = capital letter for library specialisation (E or K)
-# $2 = lowercase letter for library specialisation (e or k)
-# $3 = cflags that specalise this library
-
-define build-em_code-impl
-	$(call reset)
-	$(eval cflags += $3)
-	$(eval objdir := $1)
-	$(call cfile, $D/bhcst.c)
-	$(call cfile, $D/bhdlb.c)
-	$(call cfile, $D/bhdnam.c)
-	$(call cfile, $D/bhfcon.c)
-	$(call cfile, $D/bhicon.c)
-	$(call cfile, $D/bhilb.c)
-	$(call cfile, $D/bhpnam.c)
-	$(call cfile, $D/bhucon.c)
-	$(call cfile, $D/crcst.c)
-	$(call cfile, $D/crdlb.c)
-	$(call cfile, $D/crdnam.c)
-	$(call cfile, $D/crxcon.c)
-	$(call cfile, $D/crilb.c)
-	$(call cfile, $D/crpnam.c)
-	$(call cfile, $D/crscon.c)
-	$(call cfile, $D/cst.c)
-	$(call cfile, $D/dfdlb.c)
-	$(call cfile, $D/dfdnam.c)
-	$(call cfile, $D/dfilb.c)
-	$(call cfile, $D/dlb.c)
-	$(call cfile, $D/dnam.c)
-	$(call cfile, $D/end.c)
-	$(call cfile, $D/endarg.c)
-	$(call cfile, $D/exc.c)
-	$(call cfile, $D/fcon.c)
-	$(call cfile, $D/getid.c)
-	$(call cfile, $D/icon.c)
-	$(call cfile, $D/ilb.c)
-	$(call cfile, $D/insert.c)
-	$(call cfile, $D/internerr.c)
-	$(call cfile, $D/msend.c)
-	$(call cfile, $D/op.c)
-	$(call cfile, $D/opcst.c)
-	$(call cfile, $D/opdlb.c)
-	$(call cfile, $D/opdnam.c)
-	$(call cfile, $D/opilb.c)
-	$(call cfile, $D/opnarg.c)
-	$(call cfile, $D/oppnam.c)
-	$(call cfile, $D/pnam.c)
-	$(call cfile, $D/pro.c)
-	$(call cfile, $D/pronarg.c)
-	$(call cfile, $D/msstart.c)
-	$(call cfile, $D/psdlb.c)
-	$(call cfile, $D/psdnam.c)
-	$(call cfile, $D/pspnam.c)
-	$(call cfile, $D/scon.c)
-	$(call cfile, $D/ucon.c)
-	$(call cfile, $D/C_out.c)
-	$(call cfile, $D/failed.c)
-	$(call cfile, $D/em.c)
-
-	$(eval $q: $(INCDIR)/em_codeEK.h)
-	$(eval $q: $(INCDIR)/em_path.h)
-	$(eval $q: $(INCDIR)/system.h)
-	$(eval $q: $(INCDIR)/local.h)
-
-	$(call clibrary, $(LIBDIR)/libem$2.a)
-	$(eval LIBEM$1 := $o)
-endef
-
-define build-em_code-header-impl
-$(OBJDIR)/$D/em_codeEK.h: $D/make.em.gen $D/em.nogen h/em_table
-	@echo MAKE_EM_GEN $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $D/make.em.gen h/em_table > $$@
-	$(hide) cat $D/em.nogen >> $$@
-
-$(call reset)
-$(eval q := $(OBJDIR)/$D/em_codeEK.h)
-$(eval CLEANABLES += $q)
-$(call copyto, $(INCDIR)/em_codeEK.h)
-
-$(eval CLEANABLES += $o)
-$(eval $o: $(INCDIR)/em_pseu.h)
-
-endef
-
-$(eval $(call build-em_code-header-impl))
-$(eval $(call build-em_code-impl,E,e, -DREADABLE_EM))
-$(eval $(call build-em_code-impl,K,k, ))
-
-
diff --git a/modules/src/em_code/proto.make b/modules/src/em_code/proto.make
deleted file mode 100644
index 60c0bda9b..000000000
--- a/modules/src/em_code/proto.make
+++ /dev/null
@@ -1,128 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-ETC = $(SRC_HOME)/etc
-SRC_DIR = $(SRC_HOME)/modules/src/em_code
-MOD_DIR = $(TARGET_HOME)/modules
-
-INCLUDES = -I. -I$(TARGET_HOME)/h -I$(TARGET_HOME)/config -I$(MOD_DIR)/h -I$(SRC_HOME)/modules/src/read_em -I$(SRC_DIR)
-CFLAGS = $(INCLUDES) $(COPTIONS)
-SRC =	$(SRC_DIR)/bhcst.c\
-	$(SRC_DIR)/bhdlb.c\
-	$(SRC_DIR)/bhdnam.c\
-	$(SRC_DIR)/bhfcon.c\
-	$(SRC_DIR)/bhicon.c\
-	$(SRC_DIR)/bhilb.c\
-	$(SRC_DIR)/bhpnam.c\
-	$(SRC_DIR)/bhucon.c\
-	$(SRC_DIR)/crcst.c\
-	$(SRC_DIR)/crdlb.c\
-	$(SRC_DIR)/crdnam.c\
-	$(SRC_DIR)/crxcon.c\
-	$(SRC_DIR)/crilb.c\
-	$(SRC_DIR)/crpnam.c\
-	$(SRC_DIR)/crscon.c \
-	$(SRC_DIR)/cst.c\
-	$(SRC_DIR)/dfdlb.c\
-	$(SRC_DIR)/dfdnam.c\
-	$(SRC_DIR)/dfilb.c\
-	$(SRC_DIR)/dlb.c\
-	$(SRC_DIR)/dnam.c\
-	$(SRC_DIR)/end.c\
-	$(SRC_DIR)/endarg.c \
-	$(SRC_DIR)/exc.c\
-	$(SRC_DIR)/fcon.c\
-	$(SRC_DIR)/getid.c\
-	$(SRC_DIR)/icon.c\
-	$(SRC_DIR)/ilb.c\
-	$(SRC_DIR)/insert.c\
-	$(SRC_DIR)/internerr.c \
-	$(SRC_DIR)/msend.c\
-	$(SRC_DIR)/op.c\
-	$(SRC_DIR)/opcst.c\
-	$(SRC_DIR)/opdlb.c\
-	$(SRC_DIR)/opdnam.c\
-	$(SRC_DIR)/opilb.c\
-	$(SRC_DIR)/opnarg.c\
-	$(SRC_DIR)/oppnam.c\
-	$(SRC_DIR)/pnam.c \
-	$(SRC_DIR)/pro.c\
-	$(SRC_DIR)/pronarg.c\
-	$(SRC_DIR)/msstart.c\
-	$(SRC_DIR)/psdlb.c\
-	$(SRC_DIR)/psdnam.c\
-	$(SRC_DIR)/pspnam.c\
-	$(SRC_DIR)/scon.c\
-	$(SRC_DIR)/ucon.c \
-	$(SRC_DIR)/C_out.c\
-	$(SRC_DIR)/failed.c\
-	$(SRC_DIR)/em.c
-
-OBS = failed.$(SUF) insert.$(SUF) internerr.$(SUF) getid.$(SUF)
-
-all:		em_codeEK.h libeme.$(LIBSUF) libemk.$(LIBSUF) em_code.3
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp libeme.$(LIBSUF) $(MOD_DIR)/lib/libeme.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libeme.$(LIBSUF)
-		cp libemk.$(LIBSUF) $(MOD_DIR)/lib/libemk.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libemk.$(LIBSUF)
-		cp em_codeEK.h $(MOD_DIR)/h/em_codeEK.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage em_code.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:	all
-		-cmp libeme.$(LIBSUF) $(MOD_DIR)/lib/libeme.$(LIBSUF)
-		-cmp libemk.$(LIBSUF) $(MOD_DIR)/lib/libemk.$(LIBSUF)
-		-cmp em_codeEK.h $(MOD_DIR)/h/em_codeEK.h
-
-em_code.3:	$(SRC_DIR)/em_code.3X
-		-sh -c 'tbl < $(SRC_DIR)/em_code.3X > em_code.3'
-		-sh -c 'if test -s em_code.3 ; then : ; else cp $(SRC_DIR)/em_code.3X em_code.3 ; fi '
-
-libeme.$(LIBSUF):	$(SRC_DIR)/em_private.h $(SRC) $(OBS)
-		cc="$(CC)"; suf="$(SUF)"; libsuf="$(LIBSUF)"; cflags="-c -DREADABLE_EM $(CFLAGS)"; ar="$(AR)"; export cc ar suf libsuf cflags; sh $(SRC_DIR)/make.sh e $(SRC)
-		$(RANLIB) libeme.$(LIBSUF)
-
-libemk.$(LIBSUF):	$(SRC_DIR)/em_private.h $(SRC) $(OBS)
-		cc="$(CC)"; suf="$(SUF)"; libsuf="$(LIBSUF)"; cflags="-c $(CFLAGS)"; ar="$(AR)"; export cc ar suf libsuf cflags; sh $(SRC_DIR)/make.sh k $(SRC)
-		$(RANLIB) libemk.$(LIBSUF)
-
-em_codeEK.h:	$(SRC_DIR)/make.em.gen $(ETC)/em_table $(SRC_DIR)/em.nogen
-		$(SRC_DIR)/make.em.gen $(ETC)/em_table > em_codeEK.h
-		cat $(SRC_DIR)/em.nogen >> em_codeEK.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make \
-			$(SRC_DIR)/em.nogen \
-			$(SRC_DIR)/make.em.gen \
-			$(SRC_DIR)/make.sh \
-			$(SRC_DIR)/insert.h \
-			$(SRC) \
-			$(SRC_DIR)/em_private.h
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF) em_code.3 em_codeEK.h
-
-lintlib:	$(SRC_DIR)/make.sh
-		$(MK_LINT_LIB) eme $(MOD_DIR)/lib $(INCLUDES) -DREADABLE_EM $(SRC)
-		$(MK_LINT_LIB) emk $(MOD_DIR)/lib $(INCLUDES) $(SRC)
-
-insert.$(SUF):	$(SRC_DIR)/insert.c $(SRC_DIR)/insert.h
-		$(CC) $(CFLAGS) -c $(SRC_DIR)/insert.c
-
-failed.$(SUF):	$(SRC_DIR)/failed.c
-		$(CC) $(CFLAGS) -c $(SRC_DIR)/failed.c
-
-internerr.$(SUF):	$(SRC_DIR)/internerr.c
-		$(CC) $(CFLAGS) -c $(SRC_DIR)/internerr.c
-
-getid.$(SUF):	$(SRC_DIR)/getid.c
-		$(CC) $(CFLAGS) -c $(SRC_DIR)/getid.c
diff --git a/modules/src/em_data/build.mk b/modules/src/em_data/build.mk
deleted file mode 100644
index b6b5c7cea..000000000
--- a/modules/src/em_data/build.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-D := util/data
-
-define util-data-impl
-
-$(eval g := \
-	$(OBJDIR)/$D/em_flag.c \
-	$(OBJDIR)/$D/em_pseu.c \
-	$(OBJDIR)/$D/em_mnem.c \
-	$(INCDIR)/em_spec.h \
-	$(INCDIR)/em_pseu.h \
-	$(INCDIR)/em_mnem.h \
-)
-
-$(eval CLEANABLES += $g)
-$(wordlist 2, $(words $g), $g): $(firstword $g)
-$(firstword $g): $D/new_table h/em_table
-	@echo DATA
-	@mkdir -p $(dir $g)
-	$(hide) $D/new_table h/em_table $(INCDIR) $(OBJDIR)/$D
-
-$(call reset)
-$(call cfile, $(OBJDIR)/$D/em_flag.c)
-$(call cfile, $(OBJDIR)/$D/em_pseu.c)
-$(call cfile, $(OBJDIR)/$D/em_mnem.c)
-$(call cfile, $D/em_ptyp.c)
-
-$(eval $q: $g)
-
-$(call clibrary, $(LIBDIR)/libem_data.a)
-$(eval LIBEM_DATA := $q)
-
-endef
-
-$(eval $(util-data-impl))
diff --git a/modules/src/em_data/proto.make b/modules/src/em_data/proto.make
deleted file mode 100644
index 35f0bf8d6..000000000
--- a/modules/src/em_data/proto.make
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/data
-OBJ = em_mnem.$(SUF) em_pseu.$(SUF) em_flag.$(SUF) em_ptyp.$(SUF)
-
-DATA_PATH = em_data.$(LIBSUF)
-
-INCLUDES = -I$(TARGET_HOME)/h
-CFLAGS = $(COPTIONS) $(INCLUDES)
-
-$(DATA_PATH):   $(OBJ)
-		$(AR) rv $(DATA_PATH) $(OBJ)
-		$(RANLIB) $(DATA_PATH)
-
-install:	$(DATA_PATH)
-		cp $(DATA_PATH) $(TARGET_HOME)/lib.bin/$(DATA_PATH)
-		$(RANLIB) $(TARGET_HOME)/lib.bin/$(DATA_PATH)
-
-
-cmp:		$(DATA_PATH)
-		-cmp $(DATA_PATH) $(TARGET_HOME)/lib.bin/$(DATA_PATH)
-
-clean:
-		rm -f $(OBJ) $(DATA_PATH) *.old
-
-opr:
-		make pr ^ opr
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/em_mnem.c $(SRC_DIR)/em_pseu.c $(SRC_DIR)/em_flag.c $(SRC_DIR)/em_ptyp.c
-
-em_flag.$(SUF):	$(SRC_DIR)/em_flag.c $(TARGET_HOME)/h/em_flag.h
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/em_flag.c
-
-em_mnem.$(SUF):	$(SRC_DIR)/em_mnem.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/em_mnem.c
-
-em_pseu.$(SUF):	$(SRC_DIR)/em_pseu.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/em_pseu.c
-
-em_ptyp.$(SUF):	$(SRC_DIR)/em_ptyp.c $(TARGET_HOME)/h/em_spec.h $(TARGET_HOME)/h/em_ptyp.h
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/em_ptyp.c
-
-lintlib:
-		$(MK_LINT_LIB) em_data $(TARGET_HOME)/lib.bin $(INCLUDES) \
-			$(SRC_DIR)/em_flag.c $(SRC_DIR)/em_mnem.c \
-			$(SRC_DIR)/em_pseu.c $(SRC_DIR)/em_ptyp.c
diff --git a/modules/src/em_mes/build.mk b/modules/src/em_mes/build.mk
deleted file mode 100644
index 7ae262114..000000000
--- a/modules/src/em_mes/build.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-D := modules/src/em_mes
-
-define build-em_mes-impl
-	$(call reset)
-	$(call cfile, $D/C_ms_err.c)
-	$(call cfile, $D/C_ms_opt.c)
-	$(call cfile, $D/C_ms_emx.c)
-	$(call cfile, $D/C_ms_reg.c)
-	$(call cfile, $D/C_ms_src.c)
-	$(call cfile, $D/C_ms_flt.c)
-	$(call cfile, $D/C_ms_com.c)
-	$(call cfile, $D/C_ms_par.c)
-	$(call cfile, $D/C_ms_ego.c)
-	$(call cfile, $D/C_ms_gto.c)
-	$(call cfile, $D/C_ms_stb.c)
-	$(call cfile, $D/C_ms_std.c)
-
-	$(eval $q: $(INCDIR)/em_codeEK.h)
-
-	$(call clibrary, $(LIBDIR)/libem_mes.a)
-	$(eval LIBEM_MES := $o)
-endef
-
-$(eval $(call build-em_mes-impl))
-
-
diff --git a/modules/src/em_mes/proto.make b/modules/src/em_mes/proto.make
deleted file mode 100644
index 005e63bd9..000000000
--- a/modules/src/em_mes/proto.make
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/em_mes
-MOD_DIR = $(TARGET_HOME)/modules
-INCLUDES=-I$(TARGET_HOME)/h -I$(MOD_DIR)/h
-CFLAGS = $(INCLUDES) $(COPTIONS)
-
-SRC =	$(SRC_DIR)/C_ms_err.c \
-	$(SRC_DIR)/C_ms_opt.c \
-	$(SRC_DIR)/C_ms_emx.c \
-	$(SRC_DIR)/C_ms_reg.c \
-	$(SRC_DIR)/C_ms_src.c \
-	$(SRC_DIR)/C_ms_flt.c \
-	$(SRC_DIR)/C_ms_com.c \
-	$(SRC_DIR)/C_ms_par.c \
-	$(SRC_DIR)/C_ms_ego.c \
-	$(SRC_DIR)/C_ms_gto.c \
-	$(SRC_DIR)/C_ms_stb.c \
-	$(SRC_DIR)/C_ms_std.c
-OBJ =	C_ms_err.$(SUF) C_ms_opt.$(SUF) C_ms_emx.$(SUF) C_ms_reg.$(SUF) \
-	C_ms_src.$(SUF) C_ms_flt.$(SUF) C_ms_com.$(SUF) C_ms_par.$(SUF) \
-	C_ms_ego.$(SUF) C_ms_gto.$(SUF) C_ms_stb.$(SUF) C_ms_std.$(SUF)
-
-all:		libem_mes.$(LIBSUF) libem_mesCE.$(LIBSUF) libem_mesO.$(LIBSUF) 
-
-libem_mes.$(LIBSUF):	$(OBJ)
-		rm -f libem_mes.$(LIBSUF)
-		$(AR) r libem_mes.$(LIBSUF) $(OBJ)
-		$(RANLIB) libem_mes.$(LIBSUF) 
-
-libem_mesO.$(LIBSUF):
-		rm -f *.$(SUF) libem_mesO.$(LIBSUF)
-		$(CC) -c $(CFLAGS) -DPEEPHOLE $(SRC)
-		$(AR) r libem_mesO.$(LIBSUF) $(OBJ)
-		$(RANLIB) libem_mesO.$(LIBSUF)
-		rm -f *.$(SUF)
-
-libem_mesCE.$(LIBSUF):
-		rm -f *.$(SUF) libem_mesCE.$(LIBSUF)
-		$(CC) -c $(CFLAGS) -DCODE_EXPANDER $(SRC)
-		$(AR) r libem_mesCE.$(LIBSUF) $(OBJ)
-		$(RANLIB) libem_mesCE.$(LIBSUF)
-		rm -f *.$(SUF)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		cp libem_mes.$(LIBSUF) $(MOD_DIR)/lib/libem_mes.$(LIBSUF)
-		cp libem_mesCE.$(LIBSUF) $(MOD_DIR)/lib/libem_mesCE.$(LIBSUF)
-		cp libem_mesO.$(LIBSUF) $(MOD_DIR)/lib/libem_mesO.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libem_mes.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libem_mesCE.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libem_mesO.$(LIBSUF)
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/em_mes.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp libem_mes.$(LIBSUF) $(MOD_DIR)/lib/libem_mes.$(LIBSUF)
-		-cmp libem_mesCE.$(LIBSUF) $(MOD_DIR)/lib/libem_mesCE.$(LIBSUF)
-		-cmp libem_mesO.$(LIBSUF) $(MOD_DIR)/lib/libem_mesO.$(LIBSUF)
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF)
-
-lintlib:
-		$(MK_LINT_LIB) em_mes $(MOD_DIR)/lib $(INCLUDES) $(SRC)
-
-C_ms_err.$(SUF):	$(SRC_DIR)/C_ms_err.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_err.c
-
-C_ms_opt.$(SUF):	$(SRC_DIR)/C_ms_opt.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_opt.c
-
-C_ms_emx.$(SUF):	$(SRC_DIR)/C_ms_emx.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_emx.c
-
-C_ms_reg.$(SUF):	$(SRC_DIR)/C_ms_reg.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_reg.c
-
-C_ms_src.$(SUF):	$(SRC_DIR)/C_ms_src.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_src.c
-
-C_ms_flt.$(SUF):	$(SRC_DIR)/C_ms_flt.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_flt.c
-
-C_ms_com.$(SUF):	$(SRC_DIR)/C_ms_com.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_com.c
-
-C_ms_par.$(SUF):	$(SRC_DIR)/C_ms_par.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_par.c
-
-C_ms_ego.$(SUF):	$(SRC_DIR)/C_ms_ego.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_ego.c
-
-C_ms_gto.$(SUF):	$(SRC_DIR)/C_ms_gto.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_gto.c
-
-C_ms_stb.$(SUF):	$(SRC_DIR)/C_ms_stb.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_stb.c
-
-C_ms_std.$(SUF):	$(SRC_DIR)/C_ms_std.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/C_ms_std.c
diff --git a/modules/src/em_opt/proto.make b/modules/src/em_opt/proto.make
deleted file mode 100644
index 68327cb98..000000000
--- a/modules/src/em_opt/proto.make
+++ /dev/null
@@ -1,241 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR =	$(SRC_HOME)/modules/src/em_opt
-MOD_DIR =	$(TARGET_HOME)/modules
-
-# set HOWMUCH to head -20 to limit number of patterns used
-#HOWMUCH =	head -20
-HOWMUCH	=	cat
-
-INCLUDES =	-I$(TARGET_HOME)/h -I$(MOD_DIR)/h \
-		-I$(MOD_DIR)/pkg -I$(SRC_DIR) -I.
-UINCLUDES =	-I$(UTIL_HOME)/h -I$(UTIL_HOME)/modules/h \
-		-I$(UTIL_HOME)/modules/pkg -I$(SRC_DIR) -I.
-PREFLAGS =	$(INCLUDES) -DPRIVATE=static#	 -DDEBUG
-UPREFLAGS =	$(UINCLUDES) -DPRIVATE=static#	 -DDEBUG
-
-# Enable the next line to produce a version that output's the line number
-# from the patterns file each time an optimization is performed.
-#PREFLAGS =	$(PREFLAGS) -DSTATS
-
-CFLAGS =	$(PREFLAGS) $(COPTIONS)
-LINTFLAGS =	$(PREFLAGS) -DNORCSID
-LDFLAGS =	$(LDOPTIONS)
-UCFLAGS =	$(UPREFLAGS) $(UCOPTIONS)
-ULDFLAGS =	$(ULDOPTIONS)
-LLOPT =
-CMD =		'$(CC) -c $(CFLAGS)'
-
-LIBOPT =	libemopt.$(LIBSUF)
-LIBCEOPT =	libCEopt.$(LIBSUF)
-
-.SUFFIXES:	.d .r
-
-.r.d:		; CMD=$(CMD); export CMD; awk -f $(SRC_DIR)/makefuns.awk prototypes=/dev/null $*.r | sh -x
-		touch $@
-
-.SUFFIXES: .$(SUF)
-.c.$(SUF):
-	$(CC) -c $(CFLAGS) $*.c
-
-CSRC =		$(SRC_DIR)/main.c $(SRC_DIR)/nopt.c $(SRC_DIR)/mkstrct.c \
-		$(SRC_DIR)/aux.c $(SRC_DIR)/outputdfa.c $(SRC_DIR)/outcalls.c\
-		$(SRC_DIR)/findworst.c $(SRC_DIR)/initlex.c
-
-SRCS =		$(SRC_DIR)/proto.make $(SRC_DIR)/nopt.h $(SRC_DIR)/parser.h \
-		$(SRC_DIR)/parser.g $(SRC_DIR)/syntax.l $(SRC_DIR)/pseudo.r\
-		$(SRC_DIR)/patterns $(CSRC)
-
-NOFILES =	nopt.$(SUF) dfa.$(SUF) trans.$(SUF) aux.$(SUF) mkstrct.$(SUF)
-
-POFILES =	parser.$(USUF) syntax.$(USUF) outputdfa.$(USUF) outcalls.$(USUF)\
-		findworst.$(USUF) initlex.$(USUF) Lpars.$(USUF)
-
-GENFILES =	Lpars.h Lpars.c parserdummy parser.c syntax.c \
-		dfa.c dfa.c.new trans.c trans.c.new\
-		incalls.d incalls.r incalls.r.new pseudo.d pseudo.r
-
-all:		em_nopt $(LIBOPT) $(LIBCEOPT) prototypes
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(LIBOPT) $(MOD_DIR)/lib/$(LIBOPT)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBOPT)
-		cp $(LIBCEOPT) $(MOD_DIR)/lib/$(LIBCEOPT)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBCEOPT)
-		cp em_nopt $(TARGET_HOME)/lib.bin/em_nopt
-		cp prototypes $(MOD_DIR)/h/em_codeO.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/em_opt.3 $(TARGET_HOME) ; \
-			mk_manpage $(SRC_DIR)/em_nopt.6 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(LIBOPT) $(MOD_DIR)/lib/$(LIBOPT)
-		-cmp $(LIBCEOPT) $(MOD_DIR)/lib/$(LIBCEOPT)
-		-cmp em_nopt $(TARGET_HOME)/lib.bin/em_nopt
-		-cmp prototypes $(MOD_DIR)/h/em_codeO.h
-
-
-pr:
-		@pr $(SRCS)
-
-opr:
-		make pr | opr
-
-lint:		lintparser lintnopt
-
-clean:
-		rm -f O_*.$(SUF)
-		rm -f O_*.c
-		rm -f $(NOFILES) main.$(SUF) $(POFILES) prototypes
-		rm -f $(GENFILES) parser em_nopt $(LIBOPT) $(LIBCEOPT)
-
-# How to build stand alone version of the optimizer
-
-NOPTLIB = 	$(MOD_DIR)/lib/libread_emk.$(LIBSUF)\
-		$(MOD_DIR)/lib/libemk.$(LIBSUF)\
-		$(MOD_DIR)/lib/liballoc.$(LIBSUF)\
-		$(MOD_DIR)/lib/malloc.$(SUF)\
-		$(MOD_DIR)/lib/libprint.$(LIBSUF)\
-		$(MOD_DIR)/lib/libstring.$(LIBSUF)\
-		$(MOD_DIR)/lib/libsystem.$(LIBSUF)\
-		$(TARGET_HOME)/lib.bin/em_data.$(LIBSUF)
-
-em_nopt:	incalls.r main.$(SUF) $(NOFILES)
-		$(CC) $(LDFLAGS) -o em_nopt main.$(SUF) $(NOFILES) $(NOPTLIB)
-
-OLINT =		$(SRC_DIR)/main.c $(SRC_DIR)/mkstrct.c $(SRC_DIR)/nopt.c $(SRC_DIR)/aux.c dfa.c trans.c
-
-OLINTLIB = 	$(UTIL_HOME)/modules/lib/$(LINTPREF)read_emkV.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)emk.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)system.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)alloc.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)print.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)string.$(LINTSUF)
-
-lintnopt:	incalls.r $(OLINT)
-		$(LINT) $(LINTFLAGS) $(OLINT) $(OLINTLIB)
-
-# How to build the library version of the optimizer
-
-$(LIBOPT):	$(NOFILES) pseudo.d incalls.d
-		rm -f $(LIBOPT)
-		$(AR) r $(LIBOPT) O_*.$(SUF) $(NOFILES)
-		$(RANLIB) $(LIBOPT)
-
-$(LIBCEOPT):	incalls.r
-		rm -f O_*.$(SUF) $(NOFILES) pseudo.d incalls.d
-		-mv $(LIBOPT) $(LIBOPT).saved
-		make PREFLAGS='$(INCLUDES) -DPRIVATE=static -DCODE_EXPANDER' $(LIBOPT)
-		mv $(LIBOPT) $(LIBCEOPT)
-		-mv $(LIBOPT).saved $(LIBOPT)
-		rm -f O_*.$(SUF) $(NOFILES)
-
-prototypes:	pseudo.r incalls.r
-		cp $(SRC_DIR)/em_codeO.h prototypes
-		echo >> prototypes
-		awk -f $(SRC_DIR)/makefuns.awk pseudo.r incalls.r > /dev/null
-
-incalls.r:	$(SRC_DIR)/patterns parser
-		-$(UTIL_HOME)/lib.bin/cpp $(SRC_DIR)/patterns | $(HOWMUCH) >/tmp/patts
-		parser </tmp/patts
-		-rm /tmp/patts
-
-# How to build the lint library for the optimizer
-
-LLINT =		$(SRC_DIR)/nopt.c $(SRC_DIR)/mkstrct.c $(SRC_DIR)/aux.c dfa.c trans.c
-
-lintlib:	incalls.r $(LLINT)
-		$(MK_LINT_LIB) emopt $(MOD_DIR)/lib $(LLINT)
-
-# How to build program to parse patterns table and build c files.
-
-PARSERLIB =	$(UTIL_HOME)/lib.bin/em_data.$(ULIBSUF)\
-		$(UTIL_HOME)/modules/lib/liballoc.$(ULIBSUF)\
-		$(UTIL_HOME)/modules/lib/libstring.$(ULIBSUF)\
-		$(UTIL_HOME)/modules/lib/libsystem.$(ULIBSUF)
-
-parser:		parserdummy $(POFILES) $(PARSERLIB)
-		$(UCC) -o parser $(ULDFLAGS) $(POFILES) $(PARSERLIB)
-
-syntax.c:	$(SRC_DIR)/syntax.l
-		flex -ts $(SRC_DIR)/syntax.l > syntax.c
-
-parserdummy:	$(SRC_DIR)/parser.g
-		LLgen $(LLOPT) $(SRC_DIR)/parser.g
-		touch parserdummy
-
-PLINT =		parser.c syntax.c $(SRC_DIR)/outputdfa.c $(SRC_DIR)/outcalls.c\
-		$(SRC_DIR)/findworst.c $(SRC_DIR)/initlex.c Lpars.c
-
-PLINTLIB =	$(UTIL_HOME)/modules/lib/$(LINTPREF)alloc.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)string.$(LINTSUF)\
-		$(UTIL_HOME)/modules/lib/$(LINTPREF)system.$(LINTSUF)
-
-LINTFLAGS =	$(LINTOPTIONS)
-
-lintparser:	parserdummy $(PLINT)
-		$(LINT) $(LINTFLAGS) $(PLINT) $(PLINTLIB)
-
-# Dependancies
-
-main.$(SUF):	$(SRC_DIR)/main.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/main.c
-main.$(SUF):	$(SRC_DIR)/nopt.h
-
-nopt.$(SUF):	$(SRC_DIR)/nopt.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/nopt.c
-nopt.$(SUF):	$(SRC_DIR)/nopt.h
-
-mkstrct.$(SUF):	$(SRC_DIR)/mkstrct.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/mkstrct.c
-mkstrct.$(SUF):	$(SRC_DIR)/nopt.h
-
-aux.$(SUF):	$(SRC_DIR)/aux.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/aux.c
-aux.$(SUF):	$(SRC_DIR)/nopt.h
-
-dfa.$(SUF):	dfa.c
-		$(CC) -c $(CFLAGS) dfa.c
-dfa.$(SUF):	$(SRC_DIR)/nopt.h
-
-trans.$(SUF):	trans.c
-		$(CC) -c $(CFLAGS) trans.c
-trans.$(SUF):	$(SRC_DIR)/nopt.h
-
-incalls.d:	$(SRC_DIR)/nopt.h $(SRC_DIR)/makefuns.awk
-pseudo.d:	$(SRC_DIR)/nopt.h $(SRC_DIR)/makefuns.awk
-pseudo.r:	$(SRC_DIR)/pseudo.r
-		cp $(SRC_DIR)/pseudo.r pseudo.r
-
-parser.$(USUF):	parser.c
-		$(UCC) -c $(UCFLAGS) parser.c
-parser.$(USUF):	Lpars.h $(SRC_DIR)/parser.h
-
-Lpars.$(USUF):	Lpars.c
-		$(UCC) -c $(UCFLAGS) Lpars.c
-Lpars.$(USUF):	Lpars.h
-
-syntax.$(USUF):	syntax.c
-		$(UCC) -c $(UCFLAGS) syntax.c
-sybtax.$(USUF):	$(SRC_DIR)/parser.h Lpars.h
-
-outputdfa.$(USUF):	$(SRC_DIR)/outputdfa.c
-		$(UCC) -c $(UCFLAGS) $(SRC_DIR)/outputdfa.c
-outputdfa.$(USUF):	$(SRC_DIR)/parser.h Lpars.h
-
-outcalls.$(USUF):	$(SRC_DIR)/outcalls.c
-		$(UCC) -c $(UCFLAGS) $(SRC_DIR)/outcalls.c
-outcalls.$(USUF):	$(SRC_DIR)/parser.h
-
-findworst.$(USUF):	$(SRC_DIR)/findworst.c
-		$(UCC) -c $(UCFLAGS) $(SRC_DIR)/findworst.c
-findworst.$(USUF):	$(SRC_DIR)/parser.h
-
-initlex.$(USUF):	$(SRC_DIR)/initlex.c
-		$(UCC) -c $(UCFLAGS) $(SRC_DIR)/initlex.c
-initlex.$(USUF):	$(SRC_DIR)/parser.h
diff --git a/modules/src/flt_arith/build.mk b/modules/src/flt_arith/build.mk
deleted file mode 100644
index 6a34b7d46..000000000
--- a/modules/src/flt_arith/build.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-D := modules/src/flt_arith
-
-define build-libflt_arith-impl
-	$(call reset)
-	$(call cfile, $D/flt_ar2flt.c)
-	$(call cfile, $D/flt_div.c)
-	$(call cfile, $D/flt_flt2ar.c)
-	$(call cfile, $D/flt_modf.c)
-	$(call cfile, $D/flt_str2fl.c)
-	$(call cfile, $D/flt_cmp.c)
-	$(call cfile, $D/flt_add.c)
-	$(call cfile, $D/b64_add.c)
-	$(call cfile, $D/flt_mul.c)
-	$(call cfile, $D/flt_nrm.c)
-	$(call cfile, $D/b64_sft.c)
-	$(call cfile, $D/flt_umin.c)
-	$(call cfile, $D/flt_chk.c)
-	$(call cfile, $D/split.c)
-	$(call cfile, $D/ucmp.c)
-	$(call clibrary, $(LIBDIR)/libflt_arith.a)
-	LIBFLT_ARITH := $o
-
-	$(call reset)
-	$(eval q := $D/flt_arith.h)
-	$(call copyto, $(INCDIR)/flt_arith.h)
-endef
-
-$(eval $(build-libflt_arith-impl))
-
diff --git a/modules/src/flt_arith/proto.make b/modules/src/flt_arith/proto.make
deleted file mode 100644
index c0fb20517..000000000
--- a/modules/src/flt_arith/proto.make
+++ /dev/null
@@ -1,117 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/flt_arith
-MOD_DIR = $(TARGET_HOME)/modules
-INCLUDES = -I$(SRC_DIR) -I$(MOD_DIR)/h
-CFLAGS = $(INCLUDES) $(COPTIONS)
-LDFLAGS = $(LDOPTIONS)
-
-LIBFLT = libflt.$(LIBSUF)
-
-SRC =	$(SRC_DIR)/flt_ar2flt.c \
-	$(SRC_DIR)/flt_div.c \
-	$(SRC_DIR)/flt_flt2ar.c  \
-	$(SRC_DIR)/flt_modf.c  \
-	$(SRC_DIR)/flt_str2fl.c \
-	$(SRC_DIR)/flt_cmp.c  \
-	$(SRC_DIR)/flt_add.c  \
-	$(SRC_DIR)/b64_add.c  \
-	$(SRC_DIR)/flt_mul.c  \
-	$(SRC_DIR)/flt_nrm.c  \
-	$(SRC_DIR)/b64_sft.c \
-	$(SRC_DIR)/flt_umin.c  \
-	$(SRC_DIR)/flt_chk.c  \
-	$(SRC_DIR)/split.c  \
-	$(SRC_DIR)/ucmp.c
-
-OBJ =	flt_ar2flt.$(SUF) flt_div.$(SUF) flt_flt2ar.$(SUF) flt_modf.$(SUF) \
-	flt_str2fl.$(SUF) flt_cmp.$(SUF) flt_add.$(SUF) b64_add.$(SUF) \
-	flt_mul.$(SUF) flt_nrm.$(SUF) b64_sft.$(SUF) flt_umin.$(SUF) \
-	flt_chk.$(SUF) split.$(SUF) ucmp.$(SUF)
-
-all:		$(LIBFLT)
-
-test:		$(LIBFLT) test.$(SUF)
-		$(CC) $(LDFLAGS) -o tst test.$(SUF) $(LIBFLT)
-		./tst
-
-$(LIBFLT):	$(OBJ)
-		rm -f $(LIBFLT)
-		$(AR) r $(LIBFLT) $(OBJ)
-		$(RANLIB) $(LIBFLT)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(LIBFLT) $(MOD_DIR)/lib/$(LIBFLT)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBFLT)
-		cp $(SRC_DIR)/flt_arith.h $(MOD_DIR)/h/flt_arith.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/flt_arith.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(LIBFLT) $(MOD_DIR)/lib/$(LIBFLT)
-		-cmp $(SRC_DIR)/flt_arith.h $(MOD_DIR)/h/flt_arith.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) $(LIBFLT) tst
-
-lintlib:
-		$(MK_LINT_LIB) flt $(MOD_DIR)/lib $(INCLUDES) $(SRC)
-
-b64_add.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/b64_add.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/b64_add.c
-
-flt_ar2flt.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_ar2flt.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_ar2flt.c
-
-flt_div.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_div.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_div.c
-
-flt_nrm.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_nrm.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_nrm.c
-
-b64_sft.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/b64_sft.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/b64_sft.c
-
-flt_chk.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_chk.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_chk.c
-
-flt_flt2ar.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_flt2ar.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_flt2ar.c
-
-flt_str2fl.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_str2fl.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_str2fl.c
-
-flt_add.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_add.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_add.c
-
-flt_cmp.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_cmp.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_cmp.c
-
-flt_mul.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_mul.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_mul.c
-
-flt_modf.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/flt_modf.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_modf.c
-
-flt_umin.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_umin.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/flt_umin.c
-
-ucmp.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/ucmp.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/ucmp.c
-
-split.$(SUF):	$(SRC_DIR)/flt_misc.h $(SRC_DIR)/flt_arith.h $(SRC_DIR)/split.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/split.c
-
-test.$(SUF):	$(SRC_DIR)/flt_arith.h $(SRC_DIR)/test.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/test.c
diff --git a/modules/src/idf/build.mk b/modules/src/idf/build.mk
deleted file mode 100644
index b8dee6f79..000000000
--- a/modules/src/idf/build.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-D := modules/src/idf
-
-define build-libidf-impl
-	$(call reset)
-	$(eval q := $D/idf_pkg.body)
-	$(call copyto, $(INCDIR)/idf_pkg.body)
-
-	$(call reset)
-	$(eval q := $D/idf_pkg.spec)
-	$(call copyto, $(INCDIR)/idf_pkg.spec)
-endef
-
-$(eval $(build-libidf-impl))
-
diff --git a/modules/src/idf/proto.make b/modules/src/idf/proto.make
deleted file mode 100644
index 259c2df41..000000000
--- a/modules/src/idf/proto.make
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-
-#PARAMS		do not delete this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/idf
-MOD_DIR = $(TARGET_HOME)/modules
-
-all:
-
-install:	all
-		-mkdir $(MOD_DIR)/pkg
-		cp $(SRC_DIR)/idf_pkg.body $(MOD_DIR)/pkg/idf_pkg.body
-		cp $(SRC_DIR)/idf_pkg.spec $(MOD_DIR)/pkg/idf_pkg.spec
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/idf.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(SRC_DIR)/idf_pkg.body $(MOD_DIR)/pkg/idf_pkg.body
-		-cmp $(SRC_DIR)/idf_pkg.spec $(MOD_DIR)/pkg/idf_pkg.spec
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/idf_pkg.spec $(SRC_DIR)/idf_pkg.body
-
-opr:
-		make pr | opr
-
-clean:
-lintlib:
diff --git a/modules/src/input/build.mk b/modules/src/input/build.mk
deleted file mode 100644
index ef6e1aac0..000000000
--- a/modules/src/input/build.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-D := modules/src/input
-
-define build-libinput-impl
-	$(call reset)
-	$(call cfile, $D/AtEoIF.c)
-	$(call cfile, $D/AtEoIT.c)
-	$(call clibrary, $(LIBDIR)/libinput.a)
-	$(eval LIBINPUT := $o)
-
-	$(call reset)
-	$(eval q := $D/inp_pkg.body)
-	$(call copyto, $(INCDIR)/inp_pkg.body)
-
-	$(call reset)
-	$(eval q := $D/inp_pkg.spec)
-	$(call copyto, $(INCDIR)/inp_pkg.spec)
-endef
-
-$(eval $(build-libinput-impl))
-
diff --git a/modules/src/input/proto.make b/modules/src/input/proto.make
deleted file mode 100644
index d8e542d81..000000000
--- a/modules/src/input/proto.make
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/input
-MOD_DIR = $(TARGET_HOME)/modules
-
-OBJECTS =	AtEoIF.$(SUF)\
-		AtEoIT.$(SUF)
-
-CFLAGS = $(COPTIONS)
-
-all:		libinput.$(LIBSUF)
-
-libinput.$(LIBSUF):	$(OBJECTS)
-		rm -f libinput.$(LIBSUF)
-		$(AR) r libinput.$(LIBSUF) $(OBJECTS)
-		$(RANLIB) libinput.$(LIBSUF)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/pkg
-		cp libinput.$(LIBSUF) $(MOD_DIR)/lib/libinput.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libinput.$(LIBSUF)
-		cp $(SRC_DIR)/inp_pkg.body $(MOD_DIR)/pkg/inp_pkg.body
-		cp $(SRC_DIR)/inp_pkg.spec $(MOD_DIR)/pkg/inp_pkg.spec
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/input.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp libinput.$(LIBSUF) $(MOD_DIR)/lib/libinput.$(LIBSUF)
-		-cmp $(SRC_DIR)/inp_pkg.body $(MOD_DIR)/pkg/inp_pkg.body
-		-cmp $(SRC_DIR)/inp_pkg.spec $(MOD_DIR)/pkg/inp_pkg.spec
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/inp_pkg.spec $(SRC_DIR)/inp_pkg.body $(SRC_DIR)/AtEoIF.c $(SRC_DIR)/AtEoIT.c
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF)
-
-lintlib:
-		$(MK_LINT_LIB) input $(MOD_DIR)/lib $(SRC_DIR)/AtEoIF.c $(SRC_DIR)/AtEoIT.c
-
-AtEoIT.$(SUF):	$(SRC_DIR)/AtEoIT.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/AtEoIT.c
-
-AtEoIF.$(SUF):	$(SRC_DIR)/AtEoIF.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/AtEoIF.c
diff --git a/modules/src/malloc/proto.make b/modules/src/malloc/proto.make
deleted file mode 100644
index ad4eae7c6..000000000
--- a/modules/src/malloc/proto.make
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/malloc
-MOD_DIR = $(TARGET_HOME)/modules
-INCLUDES = -I$(MOD_DIR)/h
-CFLAGS = $(INCLUDES) $(COPTIONS)
-
-MALLOCSRC =	$(SRC_DIR)/READ_ME $(SRC_DIR)/size_type.h \
-		gensize_type.h $(SRC_DIR)/param.h $(SRC_DIR)/impl.h \
-		$(SRC_DIR)/check.h $(SRC_DIR)/log.h $(SRC_DIR)/phys.h \
-		$(SRC_DIR)/mal.c $(SRC_DIR)/log.c $(SRC_DIR)/phys.c \
-		$(SRC_DIR)/check.c
-
-all:		malloc.$(SUF)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		cp malloc.$(SUF) $(MOD_DIR)/lib/malloc.$(SUF)
-
-cmp:		all
-		-cmp malloc.$(SUF) $(MOD_DIR)/lib/malloc.$(SUF)
-
-malloc1.c:	$(MALLOCSRC) $(SRC_DIR)/add_file
-		rm -f malloc1.c
-		for i in $(MALLOCSRC) ; do $(SRC_DIR)/add_file $$i >> malloc1.c ; done
-
-malloc.c:	malloc1.c
-		cclash -l7 -c malloc1.c > clashes
-		cid -Fclashes < malloc1.c > malloc.c
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/add_file $(MALLOCSRC)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) clashes malloc1.c gensize_type.h getsize malloc.c
-
-gensize_type.h:	getsize
-		getsize > gensize_type.h
-
-getsize:	$(SRC_DIR)/getsize.c
-		$(UCC) -o getsize $(SRC_DIR)/getsize.c
-# use $(UCC), not $(CC) as this must produce runnable binary.
-
-malloc.$(SUF):	malloc.c
-		$(CC) -c $(CFLAGS) malloc.c
-# to avoid options that the SUN make adds.
-
-lintlib:
diff --git a/modules/src/object/build.mk b/modules/src/object/build.mk
deleted file mode 100644
index d256cba92..000000000
--- a/modules/src/object/build.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-D := modules/src/object
-
-define build-libobject-impl
-	$(call reset)
-	$(call cfile, $D/rd.c)
-	$(call cfile, $D/rd_arhdr.c)
-	$(call cfile, $D/rd_bytes.c)
-	$(call cfile, $D/rd_int2.c)
-	$(call cfile, $D/rd_long.c)
-	$(call cfile, $D/rd_ranlib.c)
-	$(call cfile, $D/rd_unsig2.c)
-	$(call cfile, $D/wr.c)
-	$(call cfile, $D/wr_arhdr.c)
-	$(call cfile, $D/wr_bytes.c)
-	$(call cfile, $D/wr_int2.c)
-	$(call cfile, $D/wr_long.c)
-	$(call cfile, $D/wr_putc.c)
-	$(call cfile, $D/wr_ranlib.c)
-
-	$(eval $q: $(INCDIR)/local.h)
-
-	$(call clibrary, $(LIBDIR)/libobject.a)
-	LIBOBJECT := $o
-endef
-
-$(eval $(build-libobject-impl))
-
diff --git a/modules/src/object/proto.make b/modules/src/object/proto.make
deleted file mode 100644
index 3fbc17260..000000000
--- a/modules/src/object/proto.make
+++ /dev/null
@@ -1,95 +0,0 @@
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/object
-MOD_DIR = $(TARGET_HOME)/modules
-INCLUDES = -I$(TARGET_HOME)/h -I$(MOD_DIR)/h -I$(TARGET_HOME)/config -I$(SRC_DIR)
-CFLAGS = $(INCLUDES) $(COPTIONS)
-
-CFILES =	$(SRC_DIR)/rd_arhdr.c $(SRC_DIR)/wr_arhdr.c \
-		$(SRC_DIR)/rd_ranlib.c $(SRC_DIR)/wr_ranlib.c \
-		$(SRC_DIR)/rd_bytes.c $(SRC_DIR)/wr_bytes.c \
-		$(SRC_DIR)/rd.c $(SRC_DIR)/wr.c \
-		$(SRC_DIR)/wr_putc.c \
-		$(SRC_DIR)/rd_int2.c $(SRC_DIR)/wr_int2.c \
-		$(SRC_DIR)/rd_unsig2.c \
-		$(SRC_DIR)/rd_long.c $(SRC_DIR)/wr_long.c
-# do not change the order in OFILES
-OFILES =	rd.$(SUF) rd_arhdr.$(SUF) rd_int2.$(SUF) rd_long.$(SUF) \
-		rd_ranlib.$(SUF) rd_unsig2.$(SUF) rd_bytes.$(SUF) \
-		wr_arhdr.$(SUF) wr_int2.$(SUF) wr_long.$(SUF) wr_putc.$(SUF) \
-		wr.$(SUF) wr_ranlib.$(SUF) wr_bytes.$(SUF)
-
-all:		libobject.$(LIBSUF)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp libobject.$(LIBSUF) $(MOD_DIR)/lib/libobject.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libobject.$(LIBSUF)
-		cp $(SRC_DIR)/object.h $(MOD_DIR)/h/object.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/object.3 $(TARGET_HOME) ; \
-		fi
-
-compare:	all
-		-cmp libobject.$(LIBSUF) $(MOD_DIR)/lib/libobject.$(LIBSUF)
-		-cmp $(SRC_DIR)/object.h $(MOD_DIR)/h/object.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/object.h $(CFILES)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF) nohup.out Out
-
-libobject.$(LIBSUF):	$(OFILES)
-		rm -f libobject.$(LIBSUF)
-		$(AR) r libobject.$(LIBSUF) $(OFILES)
-		$(RANLIB) libobject.$(LIBSUF)
-
-lintlib:
-		$(MK_LINT_LIB) object $(MOD_DIR)/lib $(INCLUDES) $(CFILES)
-		
-rd_arhdr.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/rd_arhdr.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd_arhdr.c
-
-wr_arhdr.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/wr_arhdr.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr_arhdr.c
-
-rd_ranlib.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/rd_ranlib.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd_ranlib.c
-
-wr_ranlib.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/wr_ranlib.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr_ranlib.c
-
-rd.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/rd.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd.c
-
-wr.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/wr.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr.c
-
-wr_putc.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/wr_putc.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr_putc.c
-
-rd_int2.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/rd_int2.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd_int2.c
-
-wr_int2.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/wr_int2.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr_int2.c
-
-rd_unsig2.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/rd_unsig2.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd_unsig2.c
-
-rd_long.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/rd_long.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd_long.c
-
-wr_long.$(SUF):	$(SRC_DIR)/object.h $(SRC_DIR)/wr_long.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr_long.c
-
-rd_bytes.$(SUF):	$(SRC_DIR)/rd_bytes.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rd_bytes.c
-
-wr_bytes.$(SUF):	$(SRC_DIR)/wr_bytes.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/wr_bytes.c
diff --git a/modules/src/print/build.mk b/modules/src/print/build.mk
deleted file mode 100644
index 17974b4d6..000000000
--- a/modules/src/print/build.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-D := modules/src/print
-
-define build-libprint-impl
-	$(call reset)
-	$(call cfile, $D/doprnt.c)
-	$(call cfile, $D/fprint.c)
-	$(call cfile, $D/print.c)
-	$(call cfile, $D/sprint.c)
-	$(call cfile, $D/format.c)
-
-	$(eval $q: $(INCDIR)/system.h)
-
-	$(call clibrary, $(LIBDIR)/libprint.a)
-	LIBPRINT := $o
-
-	$(call reset)
-	$(eval q := $D/print.h)
-	$(call copyto, $(INCDIR)/print.h)
-endef
-
-$(eval $(build-libprint-impl))
-
diff --git a/modules/src/print/proto.make b/modules/src/print/proto.make
deleted file mode 100644
index 61004de70..000000000
--- a/modules/src/print/proto.make
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/print
-MOD_DIR = $(TARGET_HOME)/modules
-LIBPRINT = libprint.$(LIBSUF)
-INCLUDES = -I$(SRC_DIR) -I$(MOD_DIR)/h
-
-CFLAGS = $(COPTIONS) $(INCLUDES)
-
-SRC =	$(SRC_DIR)/doprnt.c $(SRC_DIR)/fprint.c $(SRC_DIR)/print.c \
-	$(SRC_DIR)/sprint.c $(SRC_DIR)/format.c
-OBJ =	doprnt.$(SUF) fprint.$(SUF) print.$(SUF) sprint.$(SUF) format.$(SUF)
-
-all:		$(LIBPRINT)
-
-$(LIBPRINT):	$(OBJ)
-		rm -f $(LIBPRINT)
-		$(AR) r $(LIBPRINT) $(OBJ)
-		$(RANLIB) $(LIBPRINT)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(LIBPRINT) $(MOD_DIR)/lib/$(LIBPRINT)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBPRINT)
-		cp $(SRC_DIR)/print.h $(MOD_DIR)/h/print.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/print.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(LIBPRINT) $(MOD_DIR)/lib/$(LIBPRINT)
-		-cmp $(SRC_DIR)/print.h $(MOD_DIR)/h/print.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) $(LIBPRINT)
-
-lintlib:
-		$(MK_LINT_LIB) print $(MOD_DIR)/lib $(INCLUDES) $(SRC)
-
-doprnt.$(SUF):	$(SRC_DIR)/param.h $(SRC_DIR)/doprnt.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/doprnt.c
-
-fprint.$(SUF):	$(SRC_DIR)/param.h $(SRC_DIR)/fprint.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/fprint.c
-
-print.$(SUF):	$(SRC_DIR)/param.h $(SRC_DIR)/print.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/print.c
-
-sprint.$(SUF):	$(SRC_DIR)/param.h $(SRC_DIR)/sprint.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/sprint.c
-
-format.$(SUF):	$(SRC_DIR)/format.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/format.c
diff --git a/modules/src/read_em/build.mk b/modules/src/read_em/build.mk
deleted file mode 100644
index 17606718c..000000000
--- a/modules/src/read_em/build.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-D := modules/src/read_em
-
-define build-read_em-headers-impl
-
-$(eval g := $(OBJDIR)/$D/C_mnem_narg.h)
-$(eval CLEANABLES += $g)
-$g: $D/m_C_mnem_na h/em_table
-	@echo M_C_MNEM_NA $g
-	@mkdir -p $(dir $g)
-	$(hide) cd $D && $(abspath $D/m_C_mnem_na) $(abspath h/em_table) > $(abspath $g)
-
-$(eval g := $(OBJDIR)/$D/C_mnem.h)
-$(eval CLEANABLES += $g)
-$g: $D/m_C_mnem h/em_table
-	@echo M_C_MNEM $g
-	@mkdir -p $(dir $g)
-	$(hide) cd $D && $(abspath $D/m_C_mnem) $(abspath h/em_table) > $(abspath $g)
-
-endef
-
-define build-read_em-impl
-
-$(call reset)
-$(eval objdir := emev)
-$(eval cflags += -I$(OBJDIR)/$D -DPRIVATE=static -DEXPORT= -DNDEBUG -DCHECKING)
-$(call cfile, $D/EM_vars.c)
-$(call cfile, $D/read_em.c)
-$(call cfile, $D/mkcalls.c)
-$(eval $q: $(OBJDIR)/$D/C_mnem_narg.h)
-$(eval $q: $(OBJDIR)/$D/C_mnem.h)
-$(call clibrary, $(LIBDIR)/lib_read_emeV.a)
-$(eval LIBREAD_EMEV := $q)
-
-$(call reset)
-$(eval objdir := emkv)
-$(eval cflags += -I$(OBJDIR)/$D -DPRIVATE=static -DEXPORT= -DNDEBUG -DCHECKING -DCOMPACT)
-$(call cfile, $D/EM_vars.c)
-$(call cfile, $D/read_em.c)
-$(call cfile, $D/mkcalls.c)
-$(eval $q: $(OBJDIR)/$D/C_mnem_narg.h)
-$(eval $q: $(OBJDIR)/$D/C_mnem.h)
-$(call clibrary, $(LIBDIR)/lib_read_emkV.a)
-$(eval LIBREAD_EMKV := $q)
-
-$(call reset)
-$(eval q := $D/em_comp.h)
-$(call installto, $(INCDIR)/em_comp.h)
-
-endef
-
-$(eval $(call build-read_em-headers-impl))
-$(eval $(call build-read_em-impl))
-
-
diff --git a/modules/src/read_em/proto.make b/modules/src/read_em/proto.make
deleted file mode 100644
index 07b38cf16..000000000
--- a/modules/src/read_em/proto.make
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/read_em
-MOD_DIR = $(TARGET_HOME)/modules
-EM_TABLE = $(SRC_HOME)/etc/em_table
-INCLUDES = -I$(TARGET_HOME)/h -I$(MOD_DIR)/h -I$(SRC_DIR) -I.
-DEFINES = -DPRIVATE=static -DEXPORT= -DNDEBUG
-CFLAGS = $(INCLUDES) $(DEFINES) $(COPTIONS)
-
-TARGETS =	libread_emk.$(LIBSUF) \
-		libread_emkV.$(LIBSUF) \
-		libread_emeV.$(LIBSUF)
-
-ESRCFILES =	$(SRC_DIR)/read_em.c\
-		$(SRC_DIR)/mkcalls.c\
-		$(SRC_DIR)/EM_vars.c
-
-KSRCFILES =	$(SRC_DIR)/read_em.c\
-		$(SRC_DIR)/mkcalls.c\
-		$(SRC_DIR)/EM_vars.c
-
-SRCFILES =	$(SRC_DIR)/em_comp.h\
-		$(SRC_DIR)/read_em.c\
-		$(SRC_DIR)/reade.c\
-		$(SRC_DIR)/readk.c \
-		$(SRC_DIR)/mkcalls.c\
-		$(SRC_DIR)/EM_vars.c
-
-EV_OFILES =	read_emeV.$(SUF) makecallsV.$(SUF) EM_vars.$(SUF)
-KV_OFILES = 	read_emkV.$(SUF) makecallsV.$(SUF) EM_vars.$(SUF)
-K_OFILES =	read_emk.$(SUF) makecalls.$(SUF) EM_vars.$(SUF)
-
-all:		$(TARGETS)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(SRC_DIR)/em_comp.h $(MOD_DIR)/h/em_comp.h
-		cp libread_emk.$(LIBSUF) $(MOD_DIR)/lib/libread_emk.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libread_emk.$(LIBSUF)
-		cp libread_emkV.$(LIBSUF) $(MOD_DIR)/lib/libread_emkV.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libread_emkV.$(LIBSUF)
-		cp libread_emeV.$(LIBSUF) $(MOD_DIR)/lib/libread_emeV.$(LIBSUF)
-		$(RANLIB) $(MOD_DIR)/lib/libread_emeV.$(LIBSUF)
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/read_em.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(SRC_DIR)/em_comp.h $(MOD_DIR)/h/em_comp.h
-		-cmp libread_emk.$(LIBSUF) $(MOD_DIR)/lib/libread_emk.$(LIBSUF)
-		-cmp libread_emkV.$(LIBSUF) $(MOD_DIR)/lib/libread_emkV.$(LIBSUF)
-		-cmp libread_emeV.$(LIBSUF) $(MOD_DIR)/lib/libread_emeV.$(LIBSUF)
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/m_C_mnem $(SRC_DIR)/m_C_mnem_na $(SRC_DIR)/argtype $(SRCFILES)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF) C_mnem C_mnem_narg
-
-libread_emk.$(LIBSUF):	$(K_OFILES)
-		rm -f libread_emk.$(LIBSUF)
-		$(AR) r libread_emk.$(LIBSUF) $(K_OFILES)
-		$(RANLIB) libread_emk.$(LIBSUF)
-
-libread_emkV.$(LIBSUF):	$(KV_OFILES)
-		rm -f libread_emkV.$(LIBSUF)
-		$(AR) r libread_emkV.$(LIBSUF) $(KV_OFILES)
-		$(RANLIB) libread_emkV.$(LIBSUF)
-
-libread_emeV.$(LIBSUF):	$(EV_OFILES)
-		rm -f libread_emeV.$(LIBSUF)
-		$(AR) r libread_emeV.$(LIBSUF) $(EV_OFILES)
-		$(RANLIB) libread_emeV.$(LIBSUF)
-
-read_emk.$(SUF):	$(SRC_DIR)/read_em.c $(SRC_DIR)/em_comp.h $(SRC_DIR)/readk.c
-		$(CC) -c $(CFLAGS) -DCOMPACT $(SRC_DIR)/read_em.c
-		mv read_em.$(SUF) read_emk.$(SUF)
-
-read_emkV.$(SUF):	$(SRC_DIR)/read_em.c $(SRC_DIR)/em_comp.h $(SRC_DIR)/readk.c
-		$(CC) -c $(CFLAGS) -DCOMPACT -DCHECKING $(SRC_DIR)/read_em.c
-		mv read_em.$(SUF) read_emkV.$(SUF)
-
-read_emeV.$(SUF):	$(SRC_DIR)/read_em.c $(SRC_DIR)/em_comp.h $(SRC_DIR)/reade.c
-		$(CC) -c $(CFLAGS) -DCHECKING $(SRC_DIR)/read_em.c
-		mv read_em.$(SUF) read_emeV.$(SUF)
-
-makecalls.$(SUF):	C_mnem C_mnem_narg $(SRC_DIR)/em_comp.h $(SRC_DIR)/mkcalls.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/mkcalls.c
-		mv mkcalls.$(SUF) makecalls.$(SUF)
-
-makecallsV.$(SUF):	C_mnem C_mnem_narg $(SRC_DIR)/em_comp.h $(SRC_DIR)/mkcalls.c
-		$(CC) -c $(CFLAGS) -DCHECKING $(SRC_DIR)/mkcalls.c
-		mv mkcalls.$(SUF) makecallsV.$(SUF)
-
-makecallsO.$(SUF):	C_mnem C_mnem_narg $(SRC_DIR)/em_comp.h $(SRC_DIR)/mkcalls.c
-		$(CC) -c -DPEEPHOLE $(CFLAGS) $(SRC_DIR)/mkcalls.c
-		mv mkcalls.$(SUF) makecallsO.$(SUF)
-
-makecallsCE.$(SUF):	C_mnem C_mnem_narg $(SRC_DIR)/em_comp.h $(SRC_DIR)/mkcalls.c
-		$(CC) -c -DCODE_EXPANDER $(CFLAGS) $(SRC_DIR)/mkcalls.c
-		mv mkcalls.$(SUF) makecallsCE.$(SUF)
-
-C_mnem:		$(SRC_DIR)/m_C_mnem argtype $(EM_TABLE)
-		sh $(SRC_DIR)/m_C_mnem $(EM_TABLE) > C_mnem
-
-C_mnem_narg:	$(SRC_DIR)/m_C_mnem_na argtype $(EM_TABLE)
-		sh $(SRC_DIR)/m_C_mnem_na $(EM_TABLE) > C_mnem_narg
-
-argtype:	$(SRC_DIR)/argtype
-		cp $(SRC_DIR)/argtype argtype
-
-lintlib:	C_mnem C_mnem_narg
-		$(MK_LINT_LIB) read_emkV $(MOD_DIR)/lib $(INCLUDES) $(DEFINES) -DCOMPACT -DCHECKING $(KSRCFILES)
-		$(MK_LINT_LIB) read_emeV $(MOD_DIR)/lib $(INCLUDES) $(DEFINES) -DCHECKING $(ESRCFILES)
-
-EM_vars.$(SUF):	$(SRC_DIR)/EM_vars.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/EM_vars.c
diff --git a/modules/src/string/build.mk b/modules/src/string/build.mk
deleted file mode 100644
index 7139f1e8e..000000000
--- a/modules/src/string/build.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-D := modules/src/string
-
-define build-libstring-impl
-	$(call reset)
-	$(call cfile, $D/bts2str.c)
-	$(call cfile, $D/btscat.c)
-	$(call cfile, $D/btscmp.c)
-	$(call cfile, $D/btscpy.c)
-	$(call cfile, $D/btszero.c)
-	$(call cfile, $D/long2str.c)
-	$(call cfile, $D/str2bts.c)
-	$(call cfile, $D/str2long.c)
-	$(call cfile, $D/strzero.c)
-	$(call clibrary, $(LIBDIR)/libstring.a)
-	LIBSTRING := $o
-endef
-
-$(eval $(build-libstring-impl))
-
diff --git a/modules/src/string/proto.make b/modules/src/string/proto.make
deleted file mode 100644
index 58184e7c5..000000000
--- a/modules/src/string/proto.make
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/string
-MOD_DIR = $(TARGET_HOME)/modules
-
-SRC =	$(SRC_DIR)/bts2str.c $(SRC_DIR)/btscat.c $(SRC_DIR)/btscmp.c \
-	$(SRC_DIR)/btscpy.c $(SRC_DIR)/btszero.c $(SRC_DIR)/long2str.c \
-	$(SRC_DIR)/str2bts.c $(SRC_DIR)/str2long.c $(SRC_DIR)/strcat.c \
-	$(SRC_DIR)/strcmp.c $(SRC_DIR)/strcpy.c $(SRC_DIR)/strindex.c \
-	$(SRC_DIR)/strlen.c $(SRC_DIR)/strncat.c $(SRC_DIR)/strncmp.c \
-	$(SRC_DIR)/strncpy.c $(SRC_DIR)/strrindex.c $(SRC_DIR)/strzero.c
-
-OBJ =	bts2str.$(SUF) btscat.$(SUF) btscmp.$(SUF) btscpy.$(SUF) \
-	btszero.$(SUF) long2str.$(SUF) str2bts.$(SUF) str2long.$(SUF) \
-	strcat.$(SUF) strcmp.$(SUF) strcpy.$(SUF) strindex.$(SUF) \
-	strlen.$(SUF) strncat.$(SUF) strncmp.$(SUF) strncpy.$(SUF) \
-	strrindex.$(SUF) strzero.$(SUF)
-
-INCLUDES = -I$(SRC_DIR) -I$(MOD_DIR)/h
-CFLAGS = $(COPTIONS) $(INCLUDES)
-
-LIBSTRING = libstring.$(LIBSUF)
-
-all:		$(LIBSTRING)
-
-$(LIBSTRING):	$(OBJ)
-		$(AR) r $(LIBSTRING) $(OBJ)
-		$(RANLIB) $(LIBSTRING)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(LIBSTRING) $(MOD_DIR)/lib/$(LIBSTRING)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBSTRING)
-		cp $(SRC_DIR)/ack_string.h $(MOD_DIR)/h/ack_string.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/string.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(LIBSTRING) $(MOD_DIR)/lib/$(LIBSTRING)
-		-cmp $(SRC_DIR)/ack_string.h $(MOD_DIR)/h/ack_string.h
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC)
-
-opr:
-		make pr | opr
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF)
-
-lintlib:
-		$(MK_LINT_LIB) string $(MOD_DIR)/lib $(INCLUDES) $(SRC)
-
-bts2str.$(SUF):	$(SRC_DIR)/bts2str.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/bts2str.c
-
-btscat.$(SUF):	$(SRC_DIR)/btscat.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/btscat.c
-
-btscmp.$(SUF):	$(SRC_DIR)/btscmp.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/btscmp.c
-
-btscpy.$(SUF):	$(SRC_DIR)/btscpy.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/btscpy.c
-
-btszero.$(SUF):	$(SRC_DIR)/btszero.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/btszero.c
-
-long2str.$(SUF):	$(SRC_DIR)/long2str.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/long2str.c
-
-str2bts.$(SUF):	$(SRC_DIR)/str2bts.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/str2bts.c
-
-str2long.$(SUF):	$(SRC_DIR)/str2long.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/str2long.c
-
-strcat.$(SUF):	$(SRC_DIR)/strcat.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strcat.c
-
-strcmp.$(SUF):	$(SRC_DIR)/strcmp.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strcmp.c
-
-strcpy.$(SUF):	$(SRC_DIR)/strcpy.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strcpy.c
-
-strindex.$(SUF):	$(SRC_DIR)/strindex.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strindex.c
-
-strlen.$(SUF):	$(SRC_DIR)/strlen.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strlen.c
-
-strncat.$(SUF):	$(SRC_DIR)/strncat.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strncat.c
-
-strncmp.$(SUF):	$(SRC_DIR)/strncmp.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strncmp.c
-
-strncpy.$(SUF):	$(SRC_DIR)/strncpy.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strncpy.c
-
-strrindex.$(SUF):	$(SRC_DIR)/strrindex.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strrindex.c
-
-strzero.$(SUF):	$(SRC_DIR)/strzero.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/strzero.c
diff --git a/modules/src/system/build.mk b/modules/src/system/build.mk
deleted file mode 100644
index e76b5c5e3..000000000
--- a/modules/src/system/build.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-D := modules/src/system
-
-define build-libsystem-impl
-	$(call reset)
-	$(call cfile, $D/access.c)
-	$(call cfile, $D/break.c)
-	$(call cfile, $D/chmode.c)
-	$(call cfile, $D/close.c)
-	$(call cfile, $D/create.c)
-	$(call cfile, $D/filesize.c)
-	$(call cfile, $D/open.c)
-	$(call cfile, $D/read.c)
-	$(call cfile, $D/remove.c)
-	$(call cfile, $D/stop.c)
-	$(call cfile, $D/system.c)
-	$(call cfile, $D/time.c)
-	$(call cfile, $D/write.c)
-	$(call cfile, $D/seek.c)
-	$(call cfile, $D/rename.c)
-	$(call clibrary, $(LIBDIR)/libsystem.a)
-	LIBSYSTEM := $o
-
-	$(call reset)
-	$(eval q := $D/system.h)
-	$(call copyto, $(INCDIR)/system.h)
-endef
-
-$(eval $(build-libsystem-impl))
-
diff --git a/modules/src/system/proto.make b/modules/src/system/proto.make
deleted file mode 100644
index 50d21ccfc..000000000
--- a/modules/src/system/proto.make
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/modules/src/system
-MOD_DIR = $(TARGET_HOME)/modules
-
-LIBSYS	= libsystem.$(LIBSUF)
-OBJ	= access.$(SUF) break.$(SUF) chmode.$(SUF) close.$(SUF) create.$(SUF) \
-	  filesize.$(SUF) modtime.$(SUF) lock.$(SUF) open.$(SUF) read.$(SUF) \
-	  remove.$(SUF) stop.$(SUF) system.$(SUF) time.$(SUF) unlock.$(SUF) \
-	  write.$(SUF) seek.$(SUF) rename.$(SUF)
-CSRC	= $(SRC_DIR)/access.c $(SRC_DIR)/break.c $(SRC_DIR)/chmode.c \
-	  $(SRC_DIR)/close.c $(SRC_DIR)/create.c $(SRC_DIR)/filesize.c \
-	  $(SRC_DIR)/modtime.c $(SRC_DIR)/lock.c $(SRC_DIR)/open.c \
-	  $(SRC_DIR)/read.c $(SRC_DIR)/remove.c $(SRC_DIR)/stop.c \
-	  $(SRC_DIR)/system.c $(SRC_DIR)/time.c $(SRC_DIR)/unlock.c \
-	  $(SRC_DIR)/write.c $(SRC_DIR)/seek.c $(SRC_DIR)/rename.c
-SRC	= $(SRC_DIR)/proto.make $(SRC_DIR)/system.h $(CSRC)
-
-INCLUDES = -I$(SRC_DIR) -I$(MOD_DIR)/h
-CFLAGS = $(COPTIONS) $(INCLUDES)
-
-all:		$(LIBSYS)
-
-$(LIBSYS):	$(OBJ)
-		rm -f $(LIBSYS)
-		$(AR) r $(LIBSYS) $(OBJ)
-		$(RANLIB) $(LIBSYS)
-
-install:	all
-		-mkdir $(MOD_DIR)/lib
-		-mkdir $(MOD_DIR)/h
-		cp $(LIBSYS) $(MOD_DIR)/lib/$(LIBSYS)
-		$(RANLIB) $(MOD_DIR)/lib/$(LIBSYS)
-		cp $(SRC_DIR)/system.h $(MOD_DIR)/h/system.h
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/system.3 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp $(LIBSYS) $(MOD_DIR)/lib/$(LIBSYS)
-		-cmp $(SRC_DIR)/system.h $(MOD_DIR)/h/system.h
-
-clean:
-		rm -f *.$(SUF) *.$(LIBSUF)
-
-pr:
-		@pr $(SRC)
-
-opr:
-		make pr | opr
-
-lintlib:
-		$(MK_LINT_LIB) system $(MOD_DIR)/lib $(INCLUDES) $(CSRC)
-
-access.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/access.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/access.c
-
-break.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/break.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/break.c
-
-chmode.$(SUF):	$(SRC_DIR)/chmode.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/chmode.c
-
-close.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/close.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/close.c
-
-create.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/create.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/create.c
-
-filesize.$(SUF): $(SRC_DIR)/filesize.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/filesize.c
-
-lock.$(SUF):	$(SRC_DIR)/lock.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/lock.c
-
-modtime.$(SUF):	$(SRC_DIR)/modtime.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/modtime.c
-
-open.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/open.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/open.c
-
-read.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/read.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/read.c
-
-remove.$(SUF):	$(SRC_DIR)/remove.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/remove.c
-
-rename.$(SUF):	$(SRC_DIR)/rename.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/rename.c
-
-seek.$(SUF):	$(SRC_DIR)/seek.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/seek.c
-
-stop.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/stop.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/stop.c
-
-system.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/system.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/system.c
-
-time.$(SUF):	$(SRC_DIR)/time.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/time.c
-
-unlock.$(SUF):	$(SRC_DIR)/unlock.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/unlock.c
-
-write.$(SUF):	$(SRC_DIR)/system.h $(SRC_DIR)/write.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/write.c
diff --git a/plat/build.mk b/plat/build.mk
deleted file mode 100644
index 623658b07..000000000
--- a/plat/build.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-
-define build-platform-headers
-$(call reset)
-$(eval q := $D/include/$(strip $1))
-$(call installto, $(PLATIND)/$(PLATFORM)/include/$(strip $1))
-$(eval PLATFORM_HEADERS_$(PLATFORM) += $q)
-endef
-
-define build-platform-impl
-    $(call reset)
-	$(eval q := $D/descr)
-	$(call installto, $(PLATIND)/descr/$(PLATFORM))
-
-	$(foreach f, $(platform-headers), $(call build-platform-headers, $f))
-
-	$(eval PLATFORM_$(PLATFORM) := \
-			$(PLATIND)/descr/$(PLATFORM) \
-			$(PLATFORM_HEADERS_$(PLATFORM)) \
-			$(PLATDEP)/$(PLATFORM)/as \
-			$(if $(arch-cg-$(ARCH)), $(PLATDEP)/$(PLATFORM)/cg, $(PLATDEP)/$(PLATFORM)/ncg) \
-			$(ARCHITECTURE_$(ARCH)))
-
-	# libsys
-
-	$(call reset)
-	$(foreach f, $(platform-libsys), $(call ackfile, $D/libsys/$f))
-	$(call acklibrary, $(LIBDIR)/$(PLATFORM)/libsys.a)
-	$(call installto, $(PLATIND)/$(PLATFORM)/libsys.a)
-
-    # libem
-
-    $(call reset)
-    $(eval objdir := $(PLATFORM))
-    $(eval ackflags += -Ih)
-    $(foreach f, $(arch-libem-$(ARCH)), $(call ackfile, mach/$(ARCH)/libem/$f))
-    $(call acklibrary, $(LIBDIR)/$(PLATFORM)/libem.a)
-    $(call installto, $(PLATIND)/$(PLATFORM)/libem.a)
-
-    # libend
-
-    $(call reset)
-    $(eval objdir := $(PLATFORM))
-    $(eval ackflags += -Ih)
-    $(foreach f, $(arch-libend-$(ARCH)), $(call ackfile, mach/$(ARCH)/libend/$f))
-    $(call acklibrary, $(LIBDIR)/$(PLATFORM)/libend.a)
-    $(call installto, $(PLATIND)/$(PLATFORM)/libend.a)
-
-    # The tools themselves
-
-    $(call build-as)
-    $(if $(arch-cg-$(ARCH)), $(call build-cg), $(call build-ncg))
-
-	# Build top only if the architecture asks for it.
-
-	$(if $(arch-top-$(ARCH)), $(call build-top))
-
-    # Language runtimes
-
-    $(foreach runtime, $(RUNTIMES), $(build-runtime-$(runtime)))
-
-    # Install the ego descr file for this architecture
-
-    $(call build-ego-descr)
-endef
-
-build-platform = $(eval $(call build-platform-impl, $1))
-
-
diff --git a/plat/cpm/build.mk b/plat/cpm/build.mk
deleted file mode 100644
index 54ed3d839..000000000
--- a/plat/cpm/build.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-ARCH := i80
-PLATFORM := cpm
-OPTIMISATION := -O
-
-D := plat/cpm
-
-platform-headers := \
-	ack/config.h \
-	cpm.h \
-	unistd.h
-
-platform-libsys := \
-	_bdos.s \
-	_hol0.s \
-	_inn2.s \
-	_trap.s \
-	brk.c \
-	close.c \
-	creat.c \
-	errno.s \
-	getpid.c \
-	isatty.c \
-	kill.c \
-	lseek.c \
-	open.c \
-	read.c \
-	signal.c \
-	time.c \
-	write.c
-
-$(eval $(call build-platform))
-
-define build-cpm-boot-impl
-	$(call reset)
-	$(call ackfile, $D/boot.s)
-	$(call installto, $(PLATIND)/$(PLATFORM)/boot.o)
-endef
-
-$(eval $(build-cpm-boot-impl))
-
-
-
diff --git a/plat/linux/libsys/build.mk b/plat/linux/libsys/build.mk
deleted file mode 100644
index 3cff634f9..000000000
--- a/plat/linux/libsys/build.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-define build-liblinux-impl
-
-$(call reset)
-$(eval objdir := $(PLATFORM))
-$(call ackfile, plat/linux/liblinux/_exit.c)
-$(call ackfile, plat/linux/liblinux/_hol0.s)
-$(call ackfile, plat/linux/liblinux/brk.c)
-$(call ackfile, plat/linux/liblinux/close.c)
-$(call ackfile, plat/linux/liblinux/creat.c)
-$(call ackfile, plat/linux/liblinux/errno.s)
-$(call ackfile, plat/linux/liblinux/getpid.c)
-$(call ackfile, plat/linux/liblinux/gettimeofday.c)
-$(call ackfile, plat/linux/liblinux/isatty.c)
-$(call ackfile, plat/linux/liblinux/kill.c)
-$(call ackfile, plat/linux/liblinux/lseek.c)
-$(call ackfile, plat/linux/liblinux/open.c)
-$(call ackfile, plat/linux/liblinux/read.c)
-$(call ackfile, plat/linux/liblinux/sbrk.c)
-$(call ackfile, plat/linux/liblinux/signal.c)
-$(call ackfile, plat/linux/liblinux/write.c)
-
-$(call acklibrary, $(OBJDIR)/$D/liblinux.a)
-$(call installto, $(PLATIND)/$(PLATFORM)/liblinux.a)
-
-endef
-
-build-liblinux = $(eval $(build-liblinux-impl))
diff --git a/plat/linux386/build.mk b/plat/linux386/build.mk
deleted file mode 100644
index f35fa6be7..000000000
--- a/plat/linux386/build.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-ARCH := i386
-PLATFORM := linux386
-OPTIMISATION := -O
-
-D := plat/linux386/
-
-platform-headers := \
-	ack/config.h \
-	sys/ioctl.h \
-	unistd.h
-
-platform-libsys := \
-	_syscall.s
-
-$(eval $(call build-platform))
-$(eval $(call build-liblinux))
-
-define build-linux386-boot-impl
-	$(call reset)
-	$(call ackfile, $D/boot.s)
-	$(call installto, $(PLATIND)/$(PLATFORM)/boot.o)
-endef
-
-$(eval $(build-linux386-boot-impl))
-
-
-
-
diff --git a/plat/linux68k/build.mk b/plat/linux68k/build.mk
deleted file mode 100644
index 7a1e7223b..000000000
--- a/plat/linux68k/build.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-ARCH := m68020
-PLATFORM := linux68k
-OPTIMISATION := -O6
-
-D := plat/linux68k/
-
-platform-headers := \
-	ack/config.h \
-	sys/ioctl.h \
-	unistd.h
-
-platform-libsys := \
-	_syscall.s
-
-$(eval $(call build-platform))
-$(eval $(call build-liblinux))
-
-define build-linux68k-boot-impl
-	$(call reset)
-	$(call ackfile, $D/boot.s)
-	$(call installto, $(PLATIND)/$(PLATFORM)/boot.o)
-endef
-
-$(eval $(build-linux68k-boot-impl))
-
diff --git a/plat/linuxppc/build.mk b/plat/linuxppc/build.mk
deleted file mode 100644
index d19fa5aa3..000000000
--- a/plat/linuxppc/build.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-ARCH := powerpc
-PLATFORM := linuxppc
-OPTIMISATION := -O6
-
-D := plat/linuxppc/
-
-platform-headers := \
-	ack/config.h \
-	sys/ioctl.h \
-	unistd.h
-
-platform-libsys := \
-	_syscall.s \
-	trap.s
-
-$(eval $(call build-platform))
-$(eval $(call build-liblinux))
-
-define build-linuxppc-boot-impl
-	$(call reset)
-	$(call ackfile, $D/boot.s)
-	$(call installto, $(PLATIND)/$(PLATFORM)/boot.o)
-endef
-
-$(eval $(build-linuxppc-boot-impl))
-
-
-
-
-
-
diff --git a/plat/pc86/build.mk b/plat/pc86/build.mk
deleted file mode 100644
index 1ae9e5f49..000000000
--- a/plat/pc86/build.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-ARCH := i86
-PLATFORM := pc86
-OPTIMISATION := -O
-
-D := plat/pc86/
-
-platform-headers := \
-	ack/config.h \
-	unistd.h
-
-platform-libsys := \
-	errno.s \
-	_hol0.s \
-	_sys_rawread.s \
-	_sys_rawwrite.s \
-	open.c \
-	creat.c \
-	close.c \
-	read.c \
-	write.c \
-	brk.c \
-	getpid.c \
-	kill.c \
-	isatty.c \
-	lseek.c \
-	time.c \
-	signal.c
-
-$(eval $(call build-platform))
-
-define build-pc86-boot-impl
-	$(call reset)
-	$(call ackfile, $D/boot.s)
-	$(call installto, $(PLATIND)/$(PLATFORM)/boot.o)
-endef
-
-$(eval $(build-pc86-boot-impl))
-
diff --git a/plat/rpi/build.mk b/plat/rpi/build.mk
deleted file mode 100644
index c89847607..000000000
--- a/plat/rpi/build.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Build script for Raspberry Pi bare-metal executables (using the
-# VideoCore IV processor, not the ARM).
-#
-# © 2013 David Given
-# This file is redistributable under the terms of the 3-clause BSD license.
-# See the file 'Copying' in the root of the distribution for the full text.
-
-ARCH := vc4
-PLATFORM := rpi
-OPTIMISATION := -O
-
-D := plat/rpi/
-
-platform-headers := \
-	unistd.h \
-	termios.h \
-	pi.h \
-	ack/config.h
-
-platform-libsys := \
-	_hol0.s \
-	errno.s \
-	pi_phys_to_user.s \
-	pi_user_to_phys.s \
-	pi_uart.s \
-	pi_fast_mode.s \
-	creat.c \
-	close.c \
-	open.c \
-	read.c \
-	write.c \
-	isatty.c \
-	brk.c \
-	getpid.c \
-	kill.c \
-	lseek.c \
-	time.c \
-	signal.c \
-	tcgetattr.c \
-	tcsetattr.c \
-	select.c
-
-$(eval $(call build-platform))
-
-define build-rpi-boot-impl
-	$(call reset)
-	$(call ackfile, $D/boot.s)
-	$(call installto, $(PLATIND)/$(PLATFORM)/boot.o)
-endef
-
-$(eval $(build-rpi-boot-impl))
-
diff --git a/util/LLgen/build.mk b/util/LLgen/build.mk
deleted file mode 100644
index 28da2d715..000000000
--- a/util/LLgen/build.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-D := util/LLgen
-
-# Rule to build LLgen.
-
-define build-llgen-impl
-	$(call reset)
-	$(eval cflags += -DNON_CORRECTING -DLIBDIR=\"$(abspath $D/lib)\")
-	$(call cfile, $D/src/main.c)
-	$(call cfile, $D/src/gencode.c)
-	$(call cfile, $D/src/compute.c)
-	$(call cfile, $D/src/check.c)
-	$(call cfile, $D/src/reach.c)
-	$(call cfile, $D/src/global.c)
-	$(call cfile, $D/src/name.c)
-	$(call cfile, $D/src/sets.c)
-	$(call cfile, $D/src/alloc.c)
-	$(call cfile, $D/src/machdep.c)
-	$(call cfile, $D/src/cclass.c)
-	$(call cfile, $D/src/savegram.c)
-
-	# These use pre-LLgen'd version of the files. If LLgen.g gets updated,
-	# they need rebuilding. Use the bootstrap script to do this.
-
-	$(call cfile, $D/src/LLgen.c)
-	$(call cfile, $D/src/Lpars.c)
-	$(call cfile, $D/src/tokens.c)
-
-	$(call cprogram, $(BINDIR)/LLgen)
-	LLGEN := $o
-endef
-
-$(eval $(build-llgen-impl))
-
-# Rule to invoke to *use* LLgen.
-#
-#  $1: directory to put output files
-#  $2: input files
-#
-# Output files are compiled via cfile and queued.
-
-define llgen-impl
-$(eval o := $1/Lpars.c $(patsubst %.g, $(strip $1)/%.c, $(notdir $2)))
-$(eval CLEANABLES += $o $1/Lpars.h)
-
-$o: $1/Lpars.h
-$1/Lpars.h: $2 $(LLGEN)
-	@echo LLGEN $1/Lpars.c
-	@mkdir -p $1
-	$(hide) $(RM) $o $1/Lpars.h
-	$(hide) cd $1 && $(LLGEN) $(abspath $2)
-
-$(foreach f,$o,$(call cfile,$f))
-
-endef
-
-llgen = $(eval $(call llgen-impl,$1,$2))
diff --git a/util/ack/build.mk b/util/ack/build.mk
deleted file mode 100644
index 36e505c12..000000000
--- a/util/ack/build.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-D := util/ack
-
-define util-ack-makeheaders-rule
-$(eval g := $(OBJDIR)/$D/dmach.c $(OBJDIR)/$D/intable.c)
-$(wordlist 2, $(words $g), $g): $(firstword $g)
-$(firstword $g): $(util-ack-mktables)
-	@echo MKTABLES
-	@mkdir -p $(OBJDIR)/$D
-	$(hide) cd $(OBJDIR)/$D && $(util-ack-mktables) $(INSDIR)/share
-
-$(eval CLEANABLES += $g)
-endef
-
-define build-ack-impl
-	$(call reset)
-	$(call cfile, $D/mktables.c)
-	$(call cprogram, $(OBJDIR)/$D/mktables)
-	$(eval util-ack-mktables := $o)
-
-	$(call reset)
-	$(eval cflags += -I$D)
-	$(call cfile, $D/list.c)
-	$(call cfile, $D/data.c)
-	$(call cfile, $D/main.c)
-	$(call cfile, $D/scan.c)
-	$(call cfile, $D/svars.c)
-	$(call cfile, $D/trans.c)
-	$(call cfile, $D/util.c)
-
-	$(call cfile, $D/rmach.c)
-	$(call dependson, $(INCDIR)/em_path.h)
-
-	$(call cfile, $D/run.c)
-	$(call cfile, $D/grows.c)
-
-	$(call cfile, $D/files.c)
-	$(call dependson, $(INCDIR)/em_path.h)
-
-	$(eval $(util-ack-makeheaders-rule))
-	$(call cfile, $(OBJDIR)/$D/dmach.c)
-	$(call cfile, $(OBJDIR)/$D/intable.c)
-
-	$(call cprogram, $(BINDIR)/ack)
-	$(call installto, $(INSDIR)/bin/ack)
-	$(eval ACK := $o)
-
-	$(call reset)
-	$(eval q := lib/descr/fe)
-	$(call installto, $(PLATIND)/descr/fe)
-	$(eval $(ACK): $o)
-
-	$(call reset)
-	$(eval q := $D/ack.1.X)
-	$(call installto, $(INSDIR)/share/man/man1/ack.1)
-endef
-
-$(eval $(build-ack-impl))
diff --git a/util/ack/proto.make b/util/ack/proto.make
deleted file mode 100644
index 1c4356059..000000000
--- a/util/ack/proto.make
+++ /dev/null
@@ -1,187 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ack
-
-HFILES=\
-	$(SRC_DIR)/ack.h \
-	$(SRC_DIR)/list.h \
-	$(SRC_DIR)/trans.h \
-	$(SRC_DIR)/data.h \
-	$(SRC_DIR)/dmach.h \
-	$(SRC_DIR)/grows.h
-
-DSRC=\
-	$(SRC_DIR)/list.c \
-	$(SRC_DIR)/data.c \
-	$(SRC_DIR)/main.c \
-	$(SRC_DIR)/scan.c \
-	$(SRC_DIR)/svars.c \
-	$(SRC_DIR)/trans.c \
-	$(SRC_DIR)/util.c \
-	$(SRC_DIR)/rmach.c \
-	$(SRC_DIR)/run.c \
-	$(SRC_DIR)/grows.c \
-	$(SRC_DIR)/files.c
-
-ISRC=\
-	dmach.c \
-	intable.c
-
-CFILES = $(DSRC) $(ISRC)
-
-OBJ=\
-	list.$(SUF) \
-	data.$(SUF) \
-	main.$(SUF) \
-	scan.$(SUF) \
-	svars.$(SUF) \
-	trans.$(SUF) \
-	util.$(SUF) \
-	rmach.$(SUF) \
-	run.$(SUF) \
-	dmach.$(SUF) \
-	intable.$(SUF) \
-	grows.$(SUF) \
-	files.$(SUF)
-
-ACKDIR=$(TARGET_HOME)/lib
-FE=fe
-INTABLES=sun3
-LNTABLES=acc apc abc ocm m2 f2c vax4 i86 i386 m68k2 m68k4 pmds pmds4 mantra \
-	m68020 z8000 pdp em22 em24 em44 6500 6800 6805 6809 i80 ns s2650 z80 \
-	sun2 xenix3 minix minixST sparc sparc_solaris arm
-INCLUDES=-I$(TARGET_HOME)/h -I$(TARGET_HOME)/config -I$(SRC_DIR)
-CFLAGS= $(INCLUDES) $(COPTIONS)
-UCFLAGS= $(INCLUDES) $(UCOPTIONS)
-LINTFLAGS= $(INCLUDES) $(LINTOPTIONS)
-LDFLAGS= $(LDOPTIONS)
-ULDFLAGS= $(ULDOPTIONS)
-BINDIR=$(TARGET_HOME)/bin
-HDIR=$(TARGET_HOME)/h
-MODDIR=$(TARGET_HOME)/modules/lib
-
-all:		ack ack.1
-
-install:	ack ack.1
-		cp ack $(BINDIR)/ack
-		-cd $(BINDIR) ; \
-		for i in $(INTABLES) $(LNTABLES) ; do rm -f $$i ; ln ack $$i ; done
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage ack.1 $(TARGET_HOME) ; \
-		fi
-
-cmp:		ack
-		-cmp ack $(BINDIR)/ack
-
-ack.1:		$(SRC_DIR)/ack.1.X
-		-sh -c 'tbl < $(SRC_DIR)/ack.1.X > ack.1'
-		-sh -c 'if test -s ack.1 ; then : ; else cp $(SRC_DIR)/ack.1.X ack.1 ; fi'
-
-clean:
-		-rm -f *.old *.$(SUF) mktables *.$(USUF) ack ack.1 $(ISRC)
-
-ack:    $(OBJ)
-	$(CC) $(LDFLAGS) -o ack $(OBJ) $(MODDIR)/libstring.$(LIBSUF)
-
-depend:	$(ISRC)
-	rm_deps Makefile > Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(INCLUDES) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-dmach.c intable.c: mktables $(SRC_DIR)/dmach.h
-	: mktables $(ACKDIR) # $(FE) $(INTABLES)
-	mktables $(ACKDIR)
-
-mktables:	mktables.$(USUF)
-	$(UCC) -o mktables $(ULDFLAGS) mktables.$(USUF)
-
-mktables.$(USUF):	$(SRC_DIR)/mktables.c
-	$(UCC) -c $(UCFLAGS) $(SRC_DIR)/mktables.c
-
-pr:
-	@pr $(SRC_DIR)/proto.make $(HFILES) $(DSRC)
-
-opr:
-	make pr | opr
-
-lint:   $(ISRC)
-	$(LINT) $(LINTFLAGS) $(CFILES) $(UTIL_HOME)/modules/lib/$(LINTPREF)string.$(LINTSUF)
-
-# do not remove the next line
-#DEPENDENCIES
-list.$(SUF):	$(SRC_DIR)/list.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/list.c
-list.$(SUF):	$(SRC_DIR)/list.h
-list.$(SUF):	$(SRC_DIR)/ack.h
-data.$(SUF):	$(SRC_DIR)/data.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/data.c
-data.$(SUF):	$(SRC_DIR)/data.h
-data.$(SUF):	$(SRC_DIR)/trans.h
-data.$(SUF):	$(SRC_DIR)/list.h
-data.$(SUF):	$(SRC_DIR)/ack.h
-main.$(SUF):	$(SRC_DIR)/main.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/main.c
-main.$(SUF):	$(SRC_DIR)/data.h
-main.$(SUF):	$(TARGET_HOME)/config/local.h
-main.$(SUF):	$(SRC_DIR)/trans.h
-main.$(SUF):	$(SRC_DIR)/list.h
-main.$(SUF):	$(SRC_DIR)/ack.h
-scan.$(SUF):	$(SRC_DIR)/scan.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/scan.c
-scan.$(SUF):	$(SRC_DIR)/data.h
-scan.$(SUF):	$(SRC_DIR)/trans.h
-scan.$(SUF):	$(SRC_DIR)/list.h
-scan.$(SUF):	$(SRC_DIR)/ack.h
-svars.$(SUF):	$(SRC_DIR)/svars.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/svars.c
-svars.$(SUF):	$(SRC_DIR)/ack.h
-trans.$(SUF):	$(SRC_DIR)/trans.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/trans.c
-trans.$(SUF):	$(SRC_DIR)/data.h
-trans.$(SUF):	$(SRC_DIR)/grows.h
-trans.$(SUF):	$(SRC_DIR)/trans.h
-trans.$(SUF):	$(SRC_DIR)/list.h
-trans.$(SUF):	$(SRC_DIR)/ack.h
-util.$(SUF):	$(SRC_DIR)/util.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/util.c
-util.$(SUF):	$(SRC_DIR)/ack.h
-rmach.$(SUF):	$(SRC_DIR)/rmach.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/rmach.c
-rmach.$(SUF):	$(SRC_DIR)/data.h
-rmach.$(SUF):	$(SRC_DIR)/dmach.h
-rmach.$(SUF):	$(SRC_DIR)/grows.h
-rmach.$(SUF):	$(SRC_DIR)/trans.h
-rmach.$(SUF):	$(SRC_DIR)/list.h
-rmach.$(SUF):	$(TARGET_HOME)/config/em_path.h
-rmach.$(SUF):	$(SRC_DIR)/ack.h
-run.$(SUF):	$(SRC_DIR)/run.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/run.c
-run.$(SUF):	$(SRC_DIR)/data.h
-run.$(SUF):	$(SRC_DIR)/grows.h
-run.$(SUF):	$(SRC_DIR)/trans.h
-run.$(SUF):	$(SRC_DIR)/list.h
-run.$(SUF):	$(SRC_DIR)/ack.h
-grows.$(SUF):	$(SRC_DIR)/grows.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/grows.c
-grows.$(SUF):	$(SRC_DIR)/grows.h
-grows.$(SUF):	$(SRC_DIR)/ack.h
-files.$(SUF):	$(SRC_DIR)/files.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/files.c
-files.$(SUF):	$(TARGET_HOME)/config/em_path.h
-files.$(SUF):	$(SRC_DIR)/data.h
-files.$(SUF):	$(SRC_DIR)/grows.h
-files.$(SUF):	$(SRC_DIR)/trans.h
-files.$(SUF):	$(SRC_DIR)/list.h
-files.$(SUF):	$(SRC_DIR)/ack.h
-dmach.$(SUF):	dmach.c
-	$(CC) -c $(CFLAGS) dmach.c
-dmach.$(SUF):	$(SRC_DIR)/dmach.h
-intable.$(SUF):	intable.c
-	$(CC) -c $(CFLAGS) intable.c
diff --git a/util/amisc/build.mk b/util/amisc/build.mk
deleted file mode 100644
index 286b8f305..000000000
--- a/util/amisc/build.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-
-define build-simple-tool-impl
-	$(call reset)
-	$(call cfile, util/amisc/$1.c)
-	$(call rawfile, $(LIBOBJECT))
-	$(call cprogram, $(BINDIR)/$1)
-	$(eval INSTALLABLES += $o)
-	$(call installto, $(INSDIR)/bin/$1)
-
-	$(call reset)
-	$(eval q := util/amisc/$1.1)
-	$(call installto, $(INSDIR)/share/man/man1/$1.1)
-endef
-
-build-simple-tool = $(eval $(build-simple-tool-impl))
-
-$(call build-simple-tool,anm)
-$(call build-simple-tool,ashow)
-$(call build-simple-tool,asize)
-$(call build-simple-tool,aslod)
-$(call build-simple-tool,astrip)
-$(call build-simple-tool,aelflod)
-
diff --git a/util/amisc/proto.make b/util/amisc/proto.make
deleted file mode 100644
index 64bbcc27e..000000000
--- a/util/amisc/proto.make
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/amisc
-BINDIR  = $(TARGET_HOME)/bin
-LDFLAGS = $(LDOPTIONS)
-INCLUDES = -I$(TARGET_HOME)/h
-CFLAGS	= $(INCLUDES) $(COPTIONS)
-LINTFLAGS = $(INCLUDES) $(LINTOPTIONS)
-
-ALL	= anm asize astrip ashow
-LIBS	= $(TARGET_HOME)/modules/lib/libobject.$(LIBSUF)
-LINTLIBS = $(UTIL_HOME)/modules/lib/$(LINTPREF)object.$(LINTSUF)
-
-all:	$(ALL)
-
-anm:	$(SRC_DIR)/anm.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o anm $(SRC_DIR)/anm.c $(LIBS)
-asize:	$(SRC_DIR)/asize.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o asize $(SRC_DIR)/asize.c $(LIBS)
-astrip: $(SRC_DIR)/astrip.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o astrip $(SRC_DIR)/astrip.c $(LIBS)
-ashow:	$(SRC_DIR)/ashow.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o ashow $(SRC_DIR)/ashow.c $(LIBS)
-
-install:	all
-	for i in $(ALL); do rm -f $(BINDIR)/$$i; cp $$i $(BINDIR)/$$i; done
-	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then	for i in anm.1 asize.1 astrip.1; do mk_manpage $(SRC_DIR)/$$i $(TARGET_HOME) ; done ; \
-	fi
-
-cmp:	all
-	-for i in $(ALL); do cmp $$i $(BINDIR)/$$i; done
-
-clean:	; rm -f $(ALL) *.$(SUF)
-
-lint:
-	$(LINT) $(LINTFLAGS) $(SRC_DIR)/anm.c $(LINTLIBS)
-	$(LINT) $(LINTFLAGS) $(SRC_DIR)/asize.c $(LINTLIBS)
-	$(LINT) $(LINTFLAGS) $(SRC_DIR)/astrip.c $(LINTLIBS)
-	$(LINT) $(LINTFLAGS) $(SRC_DIR)/ashow.c $(LINTLIBS)
-
-pr:
-	@pr $(SRC_DIR)/proto.make $(SRC_DIR)/anm.c $(SRC_DIR)/astrip.c $(SRC_DIR)/asize.c $(SRC_DIR)/ashow.c
-
-opr:
-	make pr | opr
diff --git a/util/arch/build.mk b/util/arch/build.mk
deleted file mode 100644
index 11851f5c9..000000000
--- a/util/arch/build.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-D := util/arch
-
-define build-aal-impl
-	$(call reset)
-	$(eval cflags += -DAAL)
-
-	$(call cfile, $D/archiver.c)
-
-	$(call rawfile, $(LIBOBJECT))
-	$(call rawfile, $(LIBPRINT))
-	$(call rawfile, $(LIBSTRING))
-	$(call rawfile, $(LIBSYSTEM))
-
-	$(call cprogram, $(BINDIR)/aal)
-	$(call installto, $(INSDIR)/bin/aal)
-	$(eval AAL := $o)
-	$(eval ACK_CORE_TOOLS += $o)
-
-	$(call reset)
-	$(eval q := $D/aal.1)
-	$(call installto, $(INSDIR)/share/man/man1/aal.1)
-endef
-
-$(eval $(build-aal-impl))
diff --git a/util/arch/proto.make b/util/arch/proto.make
deleted file mode 100644
index 3290869ce..000000000
--- a/util/arch/proto.make
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/arch
-EMH = $(TARGET_HOME)/h
-EMBIN = $(TARGET_HOME)/bin
-LIB = $(TARGET_HOME)/modules/lib
-ULIB = $(UTIL_HOME)/modules/lib
-
-LIBS =	$(LIB)/libobject.$(LIBSUF) $(LIB)/libprint.$(LIBSUF) \
-	$(LIB)/libstring.$(LIBSUF) $(LIB)/libsystem.$(LIBSUF)
-LINTLIBS = \
-	$(ULIB)/$(LINTPREF)object.$(LINTSUF) \
-	$(ULIB)/$(LINTPREF)print.$(LINTSUF) \
-	$(ULIB)/$(LINTPREF)string.$(LINTSUF) \
-	$(ULIB)/$(LINTPREF)system.$(LINTSUF)
-
-INCLUDES = -I$(EMH)
-CFLAGS= $(INCLUDES) -DDISTRIBUTION $(COPTIONS)
-LDFLAGS = $(LDOPTIONS)
-LINTFLAGS= $(INCLUDES) -DDISTRIBUTION $(LINTOPTIONS)
-
-all:            arch aal
-
-arch:		arch.$(SUF)
-		$(CC) $(LDFLAGS) -o arch arch.$(SUF) $(LIBS)
-
-aal:		aal.$(SUF)
-		$(CC) $(LDFLAGS) -o aal aal.$(SUF) $(LIBS)
-
-arch.$(SUF):	$(EMH)/arch.h $(SRC_DIR)/archiver.c
-		$(CC) $(CFLAGS) -c $(SRC_DIR)/archiver.c
-		mv archiver.$(SUF) arch.$(SUF)
-
-aal.$(SUF):	$(EMH)/arch.h $(SRC_DIR)/archiver.c $(EMH)/ranlib.h $(EMH)/out.h
-		$(CC) -DAAL $(CFLAGS) -c $(SRC_DIR)/archiver.c
-		mv archiver.$(SUF) aal.$(SUF)
-
-clean:
-		rm -f aal arch *.$(SUF) *.old
-
-lint:
-		$(LINT) $(LINTFLAGS) -DAAL $(SRC_DIR)/archiver.c $(LINTLIBS)
-
-install :       all
-		cp aal $(EMBIN)/aal
-		cp arch $(EMBIN)/arch
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/aal.1 $(TARGET_HOME) ; \
-			mk_manpage $(SRC_DIR)/arch.1 $(TARGET_HOME) ; \
-			mk_manpage $(SRC_DIR)/arch.5 $(TARGET_HOME) ; \
-		fi
-
-cmp :           all
-		-cmp aal $(EMBIN)/aal
-		-cmp arch $(EMBIN)/arch
-
-opr:
-		make pr ^ opr
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/archiver.c
diff --git a/util/cgg/build.mk b/util/cgg/build.mk
deleted file mode 100644
index 4fc8532b2..000000000
--- a/util/cgg/build.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-D := util/cgg
-
-define build-cgg-impl
-
-$(call reset)
-$(eval cflags += -I$D)
-
-$(call yacc, $(OBJDIR)/$D, $D/bootgram.y)
-
-$(call flex, $(OBJDIR)/$D, $D/bootlex.l)
-$(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-$(call cfile, $D/main.c)
-
-$(eval $q: $(INCDIR)/em_spec.h)
-
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBASSERT))
-$(call rawfile, $(LIBSYSTEM))
-$(call cprogram, $(BINDIR)/cgg)
-$(eval CGG := $o)
-
-endef
-
-$(eval $(build-cgg-impl))
diff --git a/util/cmisc/build.mk b/util/cmisc/build.mk
deleted file mode 100644
index ae4b7fb2c..000000000
--- a/util/cmisc/build.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Building tabgen.
-
-define build-tabgen-impl
-	$(call reset)
-	$(call cfile, util/cmisc/tabgen.c)
-	$(call cprogram, $(BINDIR)/tabgen)
-	$(eval TABGEN := $o)
-endef
-
-$(eval $(build-tabgen-impl))
-
-# Using tabgen.
-#
-#  $1 = input file
-#
-# Output file is compiled with cfile and queued.
-
-define tabgen-impl
-$(eval g := $(OBJDIR)/$(objdir)/$(strip $1).c)
-
-$g: $1 $(TABGEN)
-	@echo TABGEN $g
-	@mkdir -p $(dir $g)
-	$(hide) $(TABGEN) -f$(strip $1) > $g || $(RM) $g
-
-$(eval CLEANABLES += $g)
-$(call $2,$g)
-endef
-
-tabgen = $(eval $(call tabgen-impl,$1,cfile))
-acktabgen = $(eval $(call tabgen-impl,$1,ackfile))
-
diff --git a/util/cmisc/proto.make b/util/cmisc/proto.make
deleted file mode 100644
index d8ede4483..000000000
--- a/util/cmisc/proto.make
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/cmisc
-TARGET_BIN = $(TARGET_HOME)/bin
-CFLAGS = $(COPTIONS)
-LDFLAGS = $(LDOPTIONS)
-LINTFLAGS = $(LINTOPTIONS)
-
-all:		cid cclash prid tabgen
-
-install:	all
-		cp cid cclash prid tabgen $(TARGET_BIN)
-		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	mk_manpage $(SRC_DIR)/cid.1 $(TARGET_HOME) ; \
-			mk_manpage $(SRC_DIR)/cclash.1 $(TARGET_HOME) ; \
-			mk_manpage $(SRC_DIR)/prid.1 $(TARGET_HOME) ; \
-			mk_manpage $(SRC_DIR)/tabgen.1 $(TARGET_HOME) ; \
-		fi
-
-cmp:		all
-		-cmp cid $(TARGET_BIN)/cid
-		-cmp cclash $(TARGET_BIN)/cclash
-		-cmp prid $(TARGET_BIN)/prid
-		-cmp tabgen $(TARGET_BIN)/tabgen
-
-clean:
-		rm -f *.$(SUF) cid cclash prid tabgen
-
-pr:
-		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/cclash.c $(SRC_DIR)/cid.c \
-		$(SRC_DIR)/prid.c $(SRC_DIR)/GCIPM.c $(SRC_DIR)/tabgen.c
-
-opr:
-		make pr | opr
-
-tabgen:		tabgen.$(SUF)
-		$(CC) $(LDFLAGS) -o tabgen tabgen.$(SUF)
-
-cid:		cid.$(SUF) GCIPM.$(SUF)
-		$(CC) $(LDFLAGS) -o cid cid.$(SUF) GCIPM.$(SUF)
-
-cclash:		cclash.$(SUF) GCIPM.$(SUF)
-		$(CC) $(LDFLAGS) -o cclash cclash.$(SUF) GCIPM.$(SUF)
-
-prid:		prid.$(SUF) GCIPM.$(SUF)
-		$(CC) $(LDFLAGS) -o prid prid.$(SUF) GCIPM.$(SUF)
-
-lint:
-		$(LINT) $(LINTFLAGS) $(SRC_DIR)/cid.c $(SRC_DIR)/GCIPM.c
-		$(LINT) $(LINTFLAGS) $(SRC_DIR)/prid.c $(SRC_DIR)/GCIPM.c
-		$(LINT) $(LINTFLAGS) $(SRC_DIR)/cclash.c $(SRC_DIR)/GCIPM.c
-		$(LINT) $(LINTFLAGS) $(SRC_DIR)/tabgen.c
-
-tabgen.$(SUF):	$(SRC_DIR)/tabgen.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/tabgen.c
-
-cid.$(SUF):	$(SRC_DIR)/cid.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/cid.c
-
-prid.$(SUF):	$(SRC_DIR)/prid.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/prid.c
-
-cclash.$(SUF):	$(SRC_DIR)/cclash.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/cclash.c
-
-GCIPM.$(SUF):	$(SRC_DIR)/GCIPM.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/GCIPM.c
diff --git a/util/ego/bo/proto.make b/util/ego/bo/proto.make
deleted file mode 100644
index 214015a99..000000000
--- a/util/ego/bo/proto.make
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/bo
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/bo.c
-
-OFILES=\
-bo.$(SUF)
-
-HFILES=
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	bo
-
-bo:	$(OFILES)
-	$(CC) -o bo $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp bo $(EMLIB)/ego/bo
-
-cmp:	all
-	-cmp bo $(EMLIB)/ego/bo
-
-clean:
-	rm -f *.$(SUF) bo Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-bo.$(SUF):	$(SRC_DIR)/bo.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/bo.c
-bo.$(SUF):	$(SRC_DIR)/../share/go.h
-bo.$(SUF):	$(SRC_DIR)/../share/def.h
-bo.$(SUF):	$(SRC_DIR)/../share/aux.h
-bo.$(SUF):	$(SRC_DIR)/../share/alloc.h
-bo.$(SUF):	$(SRC_DIR)/../share/map.h
-bo.$(SUF):	$(SRC_DIR)/../share/lset.h
-bo.$(SUF):	$(SRC_DIR)/../share/put.h
-bo.$(SUF):	$(SRC_DIR)/../share/get.h
-bo.$(SUF):	$(SRC_DIR)/../share/files.h
-bo.$(SUF):	$(SRC_DIR)/../share/global.h
-bo.$(SUF):	$(SRC_DIR)/../share/debug.h
-bo.$(SUF):	$(SRC_DIR)/../share/types.h
-bo.$(SUF):	$(EMH)/em_flag.h
-bo.$(SUF):	$(EMH)/em_spec.h
-bo.$(SUF):	$(EMH)/em_pseu.h
-bo.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/build.mk b/util/ego/build.mk
deleted file mode 100644
index 2fba61ff3..000000000
--- a/util/ego/build.mk
+++ /dev/null
@@ -1,205 +0,0 @@
-D := util/ego
-
-define build-ego-backend-impl
-
-$(call reset)
-$(eval cflags += -DVERBOSE -DNOTCOMPACT)
-$(eval cflags += -I$D/share -I$(OBJDIR)/$D)
-$(foreach f, $2, $(call cfile, $f))
-$(call rawfile, $(LIBDIR)/libegocore.a)
-$(call rawfile, $(LIBEM_DATA))
-$(call cprogram, $(BINDIR)/ego/$(strip $1))
-$(call installto, $(PLATDEP)/ego/$(strip $1))
-$(eval EGO_MODULES += $q)
-
-endef
-
-define build-ego-impl
-
-# Generated files that egocore needs.
-
-$(call reset)
-$(call cfile, $D/share/makecldef.c)
-$(call cprogram, $(OBJDIR)/$D/makecldef)
-
-$(eval g := $(OBJDIR)/$D/classdefs.h)
-$(eval CLEANABLES += $g)
-$g: $(OBJDIR)/$D/makecldef $(INCDIR)/em_mnem.h $D/share/cldefs.src
-	@echo MAKECLDEF $g
-	@mkdir -p $(dir $g)
-	$(hide) $$^ > $g
-
-$(eval g := $(OBJDIR)/$D/pop_push.h)
-$(eval CLEANABLES += $g)
-$g: $D/share/pop_push.awk h/em_table
-	@echo POP_PUSH $g
-	@mkdir -p $(dir $g)
-	$(hide) awk -f $D/share/pop_push.awk < h/em_table > $g
-
-# Build the egocore library.
-
-$(call reset)
-$(eval cflags += -I$D/share -I$(OBJDIR)/$D)
-$(eval cflags += -DVERBOSE -DNOTCOMPACT)
-
-$(call cfile, $D/share/debug.c)
-$(call cfile, $D/share/global.c)
-$(call cfile, $D/share/files.c)
-$(call cfile, $D/share/go.c)
-$(call cfile, $D/share/map.c)
-$(call cfile, $D/share/aux.c)
-$(call cfile, $D/share/get.c)
-$(call cfile, $D/share/put.c)
-$(call cfile, $D/share/alloc.c)
-$(call cfile, $D/share/lset.c)
-$(call cfile, $D/share/cset.c)
-$(call cfile, $D/share/parser.c)
-$(call cfile, $D/share/stack_chg.c)
-$(call cfile, $D/share/locals.c)
-$(call cfile, $D/share/init_glob.c)
-$(eval $q: $(OBJDIR)/$D/classdefs.h $(OBJDIR)/$D/pop_push.h)
-
-$(call clibrary, $(LIBDIR)/libegocore.a)
-$(eval CLEANABLES += $q)
-
-# Now build each of the back ends.
-
-$(call build-ego-backend-impl, bo, \
-	$D/bo/bo.c)
-
-$(call build-ego-backend-impl, ca, \
-	$D/ca/ca.c \
-	$D/ca/ca_put.c)
-
-$(call build-ego-backend-impl, cf, \
-	$D/cf/cf.c \
-	$D/cf/cf_idom.c \
-	$D/cf/cf_loop.c \
-	$D/cf/cf_succ.c)
-
-$(call build-ego-backend-impl, cj, \
-	$D/cj/cj.c)
-
-$(call build-ego-backend-impl, cs, \
-	$D/cs/cs.c \
-	$D/cs/cs_alloc.c \
-	$D/cs/cs_aux.c \
-	$D/cs/cs_avail.c \
-	$D/cs/cs_debug.c \
-	$D/cs/cs_elim.c \
-	$D/cs/cs_entity.c \
-	$D/cs/cs_getent.c \
-	$D/cs/cs_kill.c \
-	$D/cs/cs_partit.c \
-	$D/cs/cs_profit.c \
-	$D/cs/cs_stack.c \
-	$D/cs/cs_vnm.c)
-
-$(call build-ego-backend-impl, ic, \
-	$D/ic/ic.c \
-	$D/ic/ic_aux.c \
-	$D/ic/ic_io.c \
-	$D/ic/ic_lib.c \
-	$D/ic/ic_lookup.c)
-
-$(call build-ego-backend-impl, il, \
-	$D/il/il.c \
-	$D/il/il1_anal.c \
-	$D/il/il1_aux.c \
-	$D/il/il1_cal.c \
-	$D/il/il1_formal.c \
-	$D/il/il2_aux.c \
-	$D/il/il3_aux.c \
-	$D/il/il3_change.c \
-	$D/il/il3_subst.c \
-	$D/il/il_aux.c)
-
-$(call build-ego-backend-impl, lv, \
-	$D/lv/lv.c)
-
-$(call build-ego-backend-impl, ra, \
-	$D/ra/ra.c \
-	$D/ra/ra_allocl.c \
-	$D/ra/ra_aux.c \
-	$D/ra/ra_interv.c \
-	$D/ra/ra_lifet.c \
-	$D/ra/ra_pack.c \
-	$D/ra/ra_profits.c \
-	$D/ra/ra_xform.c \
-	$D/ra/ra_items.c)
-
-$(eval g := $(OBJDIR)/$D/itemtab.h)
-$(eval CLEANABLES += $g)
-$D/ra/ra_items.c: $g
-$g: $(OBJDIR)/$D/makeitems $(INCDIR)/em_mnem.h $D/ra/itemtab.src
-	@echo MAKEITEMS $g
-	@mkdir -p $(dir $g)
-	$(hide) $$^ > $g
-
-$(call reset)
-$(call cfile, $D/ra/makeitems.c)
-$(call cprogram, $(OBJDIR)/$D/makeitems)
-
-$(call build-ego-backend-impl, sp, \
-	$D/sp/sp.c)
-
-$(call build-ego-backend-impl, sr, \
-	$D/sr/sr.c \
-	$D/sr/sr_aux.c \
-	$D/sr/sr_cand.c \
-	$D/sr/sr_expr.c \
-	$D/sr/sr_iv.c \
-	$D/sr/sr_reduce.c \
-	$D/sr/sr_xform.c)
-
-$(call build-ego-backend-impl, ud, \
-	$D/ud/ud.c \
-	$D/ud/ud_aux.c \
-	$D/ud/ud_const.c \
-	$D/ud/ud_copy.c \
-	$D/ud/ud_defs.c)
-
-# ...and now the front end, which depends on all the backends.
-
-$(call reset)
-$(call cfile, $D/em_ego/em_ego.c)
-$(eval $q: $(INCDIR)/print.h $(INCDIR)/system.h)
-$(eval $q: $(INCDIR)/em_path.h)
-
-$(call rawfile, $(LIBPRINT))
-$(call rawfile, $(LIBSTRING))
-$(call rawfile, $(LIBSYSTEM))
-
-$(call cprogram, $(BINDIR)/em_ego)
-$(call installto, $(PLATDEP)/em_ego)
-$(eval EM_EGO := $q)
-$(eval $q: $(EGO_MODULES))
-$(eval ACK_CORE_TOOLS += $q)
-
-endef
-
-$(eval $(build-ego-impl))
-
-# Install the ego descr file for the current architecture, if one exists.
-# This is a bit annoying because it's called by each platform, so we need
-# to protect against the architecture being seen more than once. And some
-# architectures don't get descr files.
-
-define build-ego-descr-impl
-
-$(eval EGO_DESCR_$(ARCH) := 1)
-
-$(eval g := $(PLATIND)/ego/$(ARCH).descr)
-$(eval CLEANABLES += $g)
-$(eval $(EM_EGO): $g)
-$g: util/ego/descr/descr.sed util/ego/descr/$(ARCH).descr $(CPPANSI) \
-		$(INCDIR)/em_mnem.h
-	@echo EGODESCR $g
-	@mkdir -p $(dir $g)
-	$(hide) $(CPPANSI) -P -I$(INCDIR) util/ego/descr/$(ARCH).descr | sed -f util/ego/descr/descr.sed > $g
-
-endef
-
-build-ego-descr = $(if $(EGO_DESCR_$(ARCH)),, \
-	$(if $(wildcard util/ego/descr/$(ARCH).descr), \
-		$(eval $(call build-ego-descr-impl, $1))))
\ No newline at end of file
diff --git a/util/ego/ca/proto.make b/util/ego/ca/proto.make
deleted file mode 100644
index 49986c9e8..000000000
--- a/util/ego/ca/proto.make
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/ca
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/ca.c \
-	$(SRC_DIR)/ca_put.c
-
-OFILES=\
-ca.$(SUF) ca_put.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/ca.h \
-	$(SRC_DIR)/ca_put.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	ca
-
-ca:	$(OFILES)
-	$(CC) -o ca $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp ca $(EMLIB)/ego/ca
-
-cmp:	all
-	-cmp ca $(EMLIB)/ego/ca
-
-clean:
-	rm -f *.$(SUF) ca Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-ca.$(SUF):	$(SRC_DIR)/ca.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ca.c
-ca.$(SUF):	$(SRC_DIR)/ca_put.h
-ca.$(SUF):	$(SRC_DIR)/../share/get.h
-ca.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ca.$(SUF):	$(SRC_DIR)/../share/map.h
-ca.$(SUF):	$(SRC_DIR)/../share/files.h
-ca.$(SUF):	$(SRC_DIR)/../share/lset.h
-ca.$(SUF):	$(SRC_DIR)/../share/global.h
-ca.$(SUF):	$(SRC_DIR)/../share/debug.h
-ca.$(SUF):	$(SRC_DIR)/ca.h
-ca.$(SUF):	$(SRC_DIR)/../share/types.h
-ca.$(SUF):	$(EMH)/em_mes.h
-ca.$(SUF):	$(EMH)/em_pseu.h
-ca_put.$(SUF):	$(SRC_DIR)/ca_put.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ca_put.c
-ca_put.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ca_put.$(SUF):	$(SRC_DIR)/../share/map.h
-ca_put.$(SUF):	$(SRC_DIR)/../share/def.h
-ca_put.$(SUF):	$(SRC_DIR)/../share/debug.h
-ca_put.$(SUF):	$(SRC_DIR)/ca.h
-ca_put.$(SUF):	$(SRC_DIR)/../share/types.h
-ca_put.$(SUF):	$(EMH)/em_mes.h
-ca_put.$(SUF):	$(EMH)/em_flag.h
-ca_put.$(SUF):	$(EMH)/em_mnem.h
-ca_put.$(SUF):	$(EMH)/em_pseu.h
-ca_put.$(SUF):	$(EMH)/em_spec.h
diff --git a/util/ego/cf/proto.make b/util/ego/cf/proto.make
deleted file mode 100644
index e8d49eab1..000000000
--- a/util/ego/cf/proto.make
+++ /dev/null
@@ -1,117 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/cf
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/cf.c \
-	$(SRC_DIR)/cf_succ.c \
-	$(SRC_DIR)/cf_idom.c \
-	$(SRC_DIR)/cf_loop.c
-
-OFILES=\
-cf.$(SUF) cf_succ.$(SUF) cf_idom.$(SUF) cf_loop.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/cf.h \
-	$(SRC_DIR)/cf_succ.h \
-	$(SRC_DIR)/cf_idom.h \
-	$(SRC_DIR)/cf_loop.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	cf
-
-cf:	$(OFILES)
-	$(CC) -o cf $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp cf $(EMLIB)/ego/cf
-
-cmp:	all
-	-cmp cf $(EMLIB)/ego/cf
-
-clean:
-	rm -f *.$(SUF) cf Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-cf.$(SUF):	$(SRC_DIR)/cf.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cf.c
-cf.$(SUF):	$(SRC_DIR)/cf_loop.h
-cf.$(SUF):	$(SRC_DIR)/cf_idom.h
-cf.$(SUF):	$(SRC_DIR)/cf_succ.h
-cf.$(SUF):	$(SRC_DIR)/cf.h
-cf.$(SUF):	$(SRC_DIR)/../share/def.h
-cf.$(SUF):	$(SRC_DIR)/../share/put.h
-cf.$(SUF):	$(SRC_DIR)/../share/get.h
-cf.$(SUF):	$(SRC_DIR)/../share/cset.h
-cf.$(SUF):	$(SRC_DIR)/../share/lset.h
-cf.$(SUF):	$(SRC_DIR)/../share/alloc.h
-cf.$(SUF):	$(SRC_DIR)/../share/global.h
-cf.$(SUF):	$(SRC_DIR)/../share/files.h
-cf.$(SUF):	$(SRC_DIR)/../share/map.h
-cf.$(SUF):	$(SRC_DIR)/../share/debug.h
-cf.$(SUF):	$(SRC_DIR)/../share/types.h
-cf.$(SUF):	$(EMH)/em_mes.h
-cf.$(SUF):	$(EMH)/em_flag.h
-cf.$(SUF):	$(EMH)/em_spec.h
-cf.$(SUF):	$(EMH)/em_pseu.h
-cf.$(SUF):	$(EMH)/em_mnem.h
-cf_succ.$(SUF):	$(SRC_DIR)/cf_succ.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cf_succ.c
-cf_succ.$(SUF):	$(SRC_DIR)/../share/map.h
-cf_succ.$(SUF):	$(SRC_DIR)/cf.h
-cf_succ.$(SUF):	$(SRC_DIR)/../share/cset.h
-cf_succ.$(SUF):	$(SRC_DIR)/../share/lset.h
-cf_succ.$(SUF):	$(SRC_DIR)/../share/global.h
-cf_succ.$(SUF):	$(SRC_DIR)/../share/debug.h
-cf_succ.$(SUF):	$(SRC_DIR)/../share/def.h
-cf_succ.$(SUF):	$(SRC_DIR)/../share/types.h
-cf_succ.$(SUF):	$(EMH)/em_mnem.h
-cf_succ.$(SUF):	$(EMH)/em_flag.h
-cf_succ.$(SUF):	$(EMH)/em_pseu.h
-cf_succ.$(SUF):	$(EMH)/em_spec.h
-cf_idom.$(SUF):	$(SRC_DIR)/cf_idom.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cf_idom.c
-cf_idom.$(SUF):	$(SRC_DIR)/cf.h
-cf_idom.$(SUF):	$(SRC_DIR)/../share/alloc.h
-cf_idom.$(SUF):	$(SRC_DIR)/../share/lset.h
-cf_idom.$(SUF):	$(SRC_DIR)/../share/debug.h
-cf_idom.$(SUF):	$(SRC_DIR)/../share/types.h
-cf_loop.$(SUF):	$(SRC_DIR)/cf_loop.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cf_loop.c
-cf_loop.$(SUF):	$(SRC_DIR)/cf.h
-cf_loop.$(SUF):	$(SRC_DIR)/../share/aux.h
-cf_loop.$(SUF):	$(SRC_DIR)/../share/alloc.h
-cf_loop.$(SUF):	$(SRC_DIR)/../share/lset.h
-cf_loop.$(SUF):	$(SRC_DIR)/../share/debug.h
-cf_loop.$(SUF):	$(SRC_DIR)/../share/types.h
diff --git a/util/ego/cj/proto.make b/util/ego/cj/proto.make
deleted file mode 100644
index cb8e71bcd..000000000
--- a/util/ego/cj/proto.make
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/cj
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/cj.c
-
-OFILES=\
-cj.$(SUF)
-
-HFILES=
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	cj
-
-cj:	$(OFILES)
-	$(CC) -o cj $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp cj $(EMLIB)/ego/cj
-
-cmp:	all
-	-cmp cj $(EMLIB)/ego/cj
-
-clean:
-	rm -f *.$(SUF) cj Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-cj.$(SUF):	$(SRC_DIR)/cj.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cj.c
-cj.$(SUF):	$(SRC_DIR)/../share/go.h
-cj.$(SUF):	$(SRC_DIR)/../share/stack_chg.h
-cj.$(SUF):	$(SRC_DIR)/../share/def.h
-cj.$(SUF):	$(SRC_DIR)/../share/aux.h
-cj.$(SUF):	$(SRC_DIR)/../share/alloc.h
-cj.$(SUF):	$(SRC_DIR)/../share/map.h
-cj.$(SUF):	$(SRC_DIR)/../share/lset.h
-cj.$(SUF):	$(SRC_DIR)/../share/put.h
-cj.$(SUF):	$(SRC_DIR)/../share/get.h
-cj.$(SUF):	$(SRC_DIR)/../share/files.h
-cj.$(SUF):	$(SRC_DIR)/../share/global.h
-cj.$(SUF):	$(SRC_DIR)/../share/debug.h
-cj.$(SUF):	$(SRC_DIR)/../share/types.h
-cj.$(SUF):	$(EMH)/em_spec.h
-cj.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/cs/proto.make b/util/ego/cs/proto.make
deleted file mode 100644
index 0cfb537bc..000000000
--- a/util/ego/cs/proto.make
+++ /dev/null
@@ -1,251 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/cs
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/cs.c \
-	$(SRC_DIR)/cs_alloc.c \
-	$(SRC_DIR)/cs_aux.c \
-	$(SRC_DIR)/cs_avail.c \
-	$(SRC_DIR)/cs_debug.c \
-	$(SRC_DIR)/cs_elim.c \
-	$(SRC_DIR)/cs_entity.c \
-	$(SRC_DIR)/cs_kill.c \
-	$(SRC_DIR)/cs_partit.c \
-	$(SRC_DIR)/cs_profit.c \
-	$(SRC_DIR)/cs_getent.c \
-	$(SRC_DIR)/cs_stack.c \
-	$(SRC_DIR)/cs_vnm.c
-
-OFILES=\
-	cs.$(SUF) \
-	cs_alloc.$(SUF) \
-	cs_aux.$(SUF) \
-	cs_avail.$(SUF) \
-	cs_debug.$(SUF) \
-	cs_elim.$(SUF) \
-	cs_entity.$(SUF) \
-	cs_kill.$(SUF) \
-	cs_partit.$(SUF) \
-	cs_profit.$(SUF) \
-	cs_getent.$(SUF) \
-	cs_stack.$(SUF) \
-	cs_vnm.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/cs.h \
-	$(SRC_DIR)/cs_alloc.h \
-	$(SRC_DIR)/cs_aux.h \
-	$(SRC_DIR)/cs_avail.h \
-	$(SRC_DIR)/cs_debug.h \
-	$(SRC_DIR)/cs_elim.h \
-	$(SRC_DIR)/cs_entity.h \
-	$(SRC_DIR)/cs_kill.h \
-	$(SRC_DIR)/cs_partit.h \
-	$(SRC_DIR)/cs_profit.h \
-	$(SRC_DIR)/cs_getent.h \
-	$(SRC_DIR)/cs_stack.h \
-	$(SRC_DIR)/cs_vnm.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	cs
-
-cs:	$(OFILES)
-	$(CC) -o cs $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp cs $(EMLIB)/ego/cs
-
-cmp:	all
-	-cmp cs $(EMLIB)/ego/cs
-
-clean:
-	rm -f *.$(SUF) cs Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-cs.$(SUF):	$(SRC_DIR)/cs.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs.c
-cs.$(SUF):	$(SRC_DIR)/cs_vnm.h
-cs.$(SUF):	$(SRC_DIR)/cs_stack.h
-cs.$(SUF):	$(SRC_DIR)/cs_profit.h
-cs.$(SUF):	$(SRC_DIR)/cs_entity.h
-cs.$(SUF):	$(SRC_DIR)/cs_elim.h
-cs.$(SUF):	$(SRC_DIR)/cs_debug.h
-cs.$(SUF):	$(SRC_DIR)/cs_avail.h
-cs.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs.$(SUF):	$(SRC_DIR)/cs.h
-cs.$(SUF):	$(SRC_DIR)/../share/go.h
-cs.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_alloc.$(SUF):	$(SRC_DIR)/cs_alloc.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_alloc.c
-cs_alloc.$(SUF):	$(SRC_DIR)/cs.h
-cs_alloc.$(SUF):	$(SRC_DIR)/../share/alloc.h
-cs_alloc.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_aux.$(SUF):	$(SRC_DIR)/cs_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_aux.c
-cs_aux.$(SUF):	$(SRC_DIR)/cs_entity.h
-cs_aux.$(SUF):	$(SRC_DIR)/cs.h
-cs_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_aux.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_avail.$(SUF):	$(SRC_DIR)/cs_avail.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_avail.c
-cs_avail.$(SUF):	$(SRC_DIR)/cs_getent.h
-cs_avail.$(SUF):	$(SRC_DIR)/cs_alloc.h
-cs_avail.$(SUF):	$(SRC_DIR)/cs_debug.h
-cs_avail.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_avail.$(SUF):	$(SRC_DIR)/cs.h
-cs_avail.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_avail.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_avail.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_avail.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_avail.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_avail.$(SUF):	$(EMH)/em_mnem.h
-cs_debug.$(SUF):	$(SRC_DIR)/cs_debug.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_debug.c
-cs_debug.$(SUF):	$(SRC_DIR)/cs_entity.h
-cs_debug.$(SUF):	$(SRC_DIR)/cs_avail.h
-cs_debug.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_debug.$(SUF):	$(SRC_DIR)/cs.h
-cs_debug.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_debug.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_debug.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_debug.$(SUF):	$(EMH)/em_spec.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs_elim.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_elim.c
-cs_elim.$(SUF):	$(SRC_DIR)/cs_partit.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs_profit.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs_debug.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs_alloc.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs_avail.h
-cs_elim.$(SUF):	$(SRC_DIR)/cs.h
-cs_elim.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_elim.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_elim.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_elim.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_elim.$(SUF):	$(SRC_DIR)/../share/alloc.h
-cs_elim.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_elim.$(SUF):	$(EMH)/em_mnem.h
-cs_elim.$(SUF):	$(EMH)/em_reg.h
-cs_entity.$(SUF):	$(SRC_DIR)/cs_entity.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_entity.c
-cs_entity.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_entity.$(SUF):	$(SRC_DIR)/cs_alloc.h
-cs_entity.$(SUF):	$(SRC_DIR)/cs.h
-cs_entity.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_entity.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_entity.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_entity.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_kill.$(SUF):	$(SRC_DIR)/cs_kill.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_kill.c
-cs_kill.$(SUF):	$(SRC_DIR)/cs_entity.h
-cs_kill.$(SUF):	$(SRC_DIR)/cs_avail.h
-cs_kill.$(SUF):	$(SRC_DIR)/cs_debug.h
-cs_kill.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_kill.$(SUF):	$(SRC_DIR)/cs.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/map.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/cset.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_kill.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_kill.$(SUF):	$(EMH)/em_mnem.h
-cs_partit.$(SUF):	$(SRC_DIR)/cs_partit.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_partit.c
-cs_partit.$(SUF):	$(SRC_DIR)/cs_stack.h
-cs_partit.$(SUF):	$(SRC_DIR)/cs.h
-cs_partit.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_partit.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_partit.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_partit.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_partit.$(SUF):	$(EMH)/em_spec.h
-cs_partit.$(SUF):	$(EMH)/em_reg.h
-cs_partit.$(SUF):	$(EMH)/em_pseu.h
-cs_partit.$(SUF):	$(EMH)/em_mnem.h
-cs_profit.$(SUF):	$(SRC_DIR)/cs_profit.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_profit.c
-cs_profit.$(SUF):	$(SRC_DIR)/cs_partit.h
-cs_profit.$(SUF):	$(SRC_DIR)/cs_avail.h
-cs_profit.$(SUF):	$(SRC_DIR)/cs_debug.h
-cs_profit.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_profit.$(SUF):	$(SRC_DIR)/cs.h
-cs_profit.$(SUF):	$(SRC_DIR)/../share/lset.h
-cs_profit.$(SUF):	$(SRC_DIR)/../share/cset.h
-cs_profit.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_profit.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_profit.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_profit.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_profit.$(SUF):	$(EMH)/em_spec.h
-cs_profit.$(SUF):	$(EMH)/em_mnem.h
-cs_getent.$(SUF):	$(SRC_DIR)/cs_getent.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_getent.c
-cs_getent.$(SUF):	$(SRC_DIR)/cs_stack.h
-cs_getent.$(SUF):	$(SRC_DIR)/cs_entity.h
-cs_getent.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_getent.$(SUF):	$(SRC_DIR)/cs.h
-cs_getent.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_getent.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_getent.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_getent.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_getent.$(SUF):	$(EMH)/em_mnem.h
-cs_stack.$(SUF):	$(SRC_DIR)/cs_stack.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_stack.c
-cs_stack.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_stack.$(SUF):	$(SRC_DIR)/cs.h
-cs_stack.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_stack.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_stack.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_stack.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_vnm.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cs_vnm.c
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_getent.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_partit.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_kill.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_stack.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_avail.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_entity.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_aux.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs_alloc.h
-cs_vnm.$(SUF):	$(SRC_DIR)/cs.h
-cs_vnm.$(SUF):	$(SRC_DIR)/../share/aux.h
-cs_vnm.$(SUF):	$(SRC_DIR)/../share/debug.h
-cs_vnm.$(SUF):	$(SRC_DIR)/../share/global.h
-cs_vnm.$(SUF):	$(SRC_DIR)/../share/types.h
-cs_vnm.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/descr/proto.make b/util/ego/descr/proto.make
deleted file mode 100644
index 1a7c6b344..000000000
--- a/util/ego/descr/proto.make
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/descr
-CPP = $(UTIL_HOME)/lib.bin/cpp
-EMH = $(TARGET_HOME)/h
-
-SOURCES = \
-	$(SRC_DIR)/i86.descr \
-	$(SRC_DIR)/i386.descr \
-	$(SRC_DIR)/m68k2.descr \
-	$(SRC_DIR)/pdp.descr \
-	$(SRC_DIR)/vax4.descr \
-	$(SRC_DIR)/m68k4.descr \
-	$(SRC_DIR)/m68020.descr \
-	$(SRC_DIR)/sparc.descr \
-	$(SRC_DIR)/em22.descr \
-	$(SRC_DIR)/em24.descr \
-	$(SRC_DIR)/em44.descr
-
-TARGETS = i86descr m68k2descr vax4descr pdpdescr m68k4descr m68020descr \
-	  em22descr em24descr em44descr sparcdescr sparc_solarisdescr i386descr
-
-PRFILES = $(SRC_DIR)/proto.make $(SRC_DIR)/descr.sed $(SOURCES)
-
-all:	$(TARGETS)
-
-install:	all
-	for i in $(TARGETS) ; do cp $$i $(TARGET_HOME)/lib.bin/ego/$$i ; done
-
-cmp:	all
-	-for i in $(TARGETS) ; do cmp $$i $(TARGET_HOME)/lib.bin/ego/$$i ; done
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-clean:
-	rm -f $(TARGETS) *.o Out out nohup.out
-
-i86descr:	$(SRC_DIR)/i86.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/i86.descr | sed -f $(SRC_DIR)/descr.sed > i86descr
-
-pdpdescr:	$(SRC_DIR)/pdp.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/pdp.descr | sed -f $(SRC_DIR)/descr.sed > pdpdescr
-
-m68k2descr:	$(SRC_DIR)/m68k2.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/m68k2.descr | sed -f $(SRC_DIR)/descr.sed > m68k2descr
-
-m68k4descr:	$(SRC_DIR)/m68k4.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/m68k4.descr | sed -f $(SRC_DIR)/descr.sed > m68k4descr
-
-m68020descr:	$(SRC_DIR)/m68020.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/m68020.descr | sed -f $(SRC_DIR)/descr.sed > m68020descr
-
-vax4descr:	$(SRC_DIR)/vax4.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/vax4.descr | sed -f $(SRC_DIR)/descr.sed > vax4descr
-
-em22descr:	$(SRC_DIR)/em22.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/em22.descr | sed -f $(SRC_DIR)/descr.sed > em22descr
-
-em24descr:	$(SRC_DIR)/em24.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/em24.descr | sed -f $(SRC_DIR)/descr.sed > em24descr
-
-em44descr:	$(SRC_DIR)/em44.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/em44.descr | sed -f $(SRC_DIR)/descr.sed > em44descr
-
-sparcdescr:	$(SRC_DIR)/sparc.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/sparc.descr | sed -f $(SRC_DIR)/descr.sed > sparcdescr
-
-sparc_solarisdescr:	$(SRC_DIR)/sparc.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/sparc.descr | sed -f $(SRC_DIR)/descr.sed > sparc_solarisdescr
-
-i386descr:	$(SRC_DIR)/i386.descr $(SRC_DIR)/descr.sed
-		$(CPP) -P -I$(EMH) $(SRC_DIR)/i386.descr | sed -f $(SRC_DIR)/descr.sed > i386descr
-
diff --git a/util/ego/em_ego/proto.make b/util/ego/em_ego/proto.make
deleted file mode 100644
index b1f6d2952..000000000
--- a/util/ego/em_ego/proto.make
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line
-
-SRC_DIR = $(SRC_HOME)/util/ego/em_ego
-EMH=$(TARGET_HOME)/h
-EMCONFIG=$(TARGET_HOME)/config
-EMLIB=$(TARGET_HOME)/lib.bin
-MODLIB=$(TARGET_HOME)/modules/lib
-MODH=$(TARGET_HOME)/modules/h
-MODS=$(MODLIB)/libprint.$(LIBSUF) $(MODLIB)/libstring.$(LIBSUF) $(MODLIB)/libsystem.$(LIBSUF)
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(EMCONFIG) -I$(MODH)
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-all:	em_ego
-
-em_ego:	em_ego.$(SUF)
-	$(CC) $(LDFLAGS) -o em_ego em_ego.$(SUF) $(MODS)
-
-em_ego.$(SUF):	$(SRC_DIR)/em_ego.c $(EMCONFIG)/em_path.h $(MODH)/system.h
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/em_ego.c
-
-install:	all
-	rm -f $(EMLIB)/em_ego
-	cp em_ego $(EMLIB)/em_ego
-
-cmp:	all
-	-cmp em_ego $(EMLIB)/em_ego
-
-pr:
-	@pr $(SRC_DIR)/proto.make $(SRC_DIR)/em_ego.c
-
-opr:
-	make pr | opr
-
-lint:
-	$(LINT) $(LINTFLAGS) $(SRC_DIR)/em_ego.c
-
-clean:
-	rm -f *.$(SUF) em_ego
diff --git a/util/ego/ic/proto.make b/util/ego/ic/proto.make
deleted file mode 100644
index aae64cd14..000000000
--- a/util/ego/ic/proto.make
+++ /dev/null
@@ -1,137 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/ic
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/ic.c \
-	$(SRC_DIR)/ic_aux.c \
-	$(SRC_DIR)/ic_lib.c \
-	$(SRC_DIR)/ic_lookup.c \
-	$(SRC_DIR)/ic_io.c
-
-OFILES=\
-ic.$(SUF) ic_aux.$(SUF) ic_lookup.$(SUF) ic_io.$(SUF) ic_lib.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/ic.h \
-	$(SRC_DIR)/ic_aux.h \
-	$(SRC_DIR)/ic_lib.h \
-	$(SRC_DIR)/ic_lookup.h \
-	$(SRC_DIR)/ic_io.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	ic
-
-ic:	$(OFILES)
-	$(CC) -o ic $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp ic $(EMLIB)/ego/ic
-
-cmp:	all
-	-cmp ic $(EMLIB)/ego/ic
-
-clean:
-	rm -f *.$(SUF) ic Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-ic.$(SUF):	$(SRC_DIR)/ic.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ic.c
-ic.$(SUF):	$(SRC_DIR)/../share/aux.h
-ic.$(SUF):	$(SRC_DIR)/../share/put.h
-ic.$(SUF):	$(SRC_DIR)/../share/files.h
-ic.$(SUF):	$(SRC_DIR)/../share/global.h
-ic.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ic.$(SUF):	$(SRC_DIR)/ic_lib.h
-ic.$(SUF):	$(SRC_DIR)/ic_io.h
-ic.$(SUF):	$(SRC_DIR)/ic_aux.h
-ic.$(SUF):	$(SRC_DIR)/ic_lookup.h
-ic.$(SUF):	$(SRC_DIR)/ic.h
-ic.$(SUF):	$(SRC_DIR)/../share/map.h
-ic.$(SUF):	$(SRC_DIR)/../share/def.h
-ic.$(SUF):	$(SRC_DIR)/../share/debug.h
-ic.$(SUF):	$(SRC_DIR)/../share/types.h
-ic.$(SUF):	$(EMH)/em_mes.h
-ic.$(SUF):	$(EMH)/em_flag.h
-ic.$(SUF):	$(EMH)/em_pseu.h
-ic.$(SUF):	$(EMH)/em_spec.h
-ic_aux.$(SUF):	$(SRC_DIR)/ic_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ic_aux.c
-ic_aux.$(SUF):	$(SRC_DIR)/ic_aux.h
-ic_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ic_aux.$(SUF):	$(SRC_DIR)/ic_lookup.h
-ic_aux.$(SUF):	$(SRC_DIR)/ic_io.h
-ic_aux.$(SUF):	$(SRC_DIR)/ic.h
-ic_aux.$(SUF):	$(SRC_DIR)/../share/aux.h
-ic_aux.$(SUF):	$(SRC_DIR)/../share/def.h
-ic_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-ic_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-ic_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-ic_aux.$(SUF):	$(EMH)/em_mnem.h
-ic_aux.$(SUF):	$(EMH)/em_spec.h
-ic_aux.$(SUF):	$(EMH)/em_pseu.h
-ic_lib.$(SUF):	$(SRC_DIR)/ic_lib.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ic_lib.c
-ic_lib.$(SUF):	$(SRC_DIR)/ic_lib.h
-ic_lib.$(SUF):	$(SRC_DIR)/../share/files.h
-ic_lib.$(SUF):	$(SRC_DIR)/../share/global.h
-ic_lib.$(SUF):	$(SRC_DIR)/ic_io.h
-ic_lib.$(SUF):	$(SRC_DIR)/ic_lookup.h
-ic_lib.$(SUF):	$(SRC_DIR)/ic.h
-ic_lib.$(SUF):	$(SRC_DIR)/../share/debug.h
-ic_lib.$(SUF):	$(SRC_DIR)/../share/types.h
-ic_lib.$(SUF):	$(EMH)/arch.h
-ic_lib.$(SUF):	$(EMH)/em_mes.h
-ic_lib.$(SUF):	$(EMH)/em_pseu.h
-ic_lib.$(SUF):	$(EMH)/em_spec.h
-ic_lookup.$(SUF):	$(SRC_DIR)/ic_lookup.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ic_lookup.c
-ic_lookup.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ic_lookup.$(SUF):	$(SRC_DIR)/ic_lookup.h
-ic_lookup.$(SUF):	$(SRC_DIR)/ic.h
-ic_lookup.$(SUF):	$(SRC_DIR)/../share/map.h
-ic_lookup.$(SUF):	$(SRC_DIR)/../share/debug.h
-ic_lookup.$(SUF):	$(SRC_DIR)/../share/types.h
-ic_lookup.$(SUF):	$(EMH)/em_spec.h
-ic_io.$(SUF):	$(SRC_DIR)/ic_io.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ic_io.c
-ic_io.$(SUF):	$(SRC_DIR)/ic_io.h
-ic_io.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ic_io.$(SUF):	$(SRC_DIR)/ic_lookup.h
-ic_io.$(SUF):	$(SRC_DIR)/ic.h
-ic_io.$(SUF):	$(SRC_DIR)/../share/debug.h
-ic_io.$(SUF):	$(SRC_DIR)/../share/types.h
-ic_io.$(SUF):	$(EMH)/arch.h
-ic_io.$(SUF):	$(EMH)/em_spec.h
-ic_io.$(SUF):	$(EMH)/em_pseu.h
diff --git a/util/ego/il/proto.make b/util/ego/il/proto.make
deleted file mode 100644
index dfeae7ba1..000000000
--- a/util/ego/il/proto.make
+++ /dev/null
@@ -1,223 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/il
-EMH=$(TARGET_HOME)/h
-EMCONFIG=$(TARGET_HOME)/config
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(EMCONFIG) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/il.c \
-	$(SRC_DIR)/il1_anal.c \
-	$(SRC_DIR)/il1_cal.c \
-	$(SRC_DIR)/il1_formal.c \
-	$(SRC_DIR)/il1_aux.c \
-	$(SRC_DIR)/il2_aux.c \
-	$(SRC_DIR)/il3_change.c \
-	$(SRC_DIR)/il3_subst.c \
-	$(SRC_DIR)/il3_aux.c \
-	$(SRC_DIR)/il_aux.c
-
-OFILES=\
-	il.$(SUF) il1_anal.$(SUF) il1_cal.$(SUF) il1_formal.$(SUF) \
-	il1_aux.$(SUF) il2_aux.$(SUF) il3_change.$(SUF) il3_subst.$(SUF) \
-	il3_aux.$(SUF) il_aux.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/il.h \
-	$(SRC_DIR)/il1_anal.h \
-	$(SRC_DIR)/il1_cal.h \
-	$(SRC_DIR)/il1_formal.h \
-	$(SRC_DIR)/il1_aux.h \
-	$(SRC_DIR)/il2_aux.h \
-	$(SRC_DIR)/il3_change.h \
-	$(SRC_DIR)/il3_subst.h \
-	$(SRC_DIR)/il3_aux.h \
-	$(SRC_DIR)/il_aux.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	il
-
-il:	$(OFILES)
-	$(CC) -o il $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp il $(EMLIB)/ego/il
-
-cmp:	all
-	-cmp il $(EMLIB)/ego/il
-
-clean:
-	rm -f *.$(SUF) il Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-il.$(SUF):	$(SRC_DIR)/il.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il.c
-il.$(SUF):	$(SRC_DIR)/../share/go.h
-il.$(SUF):	$(SRC_DIR)/../share/put.h
-il.$(SUF):	$(SRC_DIR)/../share/get.h
-il.$(SUF):	$(SRC_DIR)/il3_subst.h
-il.$(SUF):	$(SRC_DIR)/il2_aux.h
-il.$(SUF):	$(SRC_DIR)/il1_anal.h
-il.$(SUF):	$(SRC_DIR)/il_aux.h
-il.$(SUF):	$(SRC_DIR)/../share/map.h
-il.$(SUF):	$(SRC_DIR)/../share/files.h
-il.$(SUF):	$(SRC_DIR)/../share/lset.h
-il.$(SUF):	$(SRC_DIR)/../share/global.h
-il.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il.$(SUF):	$(SRC_DIR)/../share/debug.h
-il.$(SUF):	$(SRC_DIR)/il.h
-il.$(SUF):	$(SRC_DIR)/../share/types.h
-il.$(SUF):	$(EMH)/em_pseu.h
-il.$(SUF):	$(EMH)/em_mnem.h
-il.$(SUF):	$(EMCONFIG)/em_path.h
-il1_anal.$(SUF):	$(SRC_DIR)/il1_anal.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il1_anal.c
-il1_anal.$(SUF):	$(SRC_DIR)/../share/put.h
-il1_anal.$(SUF):	$(SRC_DIR)/il_aux.h
-il1_anal.$(SUF):	$(SRC_DIR)/il1_anal.h
-il1_anal.$(SUF):	$(SRC_DIR)/il1_cal.h
-il1_anal.$(SUF):	$(SRC_DIR)/il1_formal.h
-il1_anal.$(SUF):	$(SRC_DIR)/il1_aux.h
-il1_anal.$(SUF):	$(SRC_DIR)/../share/aux.h
-il1_anal.$(SUF):	$(SRC_DIR)/../share/lset.h
-il1_anal.$(SUF):	$(SRC_DIR)/../share/global.h
-il1_anal.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il1_anal.$(SUF):	$(SRC_DIR)/../share/debug.h
-il1_anal.$(SUF):	$(SRC_DIR)/il.h
-il1_anal.$(SUF):	$(SRC_DIR)/../share/types.h
-il1_anal.$(SUF):	$(EMH)/em_pseu.h
-il1_anal.$(SUF):	$(EMH)/em_mnem.h
-il1_cal.$(SUF):	$(SRC_DIR)/il1_cal.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il1_cal.c
-il1_cal.$(SUF):	$(SRC_DIR)/../share/parser.h
-il1_cal.$(SUF):	$(SRC_DIR)/il1_aux.h
-il1_cal.$(SUF):	$(SRC_DIR)/../share/lset.h
-il1_cal.$(SUF):	$(SRC_DIR)/../share/global.h
-il1_cal.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il1_cal.$(SUF):	$(SRC_DIR)/../share/debug.h
-il1_cal.$(SUF):	$(SRC_DIR)/il1_cal.h
-il1_cal.$(SUF):	$(SRC_DIR)/il.h
-il1_cal.$(SUF):	$(SRC_DIR)/../share/types.h
-il1_cal.$(SUF):	$(EMH)/em_mnem.h
-il1_cal.$(SUF):	$(EMH)/em_spec.h
-il1_formal.$(SUF):	$(SRC_DIR)/il1_formal.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il1_formal.c
-il1_formal.$(SUF):	$(SRC_DIR)/il1_formal.h
-il1_formal.$(SUF):	$(SRC_DIR)/il1_aux.h
-il1_formal.$(SUF):	$(SRC_DIR)/../share/lset.h
-il1_formal.$(SUF):	$(SRC_DIR)/../share/global.h
-il1_formal.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il1_formal.$(SUF):	$(SRC_DIR)/../share/debug.h
-il1_formal.$(SUF):	$(SRC_DIR)/il.h
-il1_formal.$(SUF):	$(SRC_DIR)/../share/types.h
-il1_aux.$(SUF):	$(SRC_DIR)/il1_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il1_aux.c
-il1_aux.$(SUF):	$(SRC_DIR)/il1_aux.h
-il1_aux.$(SUF):	$(SRC_DIR)/il_aux.h
-il1_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-il1_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-il1_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il1_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-il1_aux.$(SUF):	$(SRC_DIR)/il.h
-il1_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-il1_aux.$(SUF):	$(EMH)/em_spec.h
-il2_aux.$(SUF):	$(SRC_DIR)/il2_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il2_aux.c
-il2_aux.$(SUF):	$(SRC_DIR)/../share/aux.h
-il2_aux.$(SUF):	$(SRC_DIR)/../share/get.h
-il2_aux.$(SUF):	$(SRC_DIR)/il2_aux.h
-il2_aux.$(SUF):	$(SRC_DIR)/il_aux.h
-il2_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-il2_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-il2_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il2_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-il2_aux.$(SUF):	$(SRC_DIR)/il.h
-il2_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-il2_aux.$(SUF):	$(EMH)/em_mnem.h
-il2_aux.$(SUF):	$(EMH)/em_spec.h
-il3_change.$(SUF):	$(SRC_DIR)/il3_change.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il3_change.c
-il3_change.$(SUF):	$(SRC_DIR)/il3_aux.h
-il3_change.$(SUF):	$(SRC_DIR)/il3_change.h
-il3_change.$(SUF):	$(SRC_DIR)/il_aux.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/put.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/get.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/aux.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/lset.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/def.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/global.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/debug.h
-il3_change.$(SUF):	$(SRC_DIR)/il.h
-il3_change.$(SUF):	$(SRC_DIR)/../share/types.h
-il3_change.$(SUF):	$(EMH)/em_mes.h
-il3_change.$(SUF):	$(EMH)/em_spec.h
-il3_change.$(SUF):	$(EMH)/em_pseu.h
-il3_change.$(SUF):	$(EMH)/em_mnem.h
-il3_subst.$(SUF):	$(SRC_DIR)/il3_subst.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il3_subst.c
-il3_subst.$(SUF):	$(SRC_DIR)/il3_subst.h
-il3_subst.$(SUF):	$(SRC_DIR)/il3_change.h
-il3_subst.$(SUF):	$(SRC_DIR)/il3_aux.h
-il3_subst.$(SUF):	$(SRC_DIR)/il_aux.h
-il3_subst.$(SUF):	$(SRC_DIR)/../share/get.h
-il3_subst.$(SUF):	$(SRC_DIR)/../share/lset.h
-il3_subst.$(SUF):	$(SRC_DIR)/../share/global.h
-il3_subst.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il3_subst.$(SUF):	$(SRC_DIR)/../share/debug.h
-il3_subst.$(SUF):	$(SRC_DIR)/il.h
-il3_subst.$(SUF):	$(SRC_DIR)/../share/types.h
-il3_subst.$(SUF):	$(EMH)/em_mnem.h
-il3_aux.$(SUF):	$(SRC_DIR)/il3_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il3_aux.c
-il3_aux.$(SUF):	$(SRC_DIR)/il3_aux.h
-il3_aux.$(SUF):	$(SRC_DIR)/il_aux.h
-il3_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-il3_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il3_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-il3_aux.$(SUF):	$(SRC_DIR)/il.h
-il3_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-il_aux.$(SUF):	$(SRC_DIR)/il_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/il_aux.c
-il_aux.$(SUF):	$(SRC_DIR)/il_aux.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/map.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/put.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/get.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-il_aux.$(SUF):	$(SRC_DIR)/il.h
-il_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-il_aux.$(SUF):	$(EMH)/em_pseu.h
-il_aux.$(SUF):	$(EMH)/em_mnem.h
-il_aux.$(SUF):	$(EMH)/em_spec.h
diff --git a/util/ego/lv/proto.make b/util/ego/lv/proto.make
deleted file mode 100644
index 94e2bc407..000000000
--- a/util/ego/lv/proto.make
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/lv
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/lv.c
-
-OFILES=\
-lv.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/lv.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	lv
-
-lv:	$(OFILES)
-	$(CC) -o lv $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp lv $(EMLIB)/ego/lv
-
-cmp:	all
-	-cmp lv $(EMLIB)/ego/lv
-
-clean:
-	rm -f *.$(SUF) lv Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-lv.$(SUF):	$(SRC_DIR)/lv.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/lv.c
-lv.$(SUF):	$(SRC_DIR)/../share/parser.h
-lv.$(SUF):	$(SRC_DIR)/../share/go.h
-lv.$(SUF):	$(SRC_DIR)/../share/locals.h
-lv.$(SUF):	$(SRC_DIR)/../share/init_glob.h
-lv.$(SUF):	$(SRC_DIR)/../share/aux.h
-lv.$(SUF):	$(SRC_DIR)/../share/put.h
-lv.$(SUF):	$(SRC_DIR)/../share/get.h
-lv.$(SUF):	$(SRC_DIR)/../share/map.h
-lv.$(SUF):	$(SRC_DIR)/../share/alloc.h
-lv.$(SUF):	$(SRC_DIR)/../share/files.h
-lv.$(SUF):	$(SRC_DIR)/../share/def.h
-lv.$(SUF):	$(SRC_DIR)/../share/cset.h
-lv.$(SUF):	$(SRC_DIR)/../share/lset.h
-lv.$(SUF):	$(SRC_DIR)/../share/global.h
-lv.$(SUF):	$(SRC_DIR)/../share/debug.h
-lv.$(SUF):	$(SRC_DIR)/lv.h
-lv.$(SUF):	$(SRC_DIR)/../share/types.h
-lv.$(SUF):	$(EMH)/em_ego.h
-lv.$(SUF):	$(EMH)/em_mes.h
-lv.$(SUF):	$(EMH)/em_spec.h
-lv.$(SUF):	$(EMH)/em_pseu.h
-lv.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/ra/proto.make b/util/ego/ra/proto.make
deleted file mode 100644
index 24c5576c3..000000000
--- a/util/ego/ra/proto.make
+++ /dev/null
@@ -1,234 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/ra
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-ULDFLAGS=$(ULDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego -I.
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-UCFLAGS=$(CPPFLAGS) $(UCOPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/ra.c \
-	$(SRC_DIR)/ra_items.c \
-	$(SRC_DIR)/ra_lifet.c \
-	$(SRC_DIR)/ra_allocl.c \
-	$(SRC_DIR)/ra_profits.c \
-	$(SRC_DIR)/ra_interv.c \
-	$(SRC_DIR)/ra_pack.c \
-	$(SRC_DIR)/ra_xform.c \
-	$(SRC_DIR)/ra_aux.c
-
-OFILES=\
-	ra.$(SUF) \
-	ra_items.$(SUF) \
-	ra_lifet.$(SUF) \
-	ra_allocl.$(SUF) \
-	ra_profits.$(SUF) \
-	ra_interv.$(SUF) \
-	ra_pack.$(SUF) \
-	ra_xform.$(SUF) \
-	ra_aux.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/ra.h \
-	$(SRC_DIR)/ra_items.h \
-	$(SRC_DIR)/ra_lifet.h \
-	$(SRC_DIR)/ra_allocl.h \
-	$(SRC_DIR)/ra_profits.h \
-	$(SRC_DIR)/ra_interv.h \
-	$(SRC_DIR)/ra_pack.h \
-	$(SRC_DIR)/ra_xform.h \
-	$(SRC_DIR)/ra_aux.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	ra
-
-ra:	$(OFILES)
-	$(CC) -o ra $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-./itemtab.h:	$(SRC_DIR)/itemtab.src $(EMH)/em_mnem.h makeitems
-		makeitems $(EMH)/em_mnem.h $(SRC_DIR)/itemtab.src > ./itemtab.h
-
-makeitems:	$(SRC_DIR)/makeitems.c
-		$(UCC) $(UCFLAGS) $(ULDFLAGS) -o makeitems $(SRC_DIR)/makeitems.c
-
-install:	all
-	cp ra $(EMLIB)/ego/ra
-
-cmp:	all
-	-cmp ra $(EMLIB)/ego/ra
-
-clean:
-	rm -f *.$(SUF) ra Out out nohup.out makeitems ./itemtab.h
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:	./itemtab.h
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-ra.$(SUF):	$(SRC_DIR)/ra.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra.c
-ra.$(SUF):	$(SRC_DIR)/ra_xform.h
-ra.$(SUF):	$(SRC_DIR)/ra_pack.h
-ra.$(SUF):	$(SRC_DIR)/ra_profits.h
-ra.$(SUF):	$(SRC_DIR)/ra_allocl.h
-ra.$(SUF):	$(SRC_DIR)/ra_items.h
-ra.$(SUF):	$(SRC_DIR)/ra.h
-ra.$(SUF):	$(SRC_DIR)/../share/go.h
-ra.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra.$(SUF):	$(SRC_DIR)/../share/map.h
-ra.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra.$(SUF):	$(SRC_DIR)/../share/put.h
-ra.$(SUF):	$(SRC_DIR)/../share/get.h
-ra.$(SUF):	$(SRC_DIR)/../share/files.h
-ra.$(SUF):	$(SRC_DIR)/../share/global.h
-ra.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra.$(SUF):	$(SRC_DIR)/../share/types.h
-ra.$(SUF):	$(EMH)/em_reg.h
-ra_items.$(SUF):	$(SRC_DIR)/ra_items.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_items.c
-ra_items.$(SUF):	./itemtab.h
-ra_items.$(SUF):	$(SRC_DIR)/ra_items.h
-ra_items.$(SUF):	$(SRC_DIR)/ra_aux.h
-ra_items.$(SUF):	$(SRC_DIR)/ra.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/aux.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/def.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_items.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_items.$(SUF):	$(EMH)/em_reg.h
-ra_items.$(SUF):	$(EMH)/em_pseu.h
-ra_items.$(SUF):	$(EMH)/em_spec.h
-ra_items.$(SUF):	$(EMH)/em_mnem.h
-ra_lifet.$(SUF):	$(SRC_DIR)/ra_lifet.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_lifet.c
-ra_lifet.$(SUF):	$(SRC_DIR)/ra_lifet.h
-ra_lifet.$(SUF):	$(SRC_DIR)/ra_items.h
-ra_lifet.$(SUF):	$(SRC_DIR)/ra_aux.h
-ra_lifet.$(SUF):	$(SRC_DIR)/ra.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/aux.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/def.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_lifet.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_lifet.$(SUF):	$(EMH)/em_ego.h
-ra_lifet.$(SUF):	$(EMH)/em_mes.h
-ra_lifet.$(SUF):	$(EMH)/em_reg.h
-ra_lifet.$(SUF):	$(EMH)/em_pseu.h
-ra_lifet.$(SUF):	$(EMH)/em_spec.h
-ra_lifet.$(SUF):	$(EMH)/em_mnem.h
-ra_allocl.$(SUF):	$(SRC_DIR)/ra_allocl.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_allocl.c
-ra_allocl.$(SUF):	$(SRC_DIR)/ra_interv.h
-ra_allocl.$(SUF):	$(SRC_DIR)/ra_allocl.h
-ra_allocl.$(SUF):	$(SRC_DIR)/ra_items.h
-ra_allocl.$(SUF):	$(SRC_DIR)/ra_aux.h
-ra_allocl.$(SUF):	$(SRC_DIR)/ra.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/map.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/aux.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/cset.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/def.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_allocl.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_allocl.$(SUF):	$(EMH)/em_reg.h
-ra_allocl.$(SUF):	$(EMH)/em_pseu.h
-ra_allocl.$(SUF):	$(EMH)/em_spec.h
-ra_allocl.$(SUF):	$(EMH)/em_mnem.h
-ra_profits.$(SUF):	$(SRC_DIR)/ra_profits.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_profits.c
-ra_profits.$(SUF):	$(SRC_DIR)/ra_profits.h
-ra_profits.$(SUF):	$(SRC_DIR)/ra_aux.h
-ra_profits.$(SUF):	$(SRC_DIR)/ra.h
-ra_profits.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_profits.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_profits.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_profits.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_profits.$(SUF):	$(EMH)/em_reg.h
-ra_interv.$(SUF):	$(SRC_DIR)/ra_interv.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_interv.c
-ra_interv.$(SUF):	$(SRC_DIR)/ra_interv.h
-ra_interv.$(SUF):	$(SRC_DIR)/ra.h
-ra_interv.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_interv.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_interv.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_interv.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_interv.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_interv.$(SUF):	$(EMH)/em_reg.h
-ra_pack.$(SUF):	$(SRC_DIR)/ra_pack.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_pack.c
-ra_pack.$(SUF):	$(SRC_DIR)/ra_interv.h
-ra_pack.$(SUF):	$(SRC_DIR)/ra_aux.h
-ra_pack.$(SUF):	$(SRC_DIR)/ra.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/aux.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/cset.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/def.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_pack.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_pack.$(SUF):	$(EMH)/em_reg.h
-ra_xform.$(SUF):	$(SRC_DIR)/ra_xform.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_xform.c
-ra_xform.$(SUF):	$(SRC_DIR)/ra_items.h
-ra_xform.$(SUF):	$(SRC_DIR)/ra_xform.h
-ra_xform.$(SUF):	$(SRC_DIR)/ra_interv.h
-ra_xform.$(SUF):	$(SRC_DIR)/ra.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/aux.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/def.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_xform.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_xform.$(SUF):	$(EMH)/em_reg.h
-ra_xform.$(SUF):	$(EMH)/em_ego.h
-ra_xform.$(SUF):	$(EMH)/em_mes.h
-ra_xform.$(SUF):	$(EMH)/em_pseu.h
-ra_xform.$(SUF):	$(EMH)/em_spec.h
-ra_xform.$(SUF):	$(EMH)/em_mnem.h
-ra_aux.$(SUF):	$(SRC_DIR)/ra_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ra_aux.c
-ra_aux.$(SUF):	$(SRC_DIR)/ra_aux.h
-ra_aux.$(SUF):	$(SRC_DIR)/ra.h
-ra_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ra_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-ra_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-ra_aux.$(SUF):	$(SRC_DIR)/../share/def.h
-ra_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-ra_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-ra_aux.$(SUF):	$(EMH)/em_reg.h
-ra_aux.$(SUF):	$(EMH)/em_pseu.h
-ra_aux.$(SUF):	$(EMH)/em_spec.h
-ra_aux.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/share/proto.make b/util/ego/share/proto.make
deleted file mode 100644
index 7f67c8bf0..000000000
--- a/util/ego/share/proto.make
+++ /dev/null
@@ -1,241 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line
-
-SRC_DIR = $(SRC_HOME)/util/ego/share
-EMH=$(TARGET_HOME)/h
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I.
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-UCFLAGS=$(CPPFLAGS) $(UCOPTIONS)
-ULDFLAGS=$(ULDOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/debug.c \
-	$(SRC_DIR)/global.c \
-	$(SRC_DIR)/files.c \
-	$(SRC_DIR)/go.c \
-	$(SRC_DIR)/map.c \
-	$(SRC_DIR)/aux.c \
-	$(SRC_DIR)/get.c \
-	$(SRC_DIR)/put.c \
-	$(SRC_DIR)/alloc.c \
-	$(SRC_DIR)/lset.c \
-	$(SRC_DIR)/cset.c \
-	$(SRC_DIR)/parser.c \
-	$(SRC_DIR)/stack_chg.c \
-	$(SRC_DIR)/locals.c \
-	$(SRC_DIR)/init_glob.c
-SRC=\
-	$(SRC_DIR)/types.h \
-	$(SRC_DIR)/def.h \
-	$(SRC_DIR)/debug.h \
-	$(SRC_DIR)/global.h \
-	$(SRC_DIR)/files.h \
-	$(SRC_DIR)/go.h \
-	$(SRC_DIR)/map.h \
-	$(SRC_DIR)/aux.h \
-	$(SRC_DIR)/get.h \
-	$(SRC_DIR)/put.h \
-	$(SRC_DIR)/alloc.h\
-	$(SRC_DIR)/lset.h \
-	$(SRC_DIR)/cset.h \
-	$(SRC_DIR)/parser.h \
-	$(SRC_DIR)/stack_chg.h \
-	$(SRC_DIR)/locals.h \
-	$(SRC_DIR)/init_glob.h \
-	$(CFILES)
-
-PRFILES=$(SRC)
-
-OBS =	alloc.$(SUF) cset.$(SUF) debug.$(SUF) \
-	files.$(SUF) go.$(SUF) global.$(SUF) lset.$(SUF) map.$(SUF) \
-	parser.$(SUF) get.$(SUF) put.$(SUF) aux.$(SUF) stack_chg.$(SUF) \
-	locals.$(SUF) init_glob.$(SUF)
-
-all:		classdefs.h $(SRC_DIR)/pop_push.h $(OBS)
-		$(AR) r share.$(LIBSUF) $(OBS)
-		$(RANLIB) share.$(LIBSUF)
-
-install:	all
-		-mkdir $(TARGET_HOME)/lib.bin/ego
-		cp share.$(LIBSUF) $(TARGET_HOME)/lib.bin/ego/share.$(LIBSUF)
-		$(RANLIB) $(TARGET_HOME)/lib.bin/ego/share.$(LIBSUF)
-		cp classdefs.h $(TARGET_HOME)/lib.bin/ego/classdefs.h
-		cp $(SRC_DIR)/pop_push.h $(TARGET_HOME)/lib.bin/ego/pop_push.h
-
-cmp:		all
-		-cmp share.$(LIBSUF) $(TARGET_HOME)/lib.bin/ego/share.$(LIBSUF)
-		-cmp classdefs.h $(TARGET_HOME)/lib.bin/ego/classdefs.h
-		-cmp $(SRC_DIR)/pop_push.h $(TARGET_HOME)/lib.bin/ego/pop_push.h
-
-classdefs.h: \
-	makeclassdef \
-	$(SRC_DIR)/cldefs.src
-	 makeclassdef $(EMH)/em_mnem.h $(SRC_DIR)/cldefs.src > classdefs.h
-
-makeclassdef: \
-	$(SRC_DIR)/makecldef.c
-	 $(UCC) $(UCFLAGS) $(ULDFLAGS) -o makeclassdef $(SRC_DIR)/makecldef.c
-
-$(SRC_DIR)/pop_push.h: \
-	$(SRC_HOME)/etc/em_table $(SRC_DIR)/pop_push.awk
-	 awk -f $(SRC_DIR)/pop_push.awk < $(SRC_HOME)/etc/em_table > $(SRC_DIR)/pop_push.h
-
-show: \
-	$(SRC_DIR)/show.c
-	 $(UCC) $(UCFLAGS) $(ULDFLAGS) -o show $(SRC_DIR)/show.c $(UTIL_HOME)/lib.bin/em_data.$(ULIBSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-clean:
-	rm -f makeclassdef classdefs.h *.$(SUF) Out out nohup.out *.$(LIBSUF) 
-
-lintlib:	classdefs.h
-	-mkdir $(TARGET_HOME)/lib.bin/ego
-	$(MK_LINT_LIB) share $(TARGET_HOME)/lib.bin/ego $(CPPFLAGS) $(CFILES)
-
-depend:	$(SRC_DIR)/pop_push.h classdefs.h
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line.
-#DEPENDENCIES
-debug.$(SUF):	$(SRC_DIR)/debug.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/debug.c
-debug.$(SUF):	$(SRC_DIR)/global.h
-debug.$(SUF):	$(SRC_DIR)/debug.h
-debug.$(SUF):	$(SRC_DIR)/def.h
-debug.$(SUF):	$(SRC_DIR)/types.h
-debug.$(SUF):	$(EMH)/em_spec.h
-global.$(SUF):	$(SRC_DIR)/global.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/global.c
-global.$(SUF):	$(SRC_DIR)/types.h
-files.$(SUF):	$(SRC_DIR)/files.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/files.c
-go.$(SUF):	$(SRC_DIR)/go.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/go.c
-go.$(SUF):	$(SRC_DIR)/go.h
-go.$(SUF):	$(SRC_DIR)/alloc.h
-go.$(SUF):	$(SRC_DIR)/map.h
-go.$(SUF):	$(SRC_DIR)/lset.h
-go.$(SUF):	$(SRC_DIR)/put.h
-go.$(SUF):	$(SRC_DIR)/get.h
-go.$(SUF):	$(SRC_DIR)/files.h
-go.$(SUF):	$(SRC_DIR)/global.h
-go.$(SUF):	$(SRC_DIR)/debug.h
-go.$(SUF):	$(SRC_DIR)/types.h
-map.$(SUF):	$(SRC_DIR)/map.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/map.c
-map.$(SUF):	$(SRC_DIR)/map.h
-map.$(SUF):	$(SRC_DIR)/types.h
-aux.$(SUF):	$(SRC_DIR)/aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/aux.c
-aux.$(SUF):	$(SRC_DIR)/lset.h
-aux.$(SUF):	$(SRC_DIR)/map.h
-aux.$(SUF):	$(SRC_DIR)/aux.h
-aux.$(SUF):	$(SRC_DIR)/alloc.h
-aux.$(SUF):	$(SRC_DIR)/global.h
-aux.$(SUF):	$(SRC_DIR)/debug.h
-aux.$(SUF):	$(SRC_DIR)/types.h
-aux.$(SUF):	$(EMH)/em_pseu.h
-aux.$(SUF):	$(EMH)/em_mes.h
-get.$(SUF):	$(SRC_DIR)/get.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/get.c
-get.$(SUF):	$(SRC_DIR)/aux.h
-get.$(SUF):	$(SRC_DIR)/map.h
-get.$(SUF):	$(SRC_DIR)/alloc.h
-get.$(SUF):	$(SRC_DIR)/get.h
-get.$(SUF):	$(SRC_DIR)/cset.h
-get.$(SUF):	$(SRC_DIR)/lset.h
-get.$(SUF):	$(SRC_DIR)/global.h
-get.$(SUF):	$(SRC_DIR)/debug.h
-get.$(SUF):	$(SRC_DIR)/def.h
-get.$(SUF):	$(SRC_DIR)/types.h
-get.$(SUF):	$(EMH)/em_mes.h
-get.$(SUF):	$(EMH)/em_pseu.h
-get.$(SUF):	$(EMH)/em_mnem.h
-get.$(SUF):	$(EMH)/em_spec.h
-put.$(SUF):	$(SRC_DIR)/put.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/put.c
-put.$(SUF):	$(SRC_DIR)/put.h
-put.$(SUF):	$(SRC_DIR)/alloc.h
-put.$(SUF):	$(SRC_DIR)/lset.h
-put.$(SUF):	$(SRC_DIR)/map.h
-put.$(SUF):	$(SRC_DIR)/def.h
-put.$(SUF):	$(SRC_DIR)/debug.h
-put.$(SUF):	$(SRC_DIR)/global.h
-put.$(SUF):	$(SRC_DIR)/types.h
-put.$(SUF):	$(EMH)/em_spec.h
-put.$(SUF):	$(EMH)/em_pseu.h
-alloc.$(SUF):	$(SRC_DIR)/alloc.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/alloc.c
-alloc.$(SUF):	$(SRC_DIR)/alloc.h
-alloc.$(SUF):	$(SRC_DIR)/debug.h
-alloc.$(SUF):	$(SRC_DIR)/types.h
-lset.$(SUF):	$(SRC_DIR)/lset.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/lset.c
-lset.$(SUF):	$(SRC_DIR)/debug.h
-lset.$(SUF):	$(SRC_DIR)/alloc.h
-lset.$(SUF):	$(SRC_DIR)/lset.h
-lset.$(SUF):	$(SRC_DIR)/types.h
-cset.$(SUF):	$(SRC_DIR)/cset.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cset.c
-cset.$(SUF):	$(SRC_DIR)/global.h
-cset.$(SUF):	$(SRC_DIR)/debug.h
-cset.$(SUF):	$(SRC_DIR)/alloc.h
-cset.$(SUF):	$(SRC_DIR)/cset.h
-cset.$(SUF):	$(SRC_DIR)/types.h
-parser.$(SUF):	$(SRC_DIR)/parser.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/parser.c
-parser.$(SUF):	./classdefs.h
-parser.$(SUF):	$(SRC_DIR)/aux.h
-parser.$(SUF):	$(SRC_DIR)/lset.h
-parser.$(SUF):	$(SRC_DIR)/global.h
-parser.$(SUF):	$(SRC_DIR)/alloc.h
-parser.$(SUF):	$(SRC_DIR)/debug.h
-parser.$(SUF):	$(SRC_DIR)/types.h
-parser.$(SUF):	$(EMH)/em_mnem.h
-parser.$(SUF):	$(EMH)/em_spec.h
-stack_chg.$(SUF):	$(SRC_DIR)/stack_chg.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/stack_chg.c
-stack_chg.$(SUF):	$(SRC_DIR)/pop_push.h
-stack_chg.$(SUF):	$(SRC_DIR)/global.h
-stack_chg.$(SUF):	$(SRC_DIR)/debug.h
-stack_chg.$(SUF):	$(SRC_DIR)/types.h
-stack_chg.$(SUF):	$(EMH)/em_mnem.h
-stack_chg.$(SUF):	$(EMH)/em_spec.h
-locals.$(SUF):	$(SRC_DIR)/locals.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/locals.c
-locals.$(SUF):	$(SRC_DIR)/locals.h
-locals.$(SUF):	$(SRC_DIR)/alloc.h
-locals.$(SUF):	$(SRC_DIR)/aux.h
-locals.$(SUF):	$(SRC_DIR)/get.h
-locals.$(SUF):	$(SRC_DIR)/def.h
-locals.$(SUF):	$(SRC_DIR)/cset.h
-locals.$(SUF):	$(SRC_DIR)/lset.h
-locals.$(SUF):	$(SRC_DIR)/global.h
-locals.$(SUF):	$(SRC_DIR)/debug.h
-locals.$(SUF):	$(SRC_DIR)/types.h
-locals.$(SUF):	$(EMH)/em_mes.h
-locals.$(SUF):	$(EMH)/em_pseu.h
-locals.$(SUF):	$(EMH)/em_spec.h
-locals.$(SUF):	$(EMH)/em_mnem.h
-init_glob.$(SUF):	$(SRC_DIR)/init_glob.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/init_glob.c
-init_glob.$(SUF):	$(SRC_DIR)/map.h
-init_glob.$(SUF):	$(SRC_DIR)/alloc.h
-init_glob.$(SUF):	$(SRC_DIR)/global.h
-init_glob.$(SUF):	$(SRC_DIR)/debug.h
-init_glob.$(SUF):	$(SRC_DIR)/types.h
diff --git a/util/ego/sp/proto.make b/util/ego/sp/proto.make
deleted file mode 100644
index 358ff7d06..000000000
--- a/util/ego/sp/proto.make
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/sp
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/sp.c
-
-OFILES=\
-sp.$(SUF)
-
-HFILES=
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	sp
-
-sp:	$(OFILES)
-	$(CC) -o sp $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp sp $(EMLIB)/ego/sp
-
-cmp:	all
-	-cmp sp $(EMLIB)/ego/sp
-
-clean:
-	rm -f *.$(SUF) sp Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-sp.$(SUF):	$(SRC_DIR)/sp.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sp.c
-sp.$(SUF):	$(SRC_DIR)/../share/stack_chg.h
-sp.$(SUF):	$(SRC_DIR)/../share/go.h
-sp.$(SUF):	$(SRC_DIR)/../share/aux.h
-sp.$(SUF):	$(SRC_DIR)/../share/alloc.h
-sp.$(SUF):	$(SRC_DIR)/../share/map.h
-sp.$(SUF):	$(SRC_DIR)/../share/lset.h
-sp.$(SUF):	$(SRC_DIR)/../share/put.h
-sp.$(SUF):	$(SRC_DIR)/../share/get.h
-sp.$(SUF):	$(SRC_DIR)/../share/files.h
-sp.$(SUF):	$(SRC_DIR)/../share/global.h
-sp.$(SUF):	$(SRC_DIR)/../share/debug.h
-sp.$(SUF):	$(SRC_DIR)/../share/types.h
-sp.$(SUF):	$(EMH)/em_spec.h
-sp.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/sr/proto.make b/util/ego/sr/proto.make
deleted file mode 100644
index 2c8665c03..000000000
--- a/util/ego/sr/proto.make
+++ /dev/null
@@ -1,176 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/sr
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/sr.c \
-	$(SRC_DIR)/sr_aux.c \
-	$(SRC_DIR)/sr_cand.c \
-	$(SRC_DIR)/sr_expr.c \
-	$(SRC_DIR)/sr_iv.c \
-	$(SRC_DIR)/sr_reduce.c \
-	$(SRC_DIR)/sr_xform.c
-
-OFILES=\
-	sr.$(SUF) sr_aux.$(SUF) sr_cand.$(SUF) sr_expr.$(SUF) sr_iv.$(SUF) \
-	sr_reduce.$(SUF) sr_xform.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/sr.h \
-	$(SRC_DIR)/sr_aux.h \
-	$(SRC_DIR)/sr_cand.h \
-	$(SRC_DIR)/sr_expr.h \
-	$(SRC_DIR)/sr_iv.h \
-	$(SRC_DIR)/sr_reduce.h \
-	$(SRC_DIR)/sr_xform.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	sr
-
-sr:	$(OFILES)
-	$(CC) -o sr $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp sr $(EMLIB)/ego/sr
-
-cmp:	all
-	-cmp sr $(EMLIB)/ego/sr
-
-clean:
-	rm -f *.$(SUF) sr Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-sr.$(SUF):	$(SRC_DIR)/sr.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr.c
-sr.$(SUF):	$(SRC_DIR)/sr_iv.h
-sr.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr.$(SUF):	$(SRC_DIR)/../share/go.h
-sr.$(SUF):	$(SRC_DIR)/../share/alloc.h
-sr.$(SUF):	$(SRC_DIR)/../share/map.h
-sr.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr.$(SUF):	$(SRC_DIR)/../share/put.h
-sr.$(SUF):	$(SRC_DIR)/../share/get.h
-sr.$(SUF):	$(SRC_DIR)/../share/files.h
-sr.$(SUF):	$(SRC_DIR)/../share/global.h
-sr.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr.$(SUF):	$(SRC_DIR)/sr.h
-sr.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_aux.$(SUF):	$(SRC_DIR)/sr_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr_aux.c
-sr_aux.$(SUF):	$(SRC_DIR)/sr_xform.h
-sr_aux.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr_aux.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-sr_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr_aux.$(SUF):	$(SRC_DIR)/sr.h
-sr_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_aux.$(SUF):	$(EMH)/em_pseu.h
-sr_aux.$(SUF):	$(EMH)/em_mnem.h
-sr_cand.$(SUF):	$(SRC_DIR)/sr_cand.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr_cand.c
-sr_cand.$(SUF):	$(SRC_DIR)/sr_cand.h
-sr_cand.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr_cand.$(SUF):	$(SRC_DIR)/sr.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/map.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/global.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/cset.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr_cand.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_cand.$(SUF):	$(EMH)/em_pseu.h
-sr_cand.$(SUF):	$(EMH)/em_mnem.h
-sr_expr.$(SUF):	$(SRC_DIR)/sr_expr.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr_expr.c
-sr_expr.$(SUF):	$(SRC_DIR)/sr_iv.h
-sr_expr.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr_expr.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr_expr.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr_expr.$(SUF):	$(SRC_DIR)/../share/global.h
-sr_expr.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr_expr.$(SUF):	$(SRC_DIR)/sr.h
-sr_expr.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_expr.$(SUF):	$(EMH)/em_mnem.h
-sr_iv.$(SUF):	$(SRC_DIR)/sr_iv.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr_iv.c
-sr_iv.$(SUF):	$(SRC_DIR)/sr_iv.h
-sr_iv.$(SUF):	$(SRC_DIR)/sr_cand.h
-sr_iv.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/alloc.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/global.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/cset.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr_iv.$(SUF):	$(SRC_DIR)/sr.h
-sr_iv.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_iv.$(SUF):	$(EMH)/em_pseu.h
-sr_iv.$(SUF):	$(EMH)/em_mnem.h
-sr_reduce.$(SUF):	$(SRC_DIR)/sr_reduce.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr_reduce.c
-sr_reduce.$(SUF):	$(SRC_DIR)/sr_expr.h
-sr_reduce.$(SUF):	$(SRC_DIR)/sr_reduce.h
-sr_reduce.$(SUF):	$(SRC_DIR)/sr_xform.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr_reduce.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/global.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/def.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/alloc.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr_reduce.$(SUF):	$(SRC_DIR)/sr.h
-sr_reduce.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_reduce.$(SUF):	$(EMH)/em_spec.h
-sr_reduce.$(SUF):	$(EMH)/em_mnem.h
-sr_reduce.$(SUF):	$(EMH)/em_mes.h
-sr_reduce.$(SUF):	$(EMH)/em_reg.h
-sr_reduce.$(SUF):	$(EMH)/em_pseu.h
-sr_xform.$(SUF):	$(SRC_DIR)/sr_xform.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/sr_xform.c
-sr_xform.$(SUF):	$(SRC_DIR)/sr_xform.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/aux.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/lset.h
-sr_xform.$(SUF):	$(SRC_DIR)/sr_aux.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/get.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/def.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/alloc.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/global.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/debug.h
-sr_xform.$(SUF):	$(SRC_DIR)/sr.h
-sr_xform.$(SUF):	$(SRC_DIR)/../share/types.h
-sr_xform.$(SUF):	$(EMH)/em_spec.h
-sr_xform.$(SUF):	$(EMH)/em_pseu.h
-sr_xform.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/ego/ud/proto.make b/util/ego/ud/proto.make
deleted file mode 100644
index 5beb264da..000000000
--- a/util/ego/ud/proto.make
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/ego/ud
-EMH=$(TARGET_HOME)/h
-EMLIB=$(TARGET_HOME)/lib.bin
-
-LDFLAGS=$(LDOPTIONS)
-CPPFLAGS=-DVERBOSE -DNOTCOMPACT -I$(EMH) -I$(SRC_DIR) -I$(EMLIB)/ego
-CFLAGS=$(CPPFLAGS) $(COPTIONS)
-LINTFLAGS=$(CPPFLAGS) $(LINTOPTIONS)
-
-CFILES=\
-	$(SRC_DIR)/ud.c \
-	$(SRC_DIR)/ud_defs.c \
-	$(SRC_DIR)/ud_const.c \
-	$(SRC_DIR)/ud_copy.c \
-	$(SRC_DIR)/ud_aux.c
-
-OFILES=\
-	ud.$(SUF) ud_defs.$(SUF) ud_const.$(SUF) ud_copy.$(SUF) \
-	ud_aux.$(SUF)
-
-HFILES=\
-	$(SRC_DIR)/ud.h \
-	$(SRC_DIR)/ud_defs.h \
-	$(SRC_DIR)/ud_const.h \
-	$(SRC_DIR)/ud_copy.h \
-	$(SRC_DIR)/ud_aux.h
-
-PRFILES=\
-	$(CFILES) $(HFILES) $(SRC_DIR)/proto.make
-
-all:	ud
-
-ud:	$(OFILES)
-	$(CC) -o ud $(LDFLAGS) $(OFILES) $(EMLIB)/ego/share.$(LIBSUF) $(EMLIB)/em_data.$(LIBSUF)
-
-install:	all
-	cp ud $(EMLIB)/ego/ud
-
-cmp:	all
-	-cmp ud $(EMLIB)/ego/ud
-
-clean:
-	rm -f *.$(SUF) ud Out out nohup.out
-
-lint:
-	$(LINT) $(LINTFLAGS) $(CFILES) $(EMLIB)/ego/$(LINTPREF)share.$(LINTSUF) $(EMLIB)/$(LINTPREF)em_data.$(LINTSUF)
-
-pr:
-	@pr $(PRFILES)
-
-opr:
-	make pr | opr
-
-depend:
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(CPPFLAGS) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-# do not remove the next line
-#DEPENDENCIES
-ud.$(SUF):	$(SRC_DIR)/ud.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ud.c
-ud.$(SUF):	$(SRC_DIR)/ud_copy.h
-ud.$(SUF):	$(SRC_DIR)/ud_const.h
-ud.$(SUF):	$(SRC_DIR)/ud_defs.h
-ud.$(SUF):	$(SRC_DIR)/../share/go.h
-ud.$(SUF):	$(SRC_DIR)/../share/locals.h
-ud.$(SUF):	$(SRC_DIR)/../share/init_glob.h
-ud.$(SUF):	$(SRC_DIR)/../share/aux.h
-ud.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ud.$(SUF):	$(SRC_DIR)/../share/put.h
-ud.$(SUF):	$(SRC_DIR)/../share/get.h
-ud.$(SUF):	$(SRC_DIR)/../share/map.h
-ud.$(SUF):	$(SRC_DIR)/../share/files.h
-ud.$(SUF):	$(SRC_DIR)/../share/def.h
-ud.$(SUF):	$(SRC_DIR)/../share/cset.h
-ud.$(SUF):	$(SRC_DIR)/../share/lset.h
-ud.$(SUF):	$(SRC_DIR)/../share/global.h
-ud.$(SUF):	$(SRC_DIR)/../share/debug.h
-ud.$(SUF):	$(SRC_DIR)/ud.h
-ud.$(SUF):	$(SRC_DIR)/../share/types.h
-ud.$(SUF):	$(EMH)/em_spec.h
-ud_defs.$(SUF):	$(SRC_DIR)/ud_defs.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ud_defs.c
-ud_defs.$(SUF):	$(SRC_DIR)/../share/aux.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ud_defs.$(SUF):	$(SRC_DIR)/ud_defs.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/locals.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/map.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/cset.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/lset.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/global.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/debug.h
-ud_defs.$(SUF):	$(SRC_DIR)/ud.h
-ud_defs.$(SUF):	$(SRC_DIR)/../share/types.h
-ud_defs.$(SUF):	$(EMH)/em_mnem.h
-ud_const.$(SUF):	$(SRC_DIR)/ud_const.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ud_const.c
-ud_const.$(SUF):	$(SRC_DIR)/ud_aux.h
-ud_const.$(SUF):	$(SRC_DIR)/ud_const.h
-ud_const.$(SUF):	$(SRC_DIR)/ud_defs.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/locals.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/aux.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/def.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/cset.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/lset.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/global.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/debug.h
-ud_const.$(SUF):	$(SRC_DIR)/ud.h
-ud_const.$(SUF):	$(SRC_DIR)/../share/types.h
-ud_const.$(SUF):	$(EMH)/em_spec.h
-ud_const.$(SUF):	$(EMH)/em_pseu.h
-ud_const.$(SUF):	$(EMH)/em_mnem.h
-ud_copy.$(SUF):	$(SRC_DIR)/ud_copy.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ud_copy.c
-ud_copy.$(SUF):	$(SRC_DIR)/ud_aux.h
-ud_copy.$(SUF):	$(SRC_DIR)/ud_const.h
-ud_copy.$(SUF):	$(SRC_DIR)/ud_copy.h
-ud_copy.$(SUF):	$(SRC_DIR)/../ud/ud_defs.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/locals.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/aux.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/def.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/cset.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/lset.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/global.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/debug.h
-ud_copy.$(SUF):	$(SRC_DIR)/ud.h
-ud_copy.$(SUF):	$(SRC_DIR)/../share/types.h
-ud_copy.$(SUF):	$(EMH)/em_spec.h
-ud_copy.$(SUF):	$(EMH)/em_pseu.h
-ud_copy.$(SUF):	$(EMH)/em_mnem.h
-ud_aux.$(SUF):	$(SRC_DIR)/ud_aux.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/ud_aux.c
-ud_aux.$(SUF):	$(SRC_DIR)/ud_defs.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/aux.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/locals.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/def.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/cset.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/lset.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/alloc.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/global.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/debug.h
-ud_aux.$(SUF):	$(SRC_DIR)/ud.h
-ud_aux.$(SUF):	$(SRC_DIR)/../share/types.h
-ud_aux.$(SUF):	$(EMH)/em_spec.h
-ud_aux.$(SUF):	$(EMH)/em_pseu.h
-ud_aux.$(SUF):	$(EMH)/em_mnem.h
diff --git a/util/led/build.mk b/util/led/build.mk
deleted file mode 100644
index 419948a13..000000000
--- a/util/led/build.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-D := util/led
-
-define build-led-impl
-	$(call reset)
-	$(call cfile, $D/archive.c)
-	$(call cfile, $D/error.c)
-	$(call cfile, $D/extract.c)
-	$(call cfile, $D/finish.c)
-	$(call cfile, $D/main.c)
-	$(call cfile, $D/memory.c)
-	$(call cfile, $D/output.c)
-	$(call cfile, $D/read.c)
-	$(call cfile, $D/relocate.c)
-	$(call cfile, $D/save.c)
-	$(call cfile, $D/scan.c)
-	$(call cfile, $D/sym.c)
-	$(call cfile, $D/write.c)
-
-	$(call rawfile, $(LIBSTRING))
-	$(call rawfile, $(LIBOBJECT))
-
-	$(call cprogram, $(BINDIR)/em_led)
-	$(call installto, $(PLATDEP)/em_led)
-
-	$(call reset)
-	$(eval q := $D/ack.out.5)
-	$(call installto, $(INSDIR)/share/man/man5/ack.out.5)
-
-	$(call reset)
-	$(eval q := $D/led.6)
-	$(call installto, $(INSDIR)/share/man/man6/led.6)
-endef
-
-$(eval $(build-led-impl))
diff --git a/util/misc/build.mk b/util/misc/build.mk
deleted file mode 100644
index 95b6fb2d9..000000000
--- a/util/misc/build.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-D := util/misc
-
-define build-misc-impl
-	$(call reset)
-	$(call cfile, $D/esize.c)
-	$(call cprogram, $(BINDIR)/esize)
-	$(call installto, $(INSDIR)/bin/esize)
-
-	$(call reset)
-	$(eval q := $D/esize.1)
-	$(call installto, $(INSDIR)/share/man/man1/esize.1)
-
-	$(call reset)
-	$(eval objdir := encode)
-	$(call cfile, $D/convert.c)
-	$(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h)
-	$(call rawfile, $(LIBREAD_EMEV))
-	$(call rawfile, $(LIBEMK))
-	$(call rawfile, $(LIBEM_DATA))
-	$(call rawfile, $(LIBALLOC))
-	$(call rawfile, $(LIBPRINT))
-	$(call rawfile, $(LIBSTRING))
-	$(call rawfile, $(LIBSYSTEM))
-	$(call cprogram, $(BINDIR)/em_encode)
-	$(call installto, $(PLATDEP)/em_encode)
-	$(eval EM_ENCODE := $o)
-	$(eval ACK_CORE_TOOLS += $o)
-
-	$(call reset)
-	$(eval objdir := decode)
-	$(call cfile, $D/convert.c)
-	$(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h)
-	$(call rawfile, $(LIBREAD_EMKV))
-	$(call rawfile, $(LIBEME))
-	$(call rawfile, $(LIBEM_DATA))
-	$(call rawfile, $(LIBALLOC))
-	$(call rawfile, $(LIBPRINT))
-	$(call rawfile, $(LIBSTRING))
-	$(call rawfile, $(LIBSYSTEM))
-	$(call cprogram, $(BINDIR)/em_decode)
-	$(call installto, $(PLATDEP)/em_decode)
-	$(eval EM_DECODE := $o)
-
-	$(call reset)
-	$(eval q := $D/em_decode.6)
-	$(call installto, $(INSDIR)/share/man/man6/em_decode.6)
-endef
-
-$(eval $(build-misc-impl))
diff --git a/util/ncgg/build.mk b/util/ncgg/build.mk
deleted file mode 100644
index 9c3eef3da..000000000
--- a/util/ncgg/build.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-D := util/ncgg
-
-define build-ncgg-impl
-
-$(call reset)
-$(eval cflags += -I$D)
-
-$(call yacc, $(OBJDIR)/$D, $D/cgg.y)
-
-$(call flex, $(OBJDIR)/$D, $D/scan.l)
-$(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-$(call cfile, $D/subr.c)
-$(call cfile, $D/main.c)
-$(call cfile, $D/coerc.c)
-$(call cfile, $D/error.c)
-$(call cfile, $D/emlookup.c)
-$(call cfile, $D/expr.c)
-$(call cfile, $D/instruct.c)
-$(call cfile, $D/iocc.c)
-$(call cfile, $D/lookup.c)
-$(call cfile, $D/output.c)
-$(call cfile, $D/set.c)
-$(call cfile, $D/strlookup.c)
-$(call cfile, $D/var.c)
-$(call cfile, $D/hall.c)
-
-$(eval CLEANABLES += $(OBJDIR)/$D/enterkeyw.c)
-$(OBJDIR)/$D/enterkeyw.c: $D/cvtkeywords $D/keywords $(OBJDIR)/$D/y.tab.h
-	@echo KEYWORDS $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) cd $$(dir $$@) && sh $(abspath $D/cvtkeywords) $(abspath $D/keywords)
-$(call cfile, $(OBJDIR)/$D/enterkeyw.c)
-
-$(eval $q: $(INCDIR)/em_spec.h)
-
-$(call rawfile, $(LIBEM_DATA))
-$(call cprogram, $(BINDIR)/ncgg)
-$(eval NCGG := $o)
-
-endef
-
-$(eval $(build-ncgg-impl))
diff --git a/util/ncgg/proto.make b/util/ncgg/proto.make
deleted file mode 100644
index 9adc5cd46..000000000
--- a/util/ncgg/proto.make
+++ /dev/null
@@ -1,255 +0,0 @@
-# Header: Makefile,v 0.8 87/11/16 10:35:32 ceriel Exp $
-
-#PARAMS		do not remove this line!
-
-CFILES=	cgg.c $(SRC_DIR)/subr.c $(SRC_DIR)/main.c $(SRC_DIR)/coerc.c \
-	enterkeyw.c $(SRC_DIR)/error.c $(SRC_DIR)/emlookup.c $(SRC_DIR)/expr.c \
-	$(SRC_DIR)/instruct.c $(SRC_DIR)/iocc.c $(SRC_DIR)/lookup.c \
-	$(SRC_DIR)/output.c $(SRC_DIR)/set.c $(SRC_DIR)/strlookup.c \
-	$(SRC_DIR)/var.c $(SRC_DIR)/hall.c
-OFILES= cgg.$(SUF) subr.$(SUF) main.$(SUF) coerc.$(SUF) enterkeyw.$(SUF) \
-	error.$(SUF) emlookup.$(SUF) expr.$(SUF) instruct.$(SUF) iocc.$(SUF) \
-	lookup.$(SUF) set.$(SUF) strlookup.$(SUF) var.$(SUF) hall.$(SUF)
-SOURCES=$(SRC_DIR)/*.h $(SRC_DIR)/cgg.y $(SRC_DIR)/scan.l \
-	$(SRC_DIR)/cvtkeywords $(SRC_DIR)/keywords $(SRC_DIR)/coerc.c \
-	$(SRC_DIR)/emlookup.c $(SRC_DIR)/error.c $(SRC_DIR)/expr.c \
-	$(SRC_DIR)/hall.c $(SRC_DIR)/instruct.c $(SRC_DIR)/iocc.c \
-	$(SRC_DIR)/lookup.c $(SRC_DIR)/main.c $(SRC_DIR)/output.c \
-	$(SRC_DIR)/set.c $(SRC_DIR)/strlookup.c $(SRC_DIR)/subr.c \
-	$(SRC_DIR)/var.c
-
-SRC_DIR=$(SRC_HOME)/util/ncgg
-EMH=$(TARGET_HOME)/h
-INCLUDES=-I$(EMH) -I$(TARGET_HOME)/config -I$(SRC_DIR) -I.
-CFLAGS=$(INCLUDES) $(COPTIONS) -DNDEBUG
-YFLAGS=-d
-LDFLAGS=$(LDOPTIONS)
-LINTFLAGS=$(INCLUDES) $(LINTOPTIONS)
-
-
-cgg:	cgg.$(SUF) $(OFILES) output.$(SUF)
-	$(CC) $(LDFLAGS) $(OFILES) output.$(SUF) $(TARGET_HOME)/lib.bin/em_data.$(LIBSUF) -o cgg
-
-install:	cgg
-	cp cgg $(TARGET_HOME)/lib.bin/ncgg
-	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then	mk_manpage $(SRC_DIR)/ncgg.6 $(TARGET_HOME) ; \
-	fi
-
-cmp:	cgg
-	-cmp cgg $(TARGET_HOME)/lib.bin/ncgg
-
-debugcgg:	cgg.$(SUF) $(OFILES) debugoutput.$(SUF)
-	$(CC) $(LDFLAGS) $(OFILES) debugoutput.$(SUF) $(TARGET_HOME)/lib.bin/em_data.$(LIBSUF) -o cgg
-
-cgg.c:	$(SRC_DIR)/cgg.y
-	yacc $(YFLAGS) $(SRC_DIR)/cgg.y && mv y.tab.c cgg.c
-
-enterkeyw.c:	$(SRC_DIR)/cvtkeywords $(SRC_DIR)/keywords y.tab.h
-	$(SRC_DIR)/cvtkeywords $(SRC_DIR)/keywords
-
-debugoutput.$(SUF):	debugoutput.c
-	$(CC) $(CFLAGS) -DCODEDEBUG -c debugoutput.c
-
-debugoutput.c:	$(SRC_DIR)/output.c
-	cp $(SRC_DIR)/output.c debugoutput.c
-
-lint:	$(CFILES)
-	$(LINT) $(LINTFLAGS) $(CFILES)
-
-clean:
-	rm -f cgg.c scan.c y.output y.tab.h enterkeyw.c debugoutput.c
-	rm -f $(OFILES) output.$(SUF) debugoutput.$(SUF) cgg lint
-
-scan.c:	$(SRC_DIR)/scan.l
-	flex -st $(SRC_DIR)/scan.l > scan.c
-
-pr:
-	@pr $(SOURCES)
-
-opr:
-	-make pr|opr
-
-depend: $(CFILES) scan.c
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(INCLUDES) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-#DEPENDENCIES
-cgg.$(SUF):	cgg.c
-	$(CC) -c $(CFLAGS) cgg.c
-cgg.$(SUF):	scan.c
-cgg.$(SUF):	$(TARGET_HOME)/h/em_reg.h
-cgg.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-cgg.$(SUF):	$(SRC_DIR)/extern.h
-cgg.$(SUF):	$(SRC_DIR)/expr.h
-cgg.$(SUF):	$(SRC_DIR)/cost.h
-cgg.$(SUF):	$(SRC_DIR)/instruct.h
-cgg.$(SUF):	$(SRC_DIR)/iocc.h
-cgg.$(SUF):	$(SRC_DIR)/set.h
-cgg.$(SUF):	$(SRC_DIR)/lookup.h
-cgg.$(SUF):	$(SRC_DIR)/varinfo.h
-cgg.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-cgg.$(SUF):	$(TARGET_HOME)/config/local.h
-cgg.$(SUF):	$(SRC_DIR)/param.h
-subr.$(SUF):	$(SRC_DIR)/subr.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/subr.c
-subr.$(SUF):	$(SRC_DIR)/extern.h
-subr.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-subr.$(SUF):	$(SRC_DIR)/regvar.h
-subr.$(SUF):	$(SRC_DIR)/token.h
-subr.$(SUF):	$(SRC_DIR)/cost.h
-subr.$(SUF):	$(SRC_DIR)/instruct.h
-subr.$(SUF):	$(SRC_DIR)/varinfo.h
-subr.$(SUF):	$(SRC_DIR)/set.h
-subr.$(SUF):	$(SRC_DIR)/expr.h
-subr.$(SUF):	$(SRC_DIR)/property.h
-subr.$(SUF):	$(SRC_DIR)/lookup.h
-subr.$(SUF):	$(SRC_DIR)/reg.h
-subr.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-subr.$(SUF):	$(TARGET_HOME)/config/local.h
-subr.$(SUF):	$(SRC_DIR)/param.h
-main.$(SUF):	$(SRC_DIR)/main.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/main.c
-coerc.$(SUF):	$(SRC_DIR)/coerc.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/coerc.c
-coerc.$(SUF):	$(SRC_DIR)/extern.h
-coerc.$(SUF):	$(SRC_DIR)/pseudo.h
-coerc.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-coerc.$(SUF):	$(SRC_DIR)/iocc.h
-coerc.$(SUF):	$(SRC_DIR)/varinfo.h
-coerc.$(SUF):	$(SRC_DIR)/cost.h
-coerc.$(SUF):	$(SRC_DIR)/token.h
-coerc.$(SUF):	$(SRC_DIR)/reg.h
-coerc.$(SUF):	$(SRC_DIR)/property.h
-coerc.$(SUF):	$(SRC_DIR)/set.h
-coerc.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-coerc.$(SUF):	$(TARGET_HOME)/config/local.h
-coerc.$(SUF):	$(SRC_DIR)/param.h
-coerc.$(SUF):	$(SRC_DIR)/assert.h
-enterkeyw.$(SUF):	enterkeyw.c
-	$(CC) -c $(CFLAGS) enterkeyw.c
-enterkeyw.$(SUF):	$(SRC_DIR)/lookup.h
-error.$(SUF):	$(SRC_DIR)/error.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/error.c
-emlookup.$(SUF):	$(SRC_DIR)/emlookup.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/emlookup.c
-emlookup.$(SUF):	$(TARGET_HOME)/h/em_flag.h
-emlookup.$(SUF):	$(SRC_DIR)/expr.h
-emlookup.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-emlookup.$(SUF):	$(TARGET_HOME)/config/local.h
-emlookup.$(SUF):	$(SRC_DIR)/param.h
-expr.$(SUF):	$(SRC_DIR)/expr.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/expr.c
-expr.$(SUF):	$(SRC_DIR)/extern.h
-expr.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-expr.$(SUF):	$(SRC_DIR)/regvar.h
-expr.$(SUF):	$(SRC_DIR)/expr.h
-expr.$(SUF):	$(SRC_DIR)/property.h
-expr.$(SUF):	$(SRC_DIR)/cost.h
-expr.$(SUF):	$(SRC_DIR)/token.h
-expr.$(SUF):	$(SRC_DIR)/lookup.h
-expr.$(SUF):	$(SRC_DIR)/reg.h
-expr.$(SUF):	$(SRC_DIR)/set.h
-expr.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-expr.$(SUF):	$(TARGET_HOME)/config/local.h
-expr.$(SUF):	$(SRC_DIR)/param.h
-expr.$(SUF):	$(SRC_DIR)/assert.h
-instruct.$(SUF):	$(SRC_DIR)/instruct.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/instruct.c
-instruct.$(SUF):	$(SRC_DIR)/extern.h
-instruct.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-instruct.$(SUF):	$(SRC_DIR)/iocc.h
-instruct.$(SUF):	$(SRC_DIR)/expr.h
-instruct.$(SUF):	$(SRC_DIR)/set.h
-instruct.$(SUF):	$(SRC_DIR)/varinfo.h
-instruct.$(SUF):	$(SRC_DIR)/pseudo.h
-instruct.$(SUF):	$(SRC_DIR)/cost.h
-instruct.$(SUF):	$(SRC_DIR)/instruct.h
-instruct.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-instruct.$(SUF):	$(TARGET_HOME)/config/local.h
-instruct.$(SUF):	$(SRC_DIR)/param.h
-iocc.$(SUF):	$(SRC_DIR)/iocc.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/iocc.c
-iocc.$(SUF):	$(SRC_DIR)/extern.h
-iocc.$(SUF):	$(SRC_DIR)/regvar.h
-iocc.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-iocc.$(SUF):	$(SRC_DIR)/iocc.h
-iocc.$(SUF):	$(SRC_DIR)/property.h
-iocc.$(SUF):	$(SRC_DIR)/cost.h
-iocc.$(SUF):	$(SRC_DIR)/token.h
-iocc.$(SUF):	$(SRC_DIR)/lookup.h
-iocc.$(SUF):	$(SRC_DIR)/expr.h
-iocc.$(SUF):	$(SRC_DIR)/set.h
-iocc.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-iocc.$(SUF):	$(TARGET_HOME)/config/local.h
-iocc.$(SUF):	$(SRC_DIR)/param.h
-iocc.$(SUF):	$(SRC_DIR)/assert.h
-lookup.$(SUF):	$(SRC_DIR)/lookup.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/lookup.c
-lookup.$(SUF):	$(SRC_DIR)/lookup.h
-lookup.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-lookup.$(SUF):	$(TARGET_HOME)/config/local.h
-lookup.$(SUF):	$(SRC_DIR)/param.h
-lookup.$(SUF):	$(SRC_DIR)/assert.h
-output.$(SUF):	$(SRC_DIR)/output.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/output.c
-output.$(SUF):	$(SRC_DIR)/extern.h
-output.$(SUF):	$(SRC_DIR)/regvar.h
-output.$(SUF):	$(SRC_DIR)/pseudo.h
-output.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-output.$(SUF):	$(SRC_DIR)/lookup.h
-output.$(SUF):	$(SRC_DIR)/instruct.h
-output.$(SUF):	$(SRC_DIR)/set.h
-output.$(SUF):	$(SRC_DIR)/cost.h
-output.$(SUF):	$(SRC_DIR)/token.h
-output.$(SUF):	$(SRC_DIR)/property.h
-output.$(SUF):	$(SRC_DIR)/reg.h
-output.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-output.$(SUF):	$(TARGET_HOME)/config/local.h
-output.$(SUF):	$(SRC_DIR)/param.h
-output.$(SUF):	$(SRC_DIR)/varinfo.h
-output.$(SUF):	$(SRC_DIR)/assert.h
-set.$(SUF):	$(SRC_DIR)/set.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/set.c
-set.$(SUF):	$(SRC_DIR)/extern.h
-set.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-set.$(SUF):	$(SRC_DIR)/reg.h
-set.$(SUF):	$(SRC_DIR)/lookup.h
-set.$(SUF):	$(SRC_DIR)/cost.h
-set.$(SUF):	$(SRC_DIR)/token.h
-set.$(SUF):	$(SRC_DIR)/set.h
-set.$(SUF):	$(SRC_DIR)/property.h
-set.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-set.$(SUF):	$(TARGET_HOME)/config/local.h
-set.$(SUF):	$(SRC_DIR)/param.h
-strlookup.$(SUF):	$(SRC_DIR)/strlookup.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/strlookup.c
-strlookup.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-strlookup.$(SUF):	$(TARGET_HOME)/config/local.h
-strlookup.$(SUF):	$(SRC_DIR)/param.h
-var.$(SUF):	$(SRC_DIR)/var.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/var.c
-var.$(SUF):	$(TARGET_HOME)/h/cgg_cg.h
-var.$(SUF):	$(SRC_DIR)/lookup.h
-var.$(SUF):	$(SRC_DIR)/instruct.h
-var.$(SUF):	$(SRC_DIR)/set.h
-var.$(SUF):	$(SRC_DIR)/cost.h
-var.$(SUF):	$(SRC_DIR)/token.h
-var.$(SUF):	$(SRC_DIR)/property.h
-var.$(SUF):	$(SRC_DIR)/reg.h
-var.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-var.$(SUF):	$(TARGET_HOME)/config/local.h
-var.$(SUF):	$(SRC_DIR)/param.h
-hall.$(SUF):	$(SRC_DIR)/hall.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/hall.c
-hall.$(SUF):	$(SRC_DIR)/set.h
-hall.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-hall.$(SUF):	$(TARGET_HOME)/config/local.h
-hall.$(SUF):	$(SRC_DIR)/param.h
-hall.$(SUF):	$(SRC_DIR)/assert.h
diff --git a/util/opt/build.mk b/util/opt/build.mk
deleted file mode 100644
index a4e62ced7..000000000
--- a/util/opt/build.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-D := util/opt
-
-define build-opt-mktab-impl
-
-$(call reset)
-$(eval cflags += -I$D)
-
-$(call yacc, $(OBJDIR)/$D, $D/mktab.y)
-
-$(call flex, $(OBJDIR)/$D, $D/scan.l)
-$(call dependson, $(OBJDIR)/$D/y.tab.h)
-
-$(call rawfile, $(LIBEM_DATA))
-$(call cprogram, $(OBJDIR)/$D/mktab)
-
-endef
-
-.PHONY: -lfl
--lfl:
-
-define build-opt-impl
-
-$(call reset)
-$(eval objdir := $1)
-
-$(eval cflags += -I$D $2)
-$(call cfile, $D/main.c)
-$(call cfile, $D/getline.c)
-$(call cfile, $D/lookup.c)
-$(call cfile, $D/var.c)
-$(call cfile, $D/process.c)
-$(call cfile, $D/backward.c)
-$(call cfile, $D/util.c)
-$(call cfile, $D/alloc.c)
-$(call cfile, $D/putline.c)
-$(call cfile, $D/cleanup.c)
-$(call cfile, $D/peephole.c)
-$(call cfile, $D/flow.c)
-$(call cfile, $D/tes.c)
-$(call cfile, $D/reg.c)
-
-$(eval g := $(OBJDIR)/$D/$(objdir)/pop_push.c)
-$(eval CLEANABLES += $g)
-$g: $D/pop_push.awk h/em_table
-	@echo POP_PUSH $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) awk -f $D/pop_push.awk < h/em_table > $$@
-$(call cfile, $g)
-
-$(eval g := $(OBJDIR)/$D/$(objdir)/pattern.c)
-$(eval CLEANABLES += $g)
-$g: $(OBJDIR)/$D/mktab $D/patterns $(BINDIR)/cpp.ansi
-	@echo PATTERNS $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $(BINDIR)/cpp.ansi < $D/patterns | $(OBJDIR)/$D/mktab > $$@
-$(call cfile, $g)
-
-$(call rawfile, $(LIBEM_DATA))
-$(call rawfile, $(LIBASSERT))
-$(call rawfile, $(LIBPRINT))
-$(call rawfile, $(LIBALLOC))
-$(call rawfile, $(LIBSYSTEM))
-$(call rawfile, $(LIBSTRING))
-
-$(eval $q: $(INCDIR)/em_spec.h)
-
-$(call cprogram, $(BINDIR)/$(strip $1))
-$(call installto, $(PLATDEP)/$(strip $1))
-$(eval ACK_CORE_TOOLS += $o)
-
-endef
-
-define build-opt-manpage-impl
-
-$(call reset)
-$(eval q := $D/em_opt.6)
-$(call installto, $(INSDIR)/share/man/man6/em_opt.6)
-
-endef
-
-$(eval $(build-opt-mktab-impl))
-$(eval $(call build-opt-impl, em_opt,))
-$(eval $(call build-opt-impl, em_opt2, -DGLOBAL_OPT))
-$(eval $(build-opt-manpage-impl))
diff --git a/util/opt/proto.make b/util/opt/proto.make
deleted file mode 100644
index 04107146f..000000000
--- a/util/opt/proto.make
+++ /dev/null
@@ -1,300 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR = $(SRC_HOME)/util/opt
-
-CFILES=	$(SRC_DIR)/main.c $(SRC_DIR)/getline.c $(SRC_DIR)/lookup.c \
-	$(SRC_DIR)/var.c $(SRC_DIR)/process.c $(SRC_DIR)/backward.c \
-	$(SRC_DIR)/util.c $(SRC_DIR)/alloc.c $(SRC_DIR)/putline.c \
-	$(SRC_DIR)/cleanup.c $(SRC_DIR)/peephole.c $(SRC_DIR)/flow.c \
-	$(SRC_DIR)/reg.c $(SRC_DIR)/tes.c pop_push.c
-
-OFILES=	main.$(SUF) getline.$(SUF) lookup.$(SUF) var.$(SUF) process.$(SUF) backward.$(SUF) util.$(SUF)\
-	alloc.$(SUF) putline.$(SUF) cleanup.$(SUF) peephole.$(SUF) flow.$(SUF) tes.$(SUF) pop_push.$(SUF)
-ONOGLOB=regnoglob.$(SUF)
-OGLOB=regglob.$(SUF)
-
-LIBS=	$(TARGET_HOME)/lib.bin/em_data.$(LIBSUF)
-ULIBS=	$(UTIL_HOME)/lib.bin/em_data.$(ULIBSUF)
-INCLUDES=-I$(TARGET_HOME)/h -I$(SRC_DIR) -I.
-UINCLUDES=-I$(TARGET_HOME)/h -I$(SRC_DIR) -I.
-CFLAGS= -DNDEBUG $(INCLUDES) $(COPTIONS)
-UCFLAGS= -DNDEBUG $(INCLUDES) $(UCOPTIONS)
-LDFLAGS=$(LDOPTIONS)
-ULDFLAGS=$(ULDOPTIONS)
-LINTFLAGS=$(INCLUDES) -DNDEBUG -DNORCSID $(LINTOPTIONS)
-CPP=$(UTIL_HOME)/lib.bin/cpp
-
-all:	opt opt2
-
-opt:	$(OFILES) $(ONOGLOB) pattern.$(SUF) $(LIBS)
-	$(CC) $(LDFLAGS) $(CFLAGS) $(OFILES) $(ONOGLOB) pattern.$(SUF) $(LIBS) -o opt
-
-opt2:	$(OFILES) $(OGLOB) pattern.$(SUF) $(LIBS)
-	$(CC) $(LDFLAGS) $(CFLAGS) $(OFILES) $(OGLOB) pattern.$(SUF) $(LIBS) -o opt2
-
-test:	opt testopt
-	testopt
-
-cmp:	all
-	-cmp opt $(TARGET_HOMTARGET_HOME)/lib.bin/em_opt
-	-cmp opt2 $(TARGET_HOME)/lib.bin/em_opt2
-
-install:all
-	cp opt $(TARGET_HOME)/lib.bin/em_opt
-	cp opt2 $(TARGET_HOME)/lib.bin/em_opt2
-	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then	mk_manpage $(SRC_DIR)/em_opt.6 $(TARGET_HOME) ; \
-	fi
-
-pattern.c:	$(SRC_DIR)/patterns mktab
-	$(CPP) $(SRC_DIR)/patterns | mktab > pattern.c
-
-mktab:	mktab.$(USUF) $(ULIBS)
-	$(UCC) $(ULDFLAGS) mktab.$(USUF) $(ULIBS) -o mktab
-
-mktab.$(USUF):	scan.c $(SRC_DIR)/optim.h $(SRC_DIR)/param.h $(SRC_DIR)/pattern.h $(SRC_DIR)/types.h mktab.c
-	$(UCC) -c $(UCFLAGS) mktab.c
-
-mktab.c:	$(SRC_DIR)/mktab.y
-	yacc $(SRC_DIR)/mktab.y && mv y.tab.c mktab.c
-
-pop_push.c: $(SRC_HOME)/etc/em_table $(SRC_DIR)/pop_push.awk
-	awk -f $(SRC_DIR)/pop_push.awk < $(SRC_HOME)/etc/em_table > pop_push.c
-
-regglob.c:	$(SRC_DIR)/reg.c
-	echo '#define GLOBAL_OPT' > regglob.c
-	cat $(SRC_DIR)/reg.c >> regglob.c
-
-regnoglob.c:	$(SRC_DIR)/reg.c
-	cp $(SRC_DIR)/reg.c regnoglob.c
-
-depend: pattern.c pop_push.c regglob.c regnoglob.c
-	rm_deps Makefile >Makefile.new
-	for i in $(CFILES) pattern.c regglob.c regnoglob.c ; do \
-		echo "`basename $$i .c`.$$(SUF):	$$i" >> Makefile.new ; \
-		echo '	$$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \
-		$(UTIL_HOME)/lib.bin/cpp -d $(INCLUDES) $$i | sed "s/^/`basename $$i .c`.$$(SUF):	/" >> Makefile.new ; \
-	done
-	mv Makefile Makefile.old
-	mv Makefile.new Makefile
-
-lint:	$(CFILES) pattern.c
-	$(LINT) $(LINTFLAGS) $(CFILES) pattern.c $(UTIL_HOME)/lib.bin/$(LINTPREF)em_data.$(LINTSUF)
-
-opr:
-	make pr | opr
-
-pr:
-	@pr -n $(SRC_DIR)/proto.make $(SRC_DIR)/*.h $(CFILES) $(SRC_DIR)/mktab.y $(SRC_DIR)/scan.l $(SRC_DIR)/patterns
-
-clean:
-	rm -f *.$(SUF) opt mktab mktab.c scan.c pattern.c opt2 Out \
-		pop_push.c regglob.c regnoglob.c *.old
-
-scan.c:	$(SRC_DIR)/scan.l
-	flex -st $(SRC_DIR)/scan.l > scan.c
-
-# the next lines are generated automatically
-#DEPENDENCIES
-main.$(SUF):	$(SRC_DIR)/main.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/main.c
-main.$(SUF):	$(SRC_DIR)/ext.h
-main.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-main.$(SUF):	$(SRC_DIR)/alloc.h
-main.$(SUF):	$(SRC_DIR)/tes.h
-main.$(SUF):	$(SRC_DIR)/types.h
-main.$(SUF):	$(SRC_DIR)/param.h
-getline.$(SUF):	$(SRC_DIR)/getline.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/getline.c
-getline.$(SUF):	$(SRC_DIR)/ext.h
-getline.$(SUF):	$(TARGET_HOME)/h/em_mes.h
-getline.$(SUF):	$(TARGET_HOME)/h/em_flag.h
-getline.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-getline.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-getline.$(SUF):	$(SRC_DIR)/proinf.h
-getline.$(SUF):	$(SRC_DIR)/alloc.h
-getline.$(SUF):	$(SRC_DIR)/lookup.h
-getline.$(SUF):	$(SRC_DIR)/line.h
-getline.$(SUF):	$(SRC_DIR)/tes.h
-getline.$(SUF):	$(SRC_DIR)/types.h
-getline.$(SUF):	$(SRC_DIR)/param.h
-lookup.$(SUF):	$(SRC_DIR)/lookup.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/lookup.c
-lookup.$(SUF):	$(SRC_DIR)/proinf.h
-lookup.$(SUF):	$(SRC_DIR)/alloc.h
-lookup.$(SUF):	$(SRC_DIR)/lookup.h
-lookup.$(SUF):	$(SRC_DIR)/tes.h
-lookup.$(SUF):	$(SRC_DIR)/types.h
-lookup.$(SUF):	$(SRC_DIR)/param.h
-var.$(SUF):	$(SRC_DIR)/var.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/var.c
-var.$(SUF):	$(SRC_DIR)/proinf.h
-var.$(SUF):	$(SRC_DIR)/lookup.h
-var.$(SUF):	$(SRC_DIR)/tes.h
-var.$(SUF):	$(SRC_DIR)/types.h
-var.$(SUF):	$(SRC_DIR)/param.h
-process.$(SUF):	$(SRC_DIR)/process.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/process.c
-process.$(SUF):	$(SRC_DIR)/ext.h
-process.$(SUF):	$(SRC_DIR)/proinf.h
-process.$(SUF):	$(SRC_DIR)/lookup.h
-process.$(SUF):	$(SRC_DIR)/line.h
-process.$(SUF):	$(SRC_DIR)/alloc.h
-process.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-process.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-process.$(SUF):	$(SRC_DIR)/assert.h
-process.$(SUF):	$(SRC_DIR)/tes.h
-process.$(SUF):	$(SRC_DIR)/types.h
-process.$(SUF):	$(SRC_DIR)/param.h
-backward.$(SUF):	$(SRC_DIR)/backward.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/backward.c
-backward.$(SUF):	$(SRC_DIR)/ext.h
-backward.$(SUF):	$(TARGET_HOME)/h/em_mes.h
-backward.$(SUF):	$(TARGET_HOME)/h/em_mnem.h
-backward.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-backward.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-backward.$(SUF):	$(SRC_DIR)/proinf.h
-backward.$(SUF):	$(SRC_DIR)/alloc.h
-backward.$(SUF):	$(SRC_DIR)/lookup.h
-backward.$(SUF):	$(SRC_DIR)/line.h
-backward.$(SUF):	$(SRC_DIR)/assert.h
-backward.$(SUF):	$(SRC_DIR)/tes.h
-backward.$(SUF):	$(SRC_DIR)/types.h
-backward.$(SUF):	$(SRC_DIR)/param.h
-util.$(SUF):	$(SRC_DIR)/util.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/util.c
-util.$(SUF):	$(SRC_DIR)/ext.h
-util.$(SUF):	$(SRC_DIR)/optim.h
-util.$(SUF):	$(SRC_DIR)/proinf.h
-util.$(SUF):	$(SRC_DIR)/lookup.h
-util.$(SUF):	$(SRC_DIR)/assert.h
-util.$(SUF):	$(SRC_DIR)/tes.h
-util.$(SUF):	$(SRC_DIR)/types.h
-util.$(SUF):	$(SRC_DIR)/param.h
-alloc.$(SUF):	$(SRC_DIR)/alloc.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/alloc.c
-alloc.$(SUF):	$(SRC_DIR)/proinf.h
-alloc.$(SUF):	$(SRC_DIR)/lookup.h
-alloc.$(SUF):	$(SRC_DIR)/line.h
-alloc.$(SUF):	$(SRC_DIR)/alloc.h
-alloc.$(SUF):	$(SRC_DIR)/assert.h
-alloc.$(SUF):	$(SRC_DIR)/tes.h
-alloc.$(SUF):	$(SRC_DIR)/types.h
-alloc.$(SUF):	$(SRC_DIR)/param.h
-putline.$(SUF):	$(SRC_DIR)/putline.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/putline.c
-putline.$(SUF):	$(SRC_DIR)/ext.h
-putline.$(SUF):	$(SRC_DIR)/optim.h
-putline.$(SUF):	$(SRC_DIR)/proinf.h
-putline.$(SUF):	$(SRC_DIR)/lookup.h
-putline.$(SUF):	$(SRC_DIR)/line.h
-putline.$(SUF):	$(SRC_DIR)/alloc.h
-putline.$(SUF):	$(TARGET_HOME)/h/em_flag.h
-putline.$(SUF):	$(TARGET_HOME)/h/em_mnem.h
-putline.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-putline.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-putline.$(SUF):	$(SRC_DIR)/assert.h
-putline.$(SUF):	$(SRC_DIR)/tes.h
-putline.$(SUF):	$(SRC_DIR)/types.h
-putline.$(SUF):	$(SRC_DIR)/param.h
-cleanup.$(SUF):	$(SRC_DIR)/cleanup.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/cleanup.c
-cleanup.$(SUF):	$(SRC_DIR)/ext.h
-cleanup.$(SUF):	$(SRC_DIR)/lookup.h
-cleanup.$(SUF):	$(TARGET_HOME)/h/em_mes.h
-cleanup.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-cleanup.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-cleanup.$(SUF):	$(SRC_DIR)/assert.h
-cleanup.$(SUF):	$(SRC_DIR)/types.h
-cleanup.$(SUF):	$(SRC_DIR)/param.h
-peephole.$(SUF):	$(SRC_DIR)/peephole.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/peephole.c
-peephole.$(SUF):	$(SRC_DIR)/ext.h
-peephole.$(SUF):	$(SRC_DIR)/optim.h
-peephole.$(SUF):	$(TARGET_HOME)/h/em_mnem.h
-peephole.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-peephole.$(SUF):	$(SRC_DIR)/pattern.h
-peephole.$(SUF):	$(SRC_DIR)/alloc.h
-peephole.$(SUF):	$(SRC_DIR)/proinf.h
-peephole.$(SUF):	$(SRC_DIR)/lookup.h
-peephole.$(SUF):	$(SRC_DIR)/line.h
-peephole.$(SUF):	$(SRC_DIR)/assert.h
-peephole.$(SUF):	$(SRC_DIR)/tes.h
-peephole.$(SUF):	$(SRC_DIR)/types.h
-peephole.$(SUF):	$(SRC_DIR)/param.h
-flow.$(SUF):	$(SRC_DIR)/flow.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/flow.c
-flow.$(SUF):	$(SRC_DIR)/ext.h
-flow.$(SUF):	$(SRC_DIR)/optim.h
-flow.$(SUF):	$(SRC_DIR)/proinf.h
-flow.$(SUF):	$(SRC_DIR)/line.h
-flow.$(SUF):	$(SRC_DIR)/alloc.h
-flow.$(SUF):	$(TARGET_HOME)/h/em_mnem.h
-flow.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-flow.$(SUF):	$(TARGET_HOME)/h/em_flag.h
-flow.$(SUF):	$(SRC_DIR)/tes.h
-flow.$(SUF):	$(SRC_DIR)/types.h
-flow.$(SUF):	$(SRC_DIR)/param.h
-reg.$(SUF):	$(SRC_DIR)/reg.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/reg.c
-reg.$(SUF):	$(SRC_DIR)/ext.h
-reg.$(SUF):	$(TARGET_HOME)/h/em_mes.h
-reg.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-reg.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-reg.$(SUF):	$(SRC_DIR)/alloc.h
-reg.$(SUF):	$(SRC_DIR)/proinf.h
-reg.$(SUF):	$(SRC_DIR)/tes.h
-reg.$(SUF):	$(SRC_DIR)/line.h
-reg.$(SUF):	$(SRC_DIR)/types.h
-reg.$(SUF):	$(SRC_DIR)/param.h
-reg.$(SUF):	$(SRC_DIR)/assert.h
-tes.$(SUF):	$(SRC_DIR)/tes.c
-	$(CC) -c $(CFLAGS) $(SRC_DIR)/tes.c
-tes.$(SUF):	$(SRC_DIR)/pop_push.h
-tes.$(SUF):	$(SRC_DIR)/ext.h
-tes.$(SUF):	$(SRC_DIR)/line.h
-tes.$(SUF):	$(SRC_DIR)/proinf.h
-tes.$(SUF):	$(SRC_DIR)/alloc.h
-tes.$(SUF):	$(SRC_DIR)/tes.h
-tes.$(SUF):	$(SRC_DIR)/types.h
-tes.$(SUF):	$(SRC_DIR)/assert.h
-tes.$(SUF):	$(SRC_DIR)/param.h
-tes.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-tes.$(SUF):	$(TARGET_HOME)/h/em_mnem.h
-tes.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-pop_push.$(SUF):	pop_push.c
-	$(CC) -c $(CFLAGS) pop_push.c
-pop_push.$(SUF):	$(SRC_DIR)/pop_push.h
-pattern.$(SUF):	pattern.c
-	$(CC) -c $(CFLAGS) pattern.c
-pattern.$(SUF):	$(SRC_DIR)/pattern.h
-pattern.$(SUF):	$(SRC_DIR)/types.h
-pattern.$(SUF):	$(SRC_DIR)/param.h
-regglob.$(SUF):	regglob.c
-	$(CC) -c $(CFLAGS) regglob.c
-regglob.$(SUF):	$(SRC_DIR)/ext.h
-regglob.$(SUF):	$(TARGET_HOME)/h/em_mes.h
-regglob.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-regglob.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-regglob.$(SUF):	$(SRC_DIR)/alloc.h
-regglob.$(SUF):	$(SRC_DIR)/proinf.h
-regglob.$(SUF):	$(SRC_DIR)/tes.h
-regglob.$(SUF):	$(SRC_DIR)/line.h
-regglob.$(SUF):	$(SRC_DIR)/types.h
-regglob.$(SUF):	$(SRC_DIR)/param.h
-regglob.$(SUF):	$(SRC_DIR)/assert.h
-regnoglob.$(SUF):	regnoglob.c
-	$(CC) -c $(CFLAGS) regnoglob.c
-regnoglob.$(SUF):	$(SRC_DIR)/ext.h
-regnoglob.$(SUF):	$(TARGET_HOME)/h/em_mes.h
-regnoglob.$(SUF):	$(TARGET_HOME)/h/em_pseu.h
-regnoglob.$(SUF):	$(TARGET_HOME)/h/em_spec.h
-regnoglob.$(SUF):	$(SRC_DIR)/alloc.h
-regnoglob.$(SUF):	$(SRC_DIR)/proinf.h
-regnoglob.$(SUF):	$(SRC_DIR)/tes.h
-regnoglob.$(SUF):	$(SRC_DIR)/line.h
-regnoglob.$(SUF):	$(SRC_DIR)/types.h
-regnoglob.$(SUF):	$(SRC_DIR)/param.h
-regnoglob.$(SUF):	$(SRC_DIR)/assert.h
diff --git a/util/topgen/build.mk b/util/topgen/build.mk
deleted file mode 100644
index 9bf48a4d3..000000000
--- a/util/topgen/build.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-D := util/topgen
-
-# Rule to build topgen.
-
-define build-topgen-impl
-	$(call reset)
-	$(eval cflags += -I$(OBJDIR)/$D -I$D)
-
-	$(call cfile, $D/LLlex.c)
-	$(call cfile, $D/hash.c)
-	$(call cfile, $D/main.c)
-	$(call cfile, $D/pattern.c)
-	$(call cfile, $D/symtab.c)
-	$(eval $q: $(OBJDIR)/$D/Lpars.h)
-
-	$(call llgen, $(OBJDIR)/$D, $D/topgen.g)
-
-	$(call rawfile, $(LIBASSERT))
-	$(call rawfile, $(LIBPRINT))
-	$(call rawfile, $(LIBALLOC))
-	$(call rawfile, $(LIBSYSTEM))
-	$(call rawfile, $(LIBSTRING))
-
-	$(call cprogram, $(BINDIR)/topgen)
-	TOPGEN := $o
-endef
-
-$(eval $(build-topgen-impl))
-
-# Rule to invoke to *use* LLgen.
-#
-#  $1: directory to put output files
-#  $2: input files
-#
-# Output files are *not* compiled (gen.c is expected to be included by
-# something).
-
-define topgen-impl
-$(eval CLEANABLES += $1/gen.h $1/gen.c)
-
-$1/gen.h: $1/gen.c
-$1/gen.c: $2 $(TOPGEN)
-	@echo TOPGEN $$@
-	@mkdir -p $$(dir $$@)
-	$(hide) $(RM) $1/gen.h $1/gen.c
-	$(hide) cd $$(dir $$@) && $(abspath $(TOPGEN)) $(abspath $2)
-
-endef
-
-topgen = $(eval $(call topgen-impl,$1,$2))
diff --git a/util/topgen/proto.make b/util/topgen/proto.make
deleted file mode 100644
index c06b5e90f..000000000
--- a/util/topgen/proto.make
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id$
-
-#PARAMS		do not remove this line!
-
-SRC_DIR =	$(SRC_HOME)/util/topgen
-INCLUDES =	-I$(SRC_DIR) -I.
-CFLAGS =	$(COPTIONS) $(INCLUDES)
-LDFLAGS =	$(LDOPTIONS)
-LINTFLAGS =	$(LINTOPTIONS) $(INCLUDES)
-SOURCE =	$(SRC_DIR)/token.h $(SRC_DIR)/symtab.h $(SRC_DIR)/misc.h \
-		$(SRC_DIR)/tunable.h $(SRC_DIR)/main.c $(SRC_DIR)/topgen.g \
-		$(SRC_DIR)/LLlex.c $(SRC_DIR)/symtab.c $(SRC_DIR)/pattern.c \
-		$(SRC_DIR)/hash.c
-CFILES =	$(SRC_DIR)/main.c topgen.c Lpars.c $(SRC_DIR)/LLlex.c \
-		$(SRC_DIR)/symtab.c $(SRC_DIR)/pattern.c $(SRC_DIR)/hash.c
-OFILES =	main.$(SUF) topgen.$(SUF) Lpars.$(SUF) LLlex.$(SUF) \
-		symtab.$(SUF) pattern.$(SUF) hash.$(SUF)
-
-all:		parser
-		@make topgen
-
-cmp:		all
-		cmp topgen $(TARGET_HOME)/lib.bin/topgen
-
-install:	all
-		cp topgen $(TARGET_HOME)/lib.bin/topgen
-
-clean:
-		rm -f topgen *.$(SUF) Lpars.c Lpars.h topgen.c parser
-
-parser:		$(SRC_DIR)/topgen.g
-		$(UTIL_HOME)/bin/LLgen $(SRC_DIR)/topgen.g
-		touch parser
-
-topgen.$(SUF):	$(SRC_DIR)/token.h Lpars.h $(SRC_DIR)/symtab.h $(SRC_DIR)/misc.h topgen.c
-		$(CC) -c $(CFLAGS) topgen.c
-Lpars.$(SUF):	Lpars.h Lpars.c
-		$(CC) -c $(CFLAGS) Lpars.c
-LLlex.$(SUF):	$(SRC_DIR)/token.h Lpars.h $(SRC_DIR)/tunable.h $(SRC_DIR)/LLlex.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/LLlex.c
-symtab.$(SUF):	$(SRC_DIR)/symtab.h $(SRC_DIR)/symtab.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/symtab.c
-hash.$(SUF):	$(SRC_DIR)/misc.h $(SRC_DIR)/hash.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/hash.c
-pattern.$(SUF):	$(SRC_DIR)/misc.h $(SRC_DIR)/symtab.h $(SRC_DIR)/pattern.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/pattern.c
-main.$(SUF):	$(SRC_DIR)/main.c
-		$(CC) -c $(CFLAGS) $(SRC_DIR)/main.c
-
-topgen:		$(OFILES)
-		$(CC) $(LDFLAGS) $(OFILES) -o topgen
-
-lint:		parser
-		$(LINT) $(LINTFLAGS) $(CFILES)
-
-pr:
-		@pr $(SOURCE) $(SRC_DIR)/proto.make
-
-opr:
-		make pr ^ opr