[libpng17] Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS;

renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
This commit is contained in:
Glenn Randers-Pehrson 2014-12-14 22:14:48 -06:00
parent 3393042627
commit ba8495bba9
9 changed files with 34 additions and 31 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta43 - November 29, 2014 Libpng 1.7.0beta43 - December 15, 2014
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.
@ -658,9 +658,11 @@ Version 1.7.0beta42 [November 20, 2014]
Merged clang no-warning fix from libpng-1.6.13: png_digit was defined Merged clang no-warning fix from libpng-1.6.13: png_digit was defined
but never used in pngerror.c. but never used in pngerror.c.
Version 1.7.0beta43 [November 29, 2014] Version 1.7.0beta43 [December 15, 2014]
Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that
don't do alignment correctly. don't do alignment correctly.
Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS;
renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
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

@ -4947,9 +4947,11 @@ Version 1.7.0beta42 [November 20, 2014]
Merged clang no-warning fix from libpng-1.6.13: png_digit was defined Merged clang no-warning fix from libpng-1.6.13: png_digit was defined
but never used in pngerror.c. but never used in pngerror.c.
Version 1.7.0beta43 [November 29, 2014] Version 1.7.0beta43 [December 15, 2014]
Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that
don't do alignment correctly. don't do alignment correctly.
Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS;
renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
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

@ -129,7 +129,7 @@ EXTRA_DIST= \
$(TESTS) $(XFAIL_TESTS) tests/pngstest \ $(TESTS) $(XFAIL_TESTS) tests/pngstest \
CMakeLists.txt example.c libpng-manual.txt CMakeLists.txt example.c libpng-manual.txt
SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.c
CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
@ -152,7 +152,7 @@ AM_CFLAGS = ${PNG_COPTS}
# checks for this and sets DFNCPP appropriately. # checks for this and sets DFNCPP appropriately.
DFNCPP = @DFNCPP@ DFNCPP = @DFNCPP@
SUFFIXES = .chk .dfn .out SUFFIXES = .chk .out
$(PNGLIB_BASENAME).pc: libpng.pc $(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@ cp libpng.pc $@
@ -239,18 +239,17 @@ if DO_PNG_PREFIX
SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@' SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@'
endif endif
.dfn.out: .c.out:
rm -f $@ $*.c $*.tf[12] rm -f $@ $*.tf[12]
test -d scripts || mkdir scripts || test -d scripts test -d scripts || mkdir scripts || test -d scripts
echo '#include "$<"' >$*.c
$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\ $(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
$(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1 $(CPPFLAGS) $(SYMBOL_CFLAGS) $< > $*.tf1
$(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2 $(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
rm -f $*.c $*.tf1 rm -f $*.tf1
mv $*.tf2 $@ mv $*.tf2 $@
# The .dfn file for pnglibconf.h is machine generated # The .c file for pnglibconf.h is machine generated
pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA) pnglibconf.c: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ $*.tf[45] rm -f $@ $*.tf[45]
$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\ $(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\ ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
@ -270,7 +269,7 @@ scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.ou
# used on demand to regenerate the standard header, CPPFLAGS should # used on demand to regenerate the standard header, CPPFLAGS should
# be empty - no non-standard defines # be empty - no non-standard defines
scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h scripts/pnglibconf.c: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
rm -f $@ pnglibconf.tf[67] rm -f $@ pnglibconf.tf[67]
test -z "$(CPPFLAGS)" test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\ echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\

View File

@ -1,7 +1,7 @@
/* def.dfn - define format of libpng.def /* def.c - define format of libpng.def
* *
* Last changed in libpng version 1.5.7 [December 15, 2011] * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
* Copyright (c) 2010-2011 Glenn Randers-Pehrson * Copyright (c) 2011-2014 Glenn Randers-Pehrson
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

View File

@ -1,8 +1,8 @@
/* intprefix.dfn - generate an unprefixed internal symbol list /* intprefix.c - generate an unprefixed internal symbol list
* *
* Last changed in libpng version 1.6.0 [January 30, 2012] * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
* Copyright (c) 2012 Glenn Randers-Pehrson * Copyright (c) 2013-2014 Glenn Randers-Pehrson
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

View File

@ -1,8 +1,8 @@
/* prefix.dfn - generate an unprefixed symbol list /* prefix.c - generate an unprefixed symbol list
* *
* Last changed in libpng version 1.6.0 [January 30, 2012] * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
* Copyright (c) 2012 Glenn Randers-Pehrson * Copyright (c) 2013-2014 Glenn Randers-Pehrson
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

View File

@ -1,8 +1,8 @@
/* sym.dfn - define format of libpng.sym /* sym.c - define format of libpng.sym
* *
* Last changed in libpng version 1.5.0 [January 6, 2011] * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 2011-2014 Glenn Randers-Pehrson
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

View File

@ -1,8 +1,8 @@
/* symbols.dfn - find all exported symbols /* symbols.c - find all exported symbols
* *
* Last changed in libpng version 1.5.0 [January 6, 2011] * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 2011-2014 Glenn Randers-Pehrson
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer

View File

@ -1,8 +1,8 @@
/* vers.dfn - define format of libpng.vers /* vers.c - define format of libpng.vers
* *
* Last changed in libpng version 1.5.0 [January 6, 2011] * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 2011-2014 Glenn Randers-Pehrson
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer