[devel] Revised Makefile.am and Makefile.in to look in the right directory for

pnglibconf.h.prebuilt
This commit is contained in:
John Bowler 2011-07-14 07:42:11 -05:00 committed by Glenn Randers-Pehrson
parent c2891d0011
commit 5a77e672e1
4 changed files with 14 additions and 8 deletions

View File

@ -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 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. 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. Fixed some typos and made other minor changes in the manual.
Updated contrib/pngminus/makefile.std (Samuli Souminen) 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: Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit (subscription required; visit

View File

@ -3512,8 +3512,10 @@ Version 1.5.4 [July 7, 2011]
Version 1.5.5beta01 [July 13, 2011] Version 1.5.5beta01 [July 13, 2011]
Fixed some typos and made other minor changes in the manual. Fixed some typos and made other minor changes in the manual.
Updated contrib/pngminus/makefile.std (Samuli Souminen) 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -97,7 +97,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
cp libpng-config $@ cp libpng-config $@
scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h 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 libpng.sym: scripts/sym.out
rm -f $@ rm -f $@
@ -108,7 +108,8 @@ libpng.vers: scripts/vers.out
pnglibconf.h: pnglibconf.out pnglibconf.h: pnglibconf.out
rm -f $@ rm -f $@
cp $? $@ 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 "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 @echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
@exit 1 @exit 1

View File

@ -1265,7 +1265,7 @@ $(PNGLIB_BASENAME)-config: libpng-config
cp libpng-config $@ cp libpng-config $@
scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h 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 libpng.sym: scripts/sym.out
rm -f $@ rm -f $@
@ -1276,7 +1276,8 @@ libpng.vers: scripts/vers.out
pnglibconf.h: pnglibconf.out pnglibconf.h: pnglibconf.out
rm -f $@ rm -f $@
cp $? $@ 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 "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 @echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
@exit 1 @exit 1