From 5a77e672e19c931d1f03c802f29db68cdfa15d7f Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 14 Jul 2011 07:42:11 -0500 Subject: [PATCH] [devel] Revised Makefile.am and Makefile.in to look in the right directory for pnglibconf.h.prebuilt --- ANNOUNCE | 6 ++++-- CHANGES | 6 ++++-- Makefile.am | 5 +++-- Makefile.in | 5 +++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 750536d75..1ea96d35f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.5beta02 - July 13, 2011 +Libpng 1.5.5beta02 - July 14, 2011 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. @@ -30,7 +30,9 @@ Version 1.5.5beta01 [July 13, 2011] Fixed some typos and made other minor changes in the manual. Updated contrib/pngminus/makefile.std (Samuli Souminen) -Version 1.5.5beta02 [July 13, 2011] +Version 1.5.5beta02 [July 14, 2011] + Revised Makefile.am and Makefile.in to look in the right directory for + pnglibconf.h.prebuilt Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 768d9e806..fe895fc45 100644 --- a/CHANGES +++ b/CHANGES @@ -3512,8 +3512,10 @@ Version 1.5.4 [July 7, 2011] Version 1.5.5beta01 [July 13, 2011] Fixed some typos and made other minor changes in the manual. Updated contrib/pngminus/makefile.std (Samuli Souminen) -` -Version 1.5.5beta02 [July 13, 2011] + +Version 1.5.5beta02 [July 14, 2011] + Revised Makefile.am and Makefile.in to look in the right directory for + pnglibconf.h.prebuilt Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/Makefile.am b/Makefile.am index beb7a2572..b4e0ff92c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,7 +97,7 @@ $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h -scripts/symbols.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt +scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt libpng.sym: scripts/sym.out rm -f $@ @@ -108,7 +108,8 @@ libpng.vers: scripts/vers.out pnglibconf.h: pnglibconf.out rm -f $@ cp $? $@ -scripts/pnglibconf.h.prebuilt: +$(srcdir)/scripts/pnglibconf.h.prebuilt: + @echo "Attempting to build $@" >&2 @echo "This is a machine generated file, but if you want to make" >&2 @echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2 @exit 1 diff --git a/Makefile.in b/Makefile.in index 20e0111c4..667d2b189 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1265,7 +1265,7 @@ $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h -scripts/symbols.out: png.h pngconf.h scripts/pnglibconf.h.prebuilt +scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt libpng.sym: scripts/sym.out rm -f $@ @@ -1276,7 +1276,8 @@ libpng.vers: scripts/vers.out pnglibconf.h: pnglibconf.out rm -f $@ cp $? $@ -scripts/pnglibconf.h.prebuilt: +$(srcdir)/scripts/pnglibconf.h.prebuilt: + @echo "Attempting to build $@" >&2 @echo "This is a machine generated file, but if you want to make" >&2 @echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2 @exit 1