Cleanup.

contrib/Makefile

@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.34 2002/07/30 16:40:34 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.35 2002/08/17 04:06:48 tgl Exp $
 
 subdir = contrib
 top_builddir = ..
@@ -24,10 +24,8 @@ WANTED_DIRS = \
 		miscutil	\
 		noupdate	\
 		oid2name	\
-		pg_controldata	\
 		pg_dumplo	\
 		pg_logger	\
-		pg_resetxlog	\
 		pgbench		\
 		pgcrypto	\
 		pgstattuple	\

contrib/README

@@ -128,10 +128,6 @@ oracle -
 	Converts Oracle database schema to PostgreSQL
 	by Gilles Darold <gilles@darold.net>
 
-pg_controldata -
-	Dump contents of pg_control (database master file)
-	by Oliver Elphick <olly@lfix.co.uk>
-
 pg_dumplo -
 	Dump large objects
 	by Karel Zak <zakkr@zf.jcu.cz>
@@ -140,10 +136,6 @@ pg_logger -
 	Stdin-to-syslog gateway for PostgreSQL
 	by Nathan Myers <ncm@nospam.cantrip.org>
 
-pg_resetxlog -
-	Reset the WAL log (pg_xlog) to recover from crash or format change
-	by Tom Lane <tgl@sss.pgh.pa.us>
-
 pg_upgrade -
 	Upgrade from previous PostgreSQL version without pg_dump/reload
 	by Bruce Momjian <pgman@candle.pha.pa.us>

contrib/pg_controldata/Makefile

@@ -1,19 +0,0 @@
-# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.8 2002/07/27 20:10:03 petere Exp $
-
-subdir = contrib/pg_controldata
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-all: submake-libpgport
-
-PROGRAM = pg_controldata
-OBJS	= pg_controldata.o pg_crc.o
-
-pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
-	rm -f $@ && $(LN_S) $< .
-
-EXTRA_CLEAN = pg_crc.c
-
-DOCS = README.pg_controldata
-
-include $(top_srcdir)/contrib/contrib-global.mk