From b8d0534e9d77256eac516b9ddc283075d58167e8 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 9 Feb 2013 07:24:08 -0600 Subject: [PATCH] [libpng16] Fixed missing dependency in --prefix builds The intermediate internal 'prefix.h' file can only be generated correctly after pnglibconf.h, however the dependency was not in Makefile.am. The symptoms are unpredictable depending on the order make chooses to build pngprefix.h and pnglibconf.h, often the error goes unnoticed because there is a system pnglibconf.h to use instead. --- ANNOUNCE | 16 ++++++++-------- CHANGES | 8 +++++++- Makefile.am | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 244bf4ced..00f640e58 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0rc06 - February 8, 2013 +Libpng 1.6.0rc06 - February 9, 2013 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. @@ -609,13 +609,13 @@ Version 1.6.0rc04 [February 7, 2013] Version 1.6.0rc05 [February 8, 2013] Update manual about png_get_palette_max(). -Version 1.6.0rc06 [February 8, 2013] - - =========================================================================== - NOTICE November 17, 2012: - The location of the git repository at SourceForge has changed. - Visit http://libpng.sf.net/ for details. - =========================================================================== +Version 1.6.0rc06 [February 9, 2013] + Fixed missing dependency in --prefix builds The intermediate + internal 'prefix.h' file can only be generated correctly after + pnglibconf.h, however the dependency was not in Makefile.am. The + symptoms are unpredictable depending on the order make chooses to + build pngprefix.h and pnglibconf.h, often the error goes unnoticed + because there is a system pnglibconf.h to use instead. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 748a8f071..69fbfd987 100644 --- a/CHANGES +++ b/CHANGES @@ -4363,7 +4363,13 @@ Version 1.6.0rc04 [February 7, 2013] Version 1.6.0rc05 [February 8, 2013] Update manual about png_get_palette_max(). -Version 1.6.0rc06 [February 8, 2013] +Version 1.6.0rc06 [February 9, 2013] + Fixed missing dependency in --prefix builds The intermediate + internal 'prefix.h' file can only be generated correctly after + pnglibconf.h, however the dependency was not in Makefile.am. The + symptoms are unpredictable depending on the order make chooses to + build pngprefix.h and pnglibconf.h, often the error goes unnoticed + because there is a system pnglibconf.h to use instead. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/Makefile.am b/Makefile.am index 357394d0b..ca44c68d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,6 +119,7 @@ $(PNGLIB_BASENAME)-config: libpng-config scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h scripts/prefix.out: png.h pngconf.h pnglibconf.out scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt +scripts/intprefix.out: pnglibconf.h libpng.sym: scripts/sym.out rm -f $@