8 files changed, 14 insertions, 142 deletions
diff --git a/ChangeLog b/ChangeLog
index 05dd2cf1b..9da7640b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-08-08  Peter Stephenson  <pws@csr.com>
 
+	* unposted: Src/xmods.conf, Src/Aliases/*: Remove Src/Aliases
+	files and delete alias modules from xmods.conf (should now
+	use `zmodload -A' to generate module aliases).
+
 	* 12561: Completion/Builtins/_zmodload, Doc/Zsh/builtins.yo,
 	Src/builtin.c, Src/module.c, Src/zsh.h: aliases for modules
 	done internally via `zmodload -[AR]'.
diff --git a/Src/Aliases/.cvsignore b/Src/Aliases/.cvsignore
deleted file mode 100644
index b43abd6af..000000000
--- a/Src/Aliases/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-Makefile
-Makefile.in
-*.export
-so_locations
-*.pro
-*.epro
-*.syms
-*.o
-*.o.c
-*.so
-*.mdh
-*.mdhi
-*.mdhs
-*.mdh.tmp
-*.c
-*.mdd
diff --git a/Src/Aliases/.distfiles b/Src/Aliases/.distfiles
deleted file mode 100644
index 647404f33..000000000
--- a/Src/Aliases/.distfiles
+++ /dev/null
@@ -1,8 +0,0 @@
-DISTFILES_SRC='
-    .cvsignore .distfiles .exrc .preconfig
-    alias.mdd.in alias.c.in
-    cap.mdd clone.mdd compctl.mdd complete.mdd complist.mdd
-    computil.mdd deltochar.mdd example.mdd files.mdd mapfile.mdd
-    mathfunc.mdd parameter.mdd rlimits.mdd sched.mdd stat.mdd
-    zftp.mdd zle.mdd zleparameter.mdd zutil.mdd
-'
diff --git a/Src/Aliases/.exrc b/Src/Aliases/.exrc
deleted file mode 100644
index 91d0b39ef..000000000
--- a/Src/Aliases/.exrc
+++ /dev/null
@@ -1,2 +0,0 @@
-set ai
-set sw=4
diff --git a/Src/Aliases/.preconfig b/Src/Aliases/.preconfig
deleted file mode 100755
index 064bc4e4e..000000000
--- a/Src/Aliases/.preconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-for zshmod in \
-    cap \
-    clone \
-    compctl \
-    complete \
-    complist \
-    computil \
-    deltochar \
-    example \
-    files \
-    mapfile \
-    mathfunc \
-    parameter \
-    rlimits \
-    sched \
-    stat \
-    zftp \
-    zle \
-    zleparameter \
-    zutil \
-; do
-    localname=$zshmod
-    aliasname=$zshmod
-    depname=zsh/$zshmod
-    sed '
-	s,@LOCALNAME@,'$localname',g
-	s,@ALIASNAME@,'$aliasname',g
-	s,@DEPNAME@,'$depname',g
-    ' < alias.mdd.in > ${localname}.mdd
-done
diff --git a/Src/Aliases/alias.c.in b/Src/Aliases/alias.c.in
deleted file mode 100644
index ecb5cd275..000000000
--- a/Src/Aliases/alias.c.in
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * alias.c.in - blank module for zsh
- *
- * This file is part of zsh, the Z shell.
- *
- * Copyright (c) 1996-1997 Andrew Main
- * All rights reserved.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and to distribute modified versions of this software for any
- * purpose, provided that the above copyright notice and the following
- * two paragraphs appear in all copies of this software.
- *
- * In no event shall Andrew Main or the Zsh Development Group be liable
- * to any party for direct, indirect, special, incidental, or consequential
- * damages arising out of the use of this software and its documentation,
- * even if Andrew Main and the Zsh Development Group have been advised of
- * the possibility of such damage.
- *
- * Andrew Main and the Zsh Development Group specifically disclaim any
- * warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose.  The software
- * provided hereunder is on an "as is" basis, and Andrew Main and the
- * Zsh Development Group have no obligation to provide maintenance,
- * support, updates, enhancements, or modifications.
- *
- */
-
-#include "@NAME@.mdh"
-#include "@NAME@.pro"
-
-/**/
-int
-setup_(Module m)
-{
-    return 0;
-}
-
-/**/
-int
-boot_(Module m)
-{
-    return 0;
-}
-
-/**/
-int
-cleanup_(Module m)
-{
-    return 0;
-}
-
-/**/
-int
-finish_(Module m)
-{
-    return 0;
-}
diff --git a/Src/Aliases/alias.mdd.in b/Src/Aliases/alias.mdd.in
deleted file mode 100644
index 5fb10b4e2..000000000
--- a/Src/Aliases/alias.mdd.in
+++ /dev/null
@@ -1,20 +0,0 @@
-name=@ALIASNAME@
-
-nozshdep=1
-
-moddeps="@DEPNAME@"
-
-objects="@LOCALNAME@.o"
-
-:<<\Make
-@LOCALNAME@.mdd: alias.mdd.in
-	rm -f $@
-	cd $(sdir) && ./.preconfig
-
-@LOCALNAME@.c: alias.c.in
-	sed 's,@NAME@,@LOCALNAME@,g' < $(sdir)/alias.c.in > $@
-
-clean-here: clean.@LOCALNAME@
-clean.@LOCALNAME@:
-	rm -f @LOCALNAME@.c
-Make
diff --git a/Src/xmods.conf b/Src/xmods.conf
index c36105721..9cc5c4751 100644
--- a/Src/xmods.conf
+++ b/Src/xmods.conf
@@ -1,5 +1,10 @@
-rlimits
-comp1
-zle
-compctl
-sched
+L zsh/rlimits
+L zsh/zle
+L zsh/complete
+L zsh/compctl
+L zsh/sched
+L zsh/complist
+L zsh/zutil
+L zsh/computil
+L zsh/parameter
+L zsh/zleparameter