[libpng17] Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS;
renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
diff --git a/ANNOUNCE b/ANNOUNCE
index 6e98868..fcf9adc 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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
within a few weeks by a public version or by another test version.
@@ -658,9 +658,11 @@
Merged clang no-warning fix from libpng-1.6.13: png_digit was defined
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
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
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 517dab6..552800e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4947,9 +4947,11 @@
Merged clang no-warning fix from libpng-1.6.13: png_digit was defined
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
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
(subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index 3faab32..3e9cc76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,7 +129,7 @@
$(TESTS) $(XFAIL_TESTS) tests/pngstest \
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 \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
@@ -152,7 +152,7 @@
# checks for this and sets DFNCPP appropriately.
DFNCPP = @DFNCPP@
-SUFFIXES = .chk .dfn .out
+SUFFIXES = .chk .out
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@@ -239,18 +239,17 @@
SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@'
endif
-.dfn.out:
- rm -f $@ $*.c $*.tf[12]
+.c.out:
+ rm -f $@ $*.tf[12]
test -d scripts || mkdir scripts || test -d scripts
- echo '#include "$<"' >$*.c
$(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
- rm -f $*.c $*.tf1
+ rm -f $*.tf1
mv $*.tf2 $@
-# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
+# The .c file for pnglibconf.h is machine generated
+pnglibconf.c: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
rm -f $@ $*.tf[45]
$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
@@ -270,7 +269,7 @@
# used on demand to regenerate the standard header, CPPFLAGS should
# 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]
test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
diff --git a/scripts/def.dfn b/scripts/def.c
similarity index 84%
rename from scripts/def.dfn
rename to scripts/def.c
index c53d2e5..236e29e 100644
--- a/scripts/def.dfn
+++ b/scripts/def.c
@@ -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]
- * Copyright (c) 2010-2011 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
+ * Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/scripts/intprefix.dfn b/scripts/intprefix.c
similarity index 73%
rename from scripts/intprefix.dfn
rename to scripts/intprefix.c
index fa59f88..14884ea 100644
--- a/scripts/intprefix.dfn
+++ b/scripts/intprefix.c
@@ -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]
- * Copyright (c) 2012 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
+ * Copyright (c) 2013-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/scripts/prefix.dfn b/scripts/prefix.c
similarity index 73%
rename from scripts/prefix.dfn
rename to scripts/prefix.c
index 0997310..fe7f866 100644
--- a/scripts/prefix.dfn
+++ b/scripts/prefix.c
@@ -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]
- * Copyright (c) 2012 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
+ * Copyright (c) 2013-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/scripts/sym.dfn b/scripts/sym.c
similarity index 64%
rename from scripts/sym.dfn
rename to scripts/sym.c
index 9ccd810..9c40b7d 100644
--- a/scripts/sym.dfn
+++ b/scripts/sym.c
@@ -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]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
+ * Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/scripts/symbols.dfn b/scripts/symbols.c
similarity index 92%
rename from scripts/symbols.dfn
rename to scripts/symbols.c
index 0858327..7809985 100644
--- a/scripts/symbols.dfn
+++ b/scripts/symbols.c
@@ -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]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
+ * Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
diff --git a/scripts/vers.dfn b/scripts/vers.c
similarity index 69%
rename from scripts/vers.dfn
rename to scripts/vers.c
index 61ba7d8..5df1b53 100644
--- a/scripts/vers.dfn
+++ b/scripts/vers.c
@@ -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]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
+ * Last changed in libpng version 1.6.16 [(PENDING RELEASE)]
+ * Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
