From 732ad0f54beda82214a36a281aa5bcb71fdb7778 Mon Sep 17 00:00:00 2001
From: John Ellson <ellson@research.att.com>
Date: Thu, 23 Jan 2014 14:05:07 -0500
Subject: [PATCH] remove Makefile.old from tar.gz by removing from EXTRA_DIST
 .. Makefile.old still in repo for now

---
 Makefile.am                     | 3 +--
 cmd/Makefile.am                 | 2 --
 cmd/dot/Makefile.am             | 2 +-
 cmd/dotty/Makefile.am           | 2 +-
 cmd/gvpr/Makefile.am            | 2 +-
 cmd/lefty/Makefile.am           | 2 +-
 cmd/lneato/Makefile.am          | 2 +-
 cmd/tools/Makefile.am           | 2 +-
 contrib/prune/Makefile.am       | 2 +-
 lib/Makefile.am                 | 2 +-
 lib/agraph/Makefile.am          | 2 +-
 lib/ast/Makefile.am             | 2 +-
 lib/cdt/Makefile.am             | 2 +-
 lib/cgraph/Makefile.am          | 2 +-
 lib/circogen/Makefile.am        | 2 +-
 lib/common/Makefile.am          | 2 +-
 lib/dotgen/Makefile.am          | 2 +-
 lib/expr/Makefile.am            | 2 +-
 lib/fdpgen/Makefile.am          | 2 +-
 lib/gd/Makefile.am              | 2 +-
 lib/graph/Makefile.am           | 2 +-
 lib/gvc/Makefile.am             | 2 +-
 lib/gvpr/Makefile.am            | 2 +-
 lib/ingraphs/Makefile.am        | 2 +-
 lib/inkpot/Makefile.am          | 2 +-
 lib/neatogen/Makefile.am        | 2 +-
 lib/ortho/Makefile.am           | 2 +-
 lib/pack/Makefile.am            | 2 +-
 lib/patchwork/Makefile.am       | 2 +-
 lib/pathplan/Makefile.am        | 2 +-
 lib/rbtree/Makefile.am          | 3 ---
 lib/sfdpgen/Makefile.am         | 2 +-
 lib/sfio/Makefile.am            | 2 +-
 lib/sparse/Makefile.am          | 2 +-
 lib/twopigen/Makefile.am        | 2 +-
 lib/vmalloc/Makefile.am         | 2 +-
 lib/vpsc/Makefile.am            | 2 +-
 plugin/Makefile.am              | 2 --
 plugin/core/Makefile.am         | 2 +-
 plugin/devil/Makefile.am        | 3 ---
 plugin/dot_layout/Makefile.am   | 2 +-
 plugin/gd/Makefile.am           | 2 +-
 plugin/gdk/Makefile.am          | 3 ---
 plugin/gs/Makefile.am           | 2 --
 plugin/lasi/Makefile.am         | 2 +-
 plugin/ming/Makefile.am         | 2 +-
 plugin/neato_layout/Makefile.am | 2 +-
 plugin/pango/Makefile.am        | 2 +-
 plugin/rsvg/Makefile.am         | 3 ---
 tclpkg/Makefile.am              | 2 +-
 tclpkg/gdtclft/Makefile.am      | 2 +-
 tclpkg/tcldot/Makefile.am       | 2 +-
 tclpkg/tclhandle/Makefile.am    | 2 --
 tclpkg/tclstubs/Makefile.am     | 2 --
 tclpkg/tkstubs/Makefile.am      | 2 --
 55 files changed, 45 insertions(+), 70 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b44a9ba55..3283d6f8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,8 +36,7 @@ $(top_builddir)/graphviz_version.h: config.h
 EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
 	autogen.sh config/depcomp config/config.rpath \
 	builddate.h ast_common.h.in compat.h \
-	Makefile.old Config.mk.old configure.old INSTALL.old \
-	Makeargs config.h.old compat_getopt.h iffe config.iffe \
+	Makeargs compat_getopt.h iffe config.iffe \
 	m4/README m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
 	graphviz.7 Doxyfile.in Doxyfile features awk \
 	config/config_perl.pl config/config_python.py \
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 01c6472eb..e67f6a1ab 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -2,5 +2,3 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = dot tools gvpr lefty lneato dotty smyrna gvmap gvedit mingle
-
-EXTRA_DIST = Makefile.old
diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index c22b0109f..c1a61cff0 100644
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -130,6 +130,6 @@ dot_builtins_LDADD += $(top_builddir)/plugin/lasi/libgvplugin_lasi.la $(LASI_LIB
 endif
 
 
-EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj
+EXTRA_DIST = dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj
 
 DISTCLEANFILES = dot.1.pdf osage.1.pdf
diff --git a/cmd/dotty/Makefile.am b/cmd/dotty/Makefile.am
index 550730f27..713e39de7 100644
--- a/cmd/dotty/Makefile.am
+++ b/cmd/dotty/Makefile.am
@@ -33,6 +33,6 @@ dotty.1.pdf: $(srcdir)/dotty.1
 
 EXTRA_DIST = $(lefty_DATA) $(man) $(pdf) \
 	dotty.bsh dotty.ksh dotty.sh \
-	Makefile.old notes mswin32 dotty.vcproj
+	notes mswin32 dotty.vcproj
 
 DISTCLEANFILES = $(pdf) dotty
diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 90b0ec9c6..89c9a2a1d 100644
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -46,6 +46,6 @@ gvpr_static_LDADD = \
 	$(top_builddir)/lib/cdt/libcdt_C.la \
        	$(MATH_LIBS)
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) lib Makefile.old gvpr.vcproj
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) lib gvpr.vcproj
 
 DISTCLEANFILES = $(pdf_DATA)
diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index 00a797909..469e0c339 100644
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -97,6 +97,6 @@ lefty.1.pdf: $(srcdir)/lefty.1
 	- @GROFF@ -Tps -man $(srcdir)/lefty.1 | @PS2PDF@ - - >lefty.1.pdf
 
 EXTRA_DIST = $(lefty_DATA) $(man) $(pdf) \
-	lefty.vcproj colors.txt Makefile.old aix_mods cs2l/*
+	lefty.vcproj colors.txt aix_mods cs2l/*
 
 DISTCLEANFILES = $(pdf)
diff --git a/cmd/lneato/Makefile.am b/cmd/lneato/Makefile.am
index 15a91fb2f..f2031ca2c 100644
--- a/cmd/lneato/Makefile.am
+++ b/cmd/lneato/Makefile.am
@@ -30,6 +30,6 @@ lneato.1.pdf: $(srcdir)/lneato.1
 	- @GROFF@ -Tps -man $(srcdir)/lneato.1 | @PS2PDF@ - - >lneato.1.pdf
 
 EXTRA_DIST = $(man) $(pdf) lneato.bsh lneato.ksh lneato.sh \
-	Makefile.old mswin32 lneato.vcproj
+	mswin32 lneato.vcproj
 
 DISTCLEANFILES = lneato $(pdf)
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 45a72b185..9aa81df9c 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -240,7 +240,7 @@ gvgen_LDADD = \
 gvgen.1.pdf: $(srcdir)/gvgen.1
 	- @GROFF@ -Tps -man $(srcdir)/gvgen.1 | @PS2PDF@ - - >gvgen.1.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old bcomps.vcproj \
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) bcomps.vcproj \
 	acyclic.vcproj bcomps.vcproj ccomps.vcproj dijkstra.vcproj gc.vcproj \
 	gv2gxl.vcproj gvcolor.vcproj gvgen.vcproj gvpack.vcproj gxl2gv.vcproj \
 	mm2gv.vcproj nop.vcproj sccmap.vcproj tred.vcproj unflatten.vcproj \
diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index 8f06ee4fc..78b9fcaed 100644
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -23,7 +23,7 @@ prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs_C.la \
 .1.pdf:
 	- @GROFF@ -Tps -man $< | @PS2PDF@ - - >$@
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old README test.gv prune.vcproj
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) README test.gv prune.vcproj
 
 
 DISTCLEANFILES = $(pdf_DATA)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 768dbe059..9cb6ebd1f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,4 +6,4 @@ SUBDIRS = cdt cgraph pathplan sfio vmalloc ast \
 	pack xdot label gvc ingraphs topfish glcomp mingle \
 	circogen dotgen dotgen2 fdpgen neatogen twopigen sfdpgen osage gvpr
 
-EXTRA_DIST = Makefile.old gvc.vcproj gvc.def 
+EXTRA_DIST = gvc.vcproj gvc.def 
diff --git a/lib/agraph/Makefile.am b/lib/agraph/Makefile.am
index e1c3fef06..076f40be4 100644
--- a/lib/agraph/Makefile.am
+++ b/lib/agraph/Makefile.am
@@ -48,7 +48,7 @@ y.output: $(top_srcdir)/lib/agraph/grammar.y
 agraph.3.pdf: $(srcdir)/agraph.3
 	- @GROFF@ -Tps -man $(srcdir)/agraph.3 | @PS2PDF@ - - >agraph.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old cmpnd.c dotdge.c \
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) cmpnd.c dotdge.c \
 	main.c tester.c README grammar.c grammar.h scan.c \
 	y.tab.c y.tab.h y.output
 
diff --git a/lib/ast/Makefile.am b/lib/ast/Makefile.am
index 324d70413..786ae755b 100644
--- a/lib/ast/Makefile.am
+++ b/lib/ast/Makefile.am
@@ -11,4 +11,4 @@ libast_C_la_SOURCES = pathpath.c sfstr.h chresc.c chrtoi.c error.c \
 	pathexists.c pathfind.c pathgetlink.c \
 	strcopy.c stresc.c strmatch.c strton.c strerror.c
 
-EXTRA_DIST = Makefile.old compat_unistd.h ast.vcproj
+EXTRA_DIST = compat_unistd.h ast.vcproj
diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index 9b6d438e3..e2557baac 100644
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -27,6 +27,6 @@ libcdt_la_SOURCES = $(libcdt_C_la_SOURCES)
 cdt.3.pdf: $(srcdir)/cdt.3
 	- @GROFF@ -Tps -man $(srcdir)/cdt.3 | @PS2PDF@ - - >cdt.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old features cdt.vcproj cdt.def
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) features cdt.vcproj cdt.def
 
 DISTCLEANFILES = $(pdf_DATA)
diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index 2258c912e..56e147635 100644
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -47,7 +47,7 @@ y.output: $(top_srcdir)/lib/cgraph/grammar.y
 cgraph.3.pdf: $(srcdir)/cgraph.3
 	- @GROFF@ -Tps -man $(srcdir)/cgraph.3 | @PS2PDF@ - - >cgraph.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old cmpnd.c \
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) cmpnd.c \
 	main.c tester.c grammar.c grammar.h scan.c \
 	y.tab.c y.tab.h y.output cgraph.vcproj cgraph.def
 
diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index e426869d9..98fb68d78 100644
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -23,4 +23,4 @@ libcircogen_C_la_SOURCES = circularinit.c nodelist.c block.c edgelist.c \
 	circular.c deglist.c blocktree.c blockpath.c \
 	circpos.c nodeset.c
 
-EXTRA_DIST = Makefile.old gvcircogen.vcproj
+EXTRA_DIST = gvcircogen.vcproj
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 27b5ed02d..b894c44e3 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -71,7 +71,7 @@ y.output: $(top_srcdir)/lib/common/htmlparse.y
 DISTCLEANFILES = brewer_lib color_lib colortbl.h ps_font_equiv.h \
 	y.output y.tab.[ch] htmlparse.[ch]
 
-EXTRA_DIST = Makefile.old README.imap chars.tcl ps_font_equiv.h \
+EXTRA_DIST = README.imap chars.tcl ps_font_equiv.h \
 	strcasecmp.c strncasecmp.c htmlparse.c htmlparse.h \
 	y.tab.c y.tab.h y.output entities.html entities.tcl \
 	brewer_colors brewer_lib svgcolor_names svgcolor_lib \
diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index d02cac843..468c16b9b 100644
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/Makefile.am
@@ -18,4 +18,4 @@ libdotgen_C_la_SOURCES = acyclic.c class1.c class2.c cluster.c compound.c \
 	conc.c decomp.c fastgr.c flat.c dotinit.c mincross.c \
 	position.c rank.c sameport.c dotsplines.c aspect.c
 
-EXTRA_DIST = Makefile.old gvdotgen.vcproj
+EXTRA_DIST = gvdotgen.vcproj
diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index a40a80584..ebe3133d3 100644
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -72,7 +72,7 @@ expr.3.pdf: $(srcdir)/expr.3
 	- @GROFF@ -Tps -man $(srcdir)/expr.3 | @PS2PDF@ - - >expr.3.pdf
 
 EXTRA_DIST = $(man_MANS) $(pdf_DATA) \
-	Makefile.nmake Makefile.orig Makefile.old \
+	Makefile.nmake Makefile.orig \
 	exparse.c exparse.h exop.h \
 	y.tab.c y.tab.h y.output expr.vcproj
 
diff --git a/lib/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am
index b7d335a28..92a66982e 100644
--- a/lib/fdpgen/Makefile.am
+++ b/lib/fdpgen/Makefile.am
@@ -19,4 +19,4 @@ noinst_LTLIBRARIES = libfdpgen_C.la
 libfdpgen_C_la_SOURCES = comp.c dbg.c grid.c fdpinit.c layout.c \
 	tlayout.c xlayout.c clusteredges.c
 
-EXTRA_DIST = Makefile.old gvfdpgen.vcproj
+EXTRA_DIST = gvfdpgen.vcproj
diff --git a/lib/gd/Makefile.am b/lib/gd/Makefile.am
index 552b53d4f..a667c1378 100644
--- a/lib/gd/Makefile.am
+++ b/lib/gd/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png \
 	pngtogd2.c webpng.c gd2togif.c gdcmpgif.c giftogd2.c \
 	fontsizetest.c fontwheeltest.c gdtest.c gddemo.c gd2time.c gdtestft.c \
 	testac.c circletexttest.c testtr.c fontconfigtest.c gifanimtest.c \
-	configure.ac Makefile.old gd.vcproj\
+	configure.ac gd.vcproj\
 	config.hin config test $(html)
 
 DISTCLEANFILES = $(html_DATA)
diff --git a/lib/graph/Makefile.am b/lib/graph/Makefile.am
index 19bef1692..1f53122b5 100644
--- a/lib/graph/Makefile.am
+++ b/lib/graph/Makefile.am
@@ -47,7 +47,7 @@ graph.3.pdf: $(srcdir)/graph.3
 	- @GROFF@ -Tps -man $(srcdir)/graph.3 | @PS2PDF@ - - > graph.3.pdf
 
 EXTRA_DIST = $(man_MANS) $(pdf_DATA) triefa.cP \
-	Makefile.old parser.c parser.h \
+	parser.c parser.h \
 	y.tab.c y.tab.h y.output graph.vcproj graph.def
 
 DISTCLEANFILES = y.output parser.c parser.h y.tab.[ch] $(pdf_DATA)
diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 1bab7f082..5530e9331 100644
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -66,6 +66,6 @@ libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
 gvc.3.pdf: $(srcdir)/gvc.3
 	- @GROFF@ -Tps -man $(srcdir)/gvc.3 | @PS2PDF@ - - > gvc.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old regex_win32.h regex_win32.c gvc.vcproj
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) regex_win32.h regex_win32.c gvc.vcproj
 
 DISTCLEANFILES = $(pdf_DATA)
diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index 701e075ba..04f31869f 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -55,6 +55,6 @@ mkdefs_SOURCES = mkdefs.c
 gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs
 	./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old gprdata mkdefs.c gdefs.h trie.c gvprlib.vcproj
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcproj
 
 DISTCLEANFILES = $(pdf_DATA) gdefs.h mkdefs
diff --git a/lib/ingraphs/Makefile.am b/lib/ingraphs/Makefile.am
index 4a6c3ce34..35fa41f75 100644
--- a/lib/ingraphs/Makefile.am
+++ b/lib/ingraphs/Makefile.am
@@ -11,4 +11,4 @@ noinst_LTLIBRARIES = libingraphs_C.la
 
 libingraphs_C_la_SOURCES = ingraphs.c
 
-EXTRA_DIST = Makefile.old ingraphs.vcproj
+EXTRA_DIST = ingraphs.vcproj
diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index d49f0ebb9..2bea58308 100644
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -75,7 +75,7 @@ inkpot.3.pdf: inkpot.3
 
 CLEANFILES = inkpot_lib_*.dat
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old *.tcl data/* \
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) *.tcl data/* \
 	inkpot_lib_define.h inkpot_lib_value.h inkpot_lib_scheme.h inkpot_lib_string.h
 
 DISTCLEANFILES = $(pdf_DATA) \
diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index 0686a47f4..80aa55de8 100644
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/Makefile.am
@@ -39,4 +39,4 @@ libneatogen_C_la_SOURCES = adjust.c circuit.c edges.c geometry.c \
     overlap.c call_tri.c \
 	compute_hierarchy.c delaunay.c multispline.c $(WITH_IPSEPCOLA_SOURCES)
 
-EXTRA_DIST = Makefile.old $(IPSEPCOLA_SOURCES) gvneatogen.vcproj
+EXTRA_DIST = $(IPSEPCOLA_SOURCES) gvneatogen.vcproj
diff --git a/lib/ortho/Makefile.am b/lib/ortho/Makefile.am
index 9c837904c..c0735c37d 100644
--- a/lib/ortho/Makefile.am
+++ b/lib/ortho/Makefile.am
@@ -23,5 +23,5 @@ endif
 
 libortho_C_la_SOURCES = fPQ.c maze.c ortho.c partition.c rawgraph.c sgraph.c trapezoid.c
 
-EXTRA_DIST = Makefile.old gvortho.vcproj
+EXTRA_DIST = gvortho.vcproj
  
diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 8caa7cc6c..eae91861d 100644
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -27,7 +27,7 @@ libpack_C_la_SOURCES = ccomps.c pack.c
 pack.3.pdf: $(srcdir)/pack.3
 	- @GROFF@ -Tps -man $(srcdir)/pack.3 | @PS2PDF@ - - >pack.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old ptest.c
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) ptest.c
 
 DISTCLEANFILES = $(pdf_DATA)
 
diff --git a/lib/patchwork/Makefile.am b/lib/patchwork/Makefile.am
index 717f30b58..09723a41a 100644
--- a/lib/patchwork/Makefile.am
+++ b/lib/patchwork/Makefile.am
@@ -18,4 +18,4 @@ noinst_LTLIBRARIES = libpatchwork_C.la
 
 libpatchwork_C_la_SOURCES = patchwork.c patchworkinit.c tree_map.c
 
-EXTRA_DIST = Makefile.old gvpatchwork.vcproj
+EXTRA_DIST = gvpatchwork.vcproj
diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am
index e464d959d..010f309bc 100644
--- a/lib/pathplan/Makefile.am
+++ b/lib/pathplan/Makefile.am
@@ -29,6 +29,6 @@ libpathplan_la_LIBADD = @MATH_LIBS@
 pathplan.3.pdf: $(srcdir)/pathplan.3
 	- @GROFF@ -Tps -man $(srcdir)/pathplan.3 | @PS2PDF@ - - >pathplan.3.pdf
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old path.lefty Pathplan.vcproj pathplan.def
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) path.lefty Pathplan.vcproj pathplan.def
 
 DISTCLEANFILES = $(pdf_DATA)
diff --git a/lib/rbtree/Makefile.am b/lib/rbtree/Makefile.am
index 537023673..96e7ead3f 100644
--- a/lib/rbtree/Makefile.am
+++ b/lib/rbtree/Makefile.am
@@ -12,6 +12,3 @@ CLEANFILES = inkpot_lib_*.dat
 
 EXTRA_DIST = LICENSE CHANGES makefile.txt test_red_black_tree.c \
 	     simple_test.sh test_rb rbtree.vcproj
-
-DISTCLEANFILES = 
-
diff --git a/lib/sfdpgen/Makefile.am b/lib/sfdpgen/Makefile.am
index 5e3144070..70c5bb3c8 100644
--- a/lib/sfdpgen/Makefile.am
+++ b/lib/sfdpgen/Makefile.am
@@ -27,4 +27,4 @@ libsfdpgen_C_la_SOURCES = sfdpinit.c spring_electrical.c \
 	stress_model.c uniform_stress.c \
 	QuadTree.c Multilevel.c PriorityQueue.c
 
-EXTRA_DIST = Makefile.old sfdp.vcproj
+EXTRA_DIST = sfdp.vcproj
diff --git a/lib/sfio/Makefile.am b/lib/sfio/Makefile.am
index ee019878a..c8a77dedf 100644
--- a/lib/sfio/Makefile.am
+++ b/lib/sfio/Makefile.am
@@ -33,4 +33,4 @@ $(libsfio_la_OBJECTS): $(top_builddir)/FEATURE/sfio
 
 DISTCLEANFILES = $(top_builddir)/FEATURE/sfio
 
-EXTRA_DIST = README Makefile.old Makefile.orig features sfio.vcproj
+EXTRA_DIST = README Makefile.orig features sfio.vcproj
diff --git a/lib/sparse/Makefile.am b/lib/sparse/Makefile.am
index eca65c8b2..376046d80 100644
--- a/lib/sparse/Makefile.am
+++ b/lib/sparse/Makefile.am
@@ -15,4 +15,4 @@ noinst_LTLIBRARIES = libsparse_C.la
 libsparse_C_la_SOURCES = SparseMatrix.c general.c BinaryHeap.c IntStack.c vector.c DotIO.c \
     LinkedList.c colorutil.c color_palette.c mq.c clustering.c
 
-EXTRA_DIST = Makefile.old gvsparse.vcproj
+EXTRA_DIST = gvsparse.vcproj
diff --git a/lib/twopigen/Makefile.am b/lib/twopigen/Makefile.am
index fe141f819..a90d45255 100644
--- a/lib/twopigen/Makefile.am
+++ b/lib/twopigen/Makefile.am
@@ -17,4 +17,4 @@ noinst_LTLIBRARIES = libtwopigen_C.la
 
 libtwopigen_C_la_SOURCES = twopiinit.c circle.c
 
-EXTRA_DIST = Makefile.old gvtwopigen.vcproj
+EXTRA_DIST = gvtwopigen.vcproj
diff --git a/lib/vmalloc/Makefile.am b/lib/vmalloc/Makefile.am
index a17bc2785..1327643f5 100644
--- a/lib/vmalloc/Makefile.am
+++ b/lib/vmalloc/Makefile.am
@@ -17,4 +17,4 @@ $(libvmalloc_C_la_OBJECTS): ${top_builddir}/FEATURE/vmalloc
 
 DISTCLEANFILES = ${top_builddir}/FEATURE/vmalloc
 
-EXTRA_DIST = README Makefile.old features vmalloc.vcproj
+EXTRA_DIST = README features vmalloc.vcproj
diff --git a/lib/vpsc/Makefile.am b/lib/vpsc/Makefile.am
index 3df9259b8..12cb59e3e 100644
--- a/lib/vpsc/Makefile.am
+++ b/lib/vpsc/Makefile.am
@@ -16,5 +16,5 @@ libvpsc_C_la_SOURCES = \
 	pairingheap/PairingHeap.cpp remove_rectangle_overlap.cpp \
 	solve_VPSC.cpp csolve_VPSC.cpp variable.cpp
 
-EXTRA_DIST = Makefile.old vpsc.vcproj
+EXTRA_DIST = vpsc.vcproj
 
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index ee8292a5e..a4efb835e 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -2,5 +2,3 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = core devil gd gdk gdiplus glitz gs gtk lasi ming pango quartz rsvg visio xlib dot_layout neato_layout webp poppler
-
-EXTRA_DIST = Makefile.old
diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 5b2fd8b5d..59c991ef1 100644
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -51,7 +51,7 @@ if WITH_DARWIN9
 libgvplugin_core_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_core_LTX_library
 endif
 
-EXTRA_DIST = ps.h Makefile.old plugincore.vcproj gvplugin_core.vcproj gvplugin_core.def
+EXTRA_DIST = ps.h plugincore.vcproj gvplugin_core.vcproj gvplugin_core.def
 
 DISTCLEANFILES = ps.h
 
diff --git a/plugin/devil/Makefile.am b/plugin/devil/Makefile.am
index 7f6a25fa8..357f9f7be 100644
--- a/plugin/devil/Makefile.am
+++ b/plugin/devil/Makefile.am
@@ -34,6 +34,3 @@ endif
 if WITH_DARWIN9
 libgvplugin_devil_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_devil_LTX_library
 endif
-
-EXTRA_DIST = Makefile.old
-
diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index 01622f69d..2aee86ca4 100644
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -41,5 +41,5 @@ if WITH_DARWIN9
 libgvplugin_dot_layout_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_dot_layout_LTX_library
 endif
 
-EXTRA_DIST = Makefile.old gvplugin_dot_layout.vcproj gvplugin_dot_layout.def
+EXTRA_DIST = gvplugin_dot_layout.vcproj gvplugin_dot_layout.def
 
diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index f8d782cb8..97e0e1a99 100644
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -48,5 +48,5 @@ libgvplugin_gd_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_gd_LTX_library
 endif
 endif
 
-EXTRA_DIST = Makefile.old gvplugin_gd.vcproj gvplugin_gd.def
+EXTRA_DIST = gvplugin_gd.vcproj gvplugin_gd.def
 
diff --git a/plugin/gdk/Makefile.am b/plugin/gdk/Makefile.am
index 0a5472a3f..51d30bc7b 100644
--- a/plugin/gdk/Makefile.am
+++ b/plugin/gdk/Makefile.am
@@ -40,6 +40,3 @@ endif
 if WITH_DARWIN9
 libgvplugin_gdk_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_gdk_LTX_library
 endif
-
-EXTRA_DIST = Makefile.old
-
diff --git a/plugin/gs/Makefile.am b/plugin/gs/Makefile.am
index 4637443b6..6182941e8 100644
--- a/plugin/gs/Makefile.am
+++ b/plugin/gs/Makefile.am
@@ -37,5 +37,3 @@ endif
 if WITH_DARWIN9
 libgvplugin_gs_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_gs_LTX_library
 endif
-
-EXTRA_DIST = Makefile.old
diff --git a/plugin/lasi/Makefile.am b/plugin/lasi/Makefile.am
index fe727feee..c00ed863f 100644
--- a/plugin/lasi/Makefile.am
+++ b/plugin/lasi/Makefile.am
@@ -45,7 +45,7 @@ if WITH_DARWIN9
 libgvplugin_lasi_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_lasi_LTX_library
 endif
 
-EXTRA_DIST = ps.h Makefile.old
+EXTRA_DIST = ps.h
 
 DISTCLEANFILES = ps.h
 
diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
index e672d6b33..e71a77586 100644
--- a/plugin/ming/Makefile.am
+++ b/plugin/ming/Makefile.am
@@ -38,4 +38,4 @@ if WITH_DARWIN9
 libgvplugin_ming_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_ming_LTX_library
 endif
 
-EXTRA_DIST = Makefile.old Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
+EXTRA_DIST = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index 30566045e..67e2d73c0 100644
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -53,4 +53,4 @@ if WITH_DARWIN9
 libgvplugin_neato_layout_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_neato_layout_LTX_library -Wl,-exported_symbol,_neato_init_node -Wl,-exported_symbol,_init_nop -Wl,-exported_symbol,_user_pos
 endif
 
-EXTRA_DIST = Makefile.old gvplugin_neato_layout.vcproj gvplugin_neato_layout.def
+EXTRA_DIST = gvplugin_neato_layout.vcproj gvplugin_neato_layout.def
diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index 4480341ea..0617d15f2 100644
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -42,5 +42,5 @@ if WITH_DARWIN9
 libgvplugin_pango_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_pango_LTX_library -framework CoreFoundation -framework CoreServices
 endif
 
-EXTRA_DIST = Makefile.old gvplugin_pango.vcproj
+EXTRA_DIST = gvplugin_pango.vcproj
 
diff --git a/plugin/rsvg/Makefile.am b/plugin/rsvg/Makefile.am
index a89183152..f986270b2 100644
--- a/plugin/rsvg/Makefile.am
+++ b/plugin/rsvg/Makefile.am
@@ -35,6 +35,3 @@ endif
 if WITH_DARWIN9
 libgvplugin_rsvg_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_rsvg_LTX_library
 endif
-
-EXTRA_DIST = Makefile.old
-
diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index 871498988..f5767dad8 100644
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -196,6 +196,6 @@ uninstall-hook:
 	-rm -rf $(DESTDIR)$(pkgtcldir);
 	-rm -rf $(DESTDIR)@TCL_INSTALL_DIR@/@PACKAGE_NAME@-@PACKAGE_VERSION@;
 
-EXTRA_DIST = Makefile.old mkpkgindex.sh
+EXTRA_DIST = mkpkgindex.sh
 
 DISTCLEANFILES = pkgIndex.tcl
diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 29dc3e20c..7c3811bb2 100644
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -50,7 +50,7 @@ endif
 gdtclft.3tcl.pdf: $(srcdir)/gdtclft.3tcl
 	- @GROFF@ -Tps -man $(srcdir)/gdtclft.3tcl | @PS2PDF@ - - >gdtclft.3tcl.pdf
 
-EXTRA_DIST = $(man) $(pdf) Makefile.old
+EXTRA_DIST = $(man) $(pdf)
 
 CLEANFILES = pkgIndex.tcl
 
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index ab31111b8..3dc3ae48d 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -112,7 +112,7 @@ endif
 tcldot.3tcl.pdf: $(srcdir)/tcldot.3tcl
 	- $(GROFF) -Tps -man $(srcdir)/tcldot.3tcl | $(PS2PDF) - - >tcldot.3tcl.pdf
 
-EXTRA_DIST = $(man) $(pdf) $(html) README README.Tkspline Makefile.old
+EXTRA_DIST = $(man) $(pdf) $(html) README README.Tkspline
 
 CLEANFILES = pkgIndex.tcl
 
diff --git a/tclpkg/tclhandle/Makefile.am b/tclpkg/tclhandle/Makefile.am
index 7cfcacbe9..967b68397 100644
--- a/tclpkg/tclhandle/Makefile.am
+++ b/tclpkg/tclhandle/Makefile.am
@@ -7,5 +7,3 @@ noinst_LTLIBRARIES = libtclhandle_C.la
 endif
 
 libtclhandle_C_la_SOURCES = tclhandle.c
-
-EXTRA_DIST = Makefile.old
diff --git a/tclpkg/tclstubs/Makefile.am b/tclpkg/tclstubs/Makefile.am
index 485c8ff2c..4e56bdae1 100644
--- a/tclpkg/tclstubs/Makefile.am
+++ b/tclpkg/tclstubs/Makefile.am
@@ -12,5 +12,3 @@ endif
 
 # tclStubLib.c is a dummy file just to fool automake
 libtclstubs_C_la_SOURCES = tclStubLib.c
-
-EXTRA_DIST = Makefile.old
diff --git a/tclpkg/tkstubs/Makefile.am b/tclpkg/tkstubs/Makefile.am
index 4c59d7505..8ba5dd49a 100644
--- a/tclpkg/tkstubs/Makefile.am
+++ b/tclpkg/tkstubs/Makefile.am
@@ -12,5 +12,3 @@ endif
 
 # tkStubLib.c is a dummy file just to fool automake
 libtkstubs_C_la_SOURCES = tkStubLib.c tkStubImg.c
-
-EXTRA_DIST =
-- 
2.40.0