Remove extend directory and tidy up README as gvanrossum did on the trunk.

I'm feeling thorough today :)

5 files changed, 24 insertions, 58 deletions

diff --git a/Demo/README b/Demo/README
index ac39f39..5266e3b 100644
--- a/Demo/README
+++ b/Demo/README
@@ -15,15 +15,25 @@ in case I change my mind about them.
 
 classes		Some examples of how to use classes.
 
+comparisons	A set of responses to a really old language-comparison
+		challenge.
+
+curses		A set of curses demos.
+
 embed		An example of embedding Python in another application
 		(see also pysvr).
 
-extend		An example of using the generic Makefile.pre.in from
-		the Misc directory to build a statically linked or
-		shared extension module.
+imputil		Demonstration subclasses of imputil.Importer.
 
 md5test		Test program for the optional md5 module.
 
+metaclasses	The code from the 1.5 metaclasses paper on the web.
+
+parser		Example using the parser module.
+
+pdist		Old, unfinished code messing with CVS, RCS and remote
+		files.
+
 pysvr		An example of embedding Python in a threaded
 		application.
 
@@ -33,18 +43,26 @@ rpc		A set of classes for building clients and servers for
 scripts		Some useful Python scripts that I put in my bin
 		directory.  No optional built-in modules needed.
 
-sockets		Examples for the new built-in module 'socket'.
-
 sgi		Demos that only run on Silicon Graphics machines.
 		These require at least one of the optional built-in
 		modules that only make sense for the SGI, such as
 		'gl', 'al', and 'sv'.  Split in subdirectories
 		per subject.
 
+sockets		Examples for the new built-in module 'socket'.
+
 threads		Demos that use the 'thread' module.  (Currently these
 		only run on SGIs, but this may change in the future.)
 
+tix		Demos using the Tix widget set addition to Tkinter.
+
 tkinter		Demos using the Tk interface (including Matt Conway's
 		excellent set of demos).
 
-tix		Demos using the Tix widget set addition to Tkinter.
+xml		Some XML demos.
+
+xmlrpc		XML-RPC server framework (but see the standard library
+		module SimpleXMLRPCServer.py for a replacement).
+
+zlib		Some demos for the zlib module (see also the standard
+		library module gzip.py).
diff --git a/Demo/extend/README b/Demo/extend/README
deleted file mode 100644
index 26daf14..0000000
--- a/Demo/extend/README
+++ /dev/null
@@ -1,16 +0,0 @@
-This directory contains a test and demonstration of the power of the
-generic Makefile.pre.in from the Misc directory.  There are three
-shell scripts.  Study the source of the scripts to find out how they
-work (it's really easy).
-
-./make_static	Make a static python binary with the xx module
-		linked in.  To test this, run ./python and try to
-		import xx.
-
-./make_shared	Make a shared module xx.  To test this, run the
-		standard python interpreter in this directory and try
-		to import xx.
-
-./make_clean	Clean up after either of the above.  Note that each
-		scripts starts by calling this script, to begin with a
-		clean slate.
diff --git a/Demo/extend/make_clean b/Demo/extend/make_clean
deleted file mode 100755
index 13203cd..0000000
--- a/Demo/extend/make_clean
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Reset the directory contents.
-
-rm -f Setup* Makefile* *.c *.o *.a *.so *~ python sedscript
diff --git a/Demo/extend/make_shared b/Demo/extend/make_shared
deleted file mode 100755
index b5fbe24..0000000
--- a/Demo/extend/make_shared
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-# This script tests and demonstrates the mechanism for building a
-# shared library for an additional extension module using the
-# generic Makefile.pre.in from the Misc directory.
-
-./make_clean
-
-cp ../../Misc/Makefile.pre.in .
-cp ../../Modules/xxmodule.c .
-echo '*shared*' >Setup.in
-echo xx xxmodule.c >>Setup.in
-
-make -f Makefile.pre.in boot
-make Makefile
-make
diff --git a/Demo/extend/make_static b/Demo/extend/make_static
deleted file mode 100755
index cfa48fe..0000000
--- a/Demo/extend/make_static
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-# This script tests and demonstrates the mechanism for building a
-# static Python binary with an additional extension module using the
-# generic Makefile.pre.in from the Misc directory.
-
-./make_clean
-
-cp ../../Misc/Makefile.pre.in .
-cp ../../Modules/xxmodule.c .
-echo xx xxmodule.c >Setup.in
-
-make -f Makefile.pre.in boot
-make Makefile
-make static