From 10ea5caef25017e8d290f0afaafa9e0fc5f790af Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sat, 21 Mar 2015 15:57:21 -0500
Subject: [PATCH] [libpng17] Remove pnglibconf.dfn and pnglibconf.pre with
 "make clean".

---
 ANNOUNCE               | 5 +++--
 CHANGES                | 3 ++-
 Makefile.am            | 2 +-
 scripts/pnglibconf.mak | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 5c436149e..f50c39a2f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta58 - March 20, 2015
+Libpng 1.7.0beta58 - March 21, 2015
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -757,8 +757,9 @@ Version 1.7.0beta57 [March 16, 2015]
     in libpng-1.6.17beta01 (John Bowler).
   Revert change to png_default_read_data() made in libpng-1.7.0beta55.
 
-Version 1.7.0beta58 [March 20, 2015]
+Version 1.7.0beta58 [March 21, 2015]
   Implemented assert support and usage.
+  Remove pnglibconf.dfn and pnglibconf.pre with "make clean".
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index a77c021c7..7bc64abd9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5047,8 +5047,9 @@ Version 1.7.0beta57 [March 16, 2015]
     in libpng-1.6.17beta01 (John Bowler).
   Revert change to png_default_read_data() made in libpng-1.7.0beta55.
 
-Version 1.7.0beta58 [March 20, 2015]
+Version 1.7.0beta58 [March 21, 2015]
   Implemented assert support and usage.
+  Remove pnglibconf.dfn and pnglibconf.pre with "make clean".
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index 24e6ee473..a06944090 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,7 +134,7 @@ SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.c
 CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
 	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
 	check.new pnglibconf.h pngprefix.h symbols.new pngtest-log.txt \
-	pnglibconf.out pnglibconf.c \
+	pnglibconf.out pnglibconf.c pnglibconf.dfn pnglibconf.pre \
 	$(SCRIPT_CLEANFILES)
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
diff --git a/scripts/pnglibconf.mak b/scripts/pnglibconf.mak
index 883f93212..c125ca2c9 100755
--- a/scripts/pnglibconf.mak
+++ b/scripts/pnglibconf.mak
@@ -49,6 +49,7 @@ pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $
 	$(MOVE) pnglibconf.tmp $@
 
 clean-pnglibconf:
-	$(DELETE) pnglibconf.h pnglibconf.c pnglibconf.out
+	$(DELETE) pnglibconf.h pnglibconf.c pnglibconf.out pnglibconf.pre \
+	pnglibconf.dfn
 
 clean: clean-pnglibconf