From b96b2b7e903301107d16b728373737a90218733a Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 9 Feb 2013 07:53:57 -0600 Subject: [PATCH] [libpng17] 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 | 10 ++++++++-- CHANGES | 8 +++++++- Makefile.am | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index e0ce89eb1..218042342 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0alpha11 - February 8, 2013 +Libpng 1.7.0alpha11 - 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. @@ -134,7 +134,7 @@ Version 1.7.0alpha10 [February 5, 2013] in double quotes unless it is to be macro substituted the fix should work everywhere. -Version 1.7.0alpha11 [February 8, 2013] +Version 1.7.0alpha11 [February 9, 2013] Enable parallel tests and rearrange TESTS order to take advantage of the massive speed improvements use a make capable of parallel builds on a multi-CPU machine and pass the right arguments to make (-j10000 @@ -154,6 +154,12 @@ Version 1.7.0alpha11 [February 8, 2013] reverted the previous erroneous change to remove the ${srcdir} from the front of contrib, scripts, projects and added an explanation of what is going on to Makefile.am + 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 2c86b6ad5..3bd413489 100644 --- a/CHANGES +++ b/CHANGES @@ -4420,7 +4420,7 @@ Version 1.7.0alpha10 [February 5, 2013] in double quotes unless it is to be macro substituted the fix should work everywhere. -Version 1.7.0alpha11 [February 8, 2013] +Version 1.7.0alpha11 [February 9, 2013] Enable parallel tests and rearrange TESTS order to take advantage of the massive speed improvements use a make capable of parallel builds on a multi-CPU machine and pass the right arguments to make (-j10000 @@ -4440,6 +4440,12 @@ Version 1.7.0alpha11 [February 8, 2013] reverted the previous erroneous change to remove the ${srcdir} from the front of contrib, scripts, projects and added an explanation of what is going on to Makefile.am + 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 34d9bc94b..1bd4e0808 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,6 +141,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 pnglibconf.out: config.h