summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Friesenhahn <bfriesen@simple.dallas.tx.us>2014-12-14 12:37:12 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-12-14 12:37:12 -0600
commit530eec311d7d52cc861acecfbd8bda038a467d31 (patch)
tree4679916c86d5c32e88d4f84e8906e78eecb29945
parent7c5d03703274196919d617b60d3c4e52b96f7c90 (diff)
downloadlibpng-530eec311d7d52cc861acecfbd8bda038a467d31.tar.gz
[libpng16] Revised Makefile.am and scripts/symbols.dfn to work with MinGW/MSYS
-rw-r--r--ANNOUNCE6
-rw-r--r--CHANGES4
-rw-r--r--Makefile.am2
-rw-r--r--scripts/symbols.dfn8
4 files changed, 12 insertions, 8 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 5396b1921..3d272f41d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.16beta01 - November 29, 2014
+Libpng 1.6.16beta01 - December 14, 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.
@@ -25,9 +25,11 @@ Other information:
Changes since the last public release (1.6.15):
-Version 1.6.16beta01 [November 29, 2014]
+Version 1.6.16beta01 [December 14, 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/symbols.dfn to work with MinGW/MSYS
+ (Bob Friesenhahn).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 7cea4fe61..c5844faa7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5099,9 +5099,11 @@ Version 1.6.15rc03 [November 16, 2014]
Version 1.6.15 [November 20, 2014]
No changes.
-Version 1.6.16beta01 [November 29, 2014]
+Version 1.6.16beta01 [December 14, 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/symbols.dfn to work with MinGW/MSYS
+ (Bob Friesenhahn).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index 052e596b6..61c6b6e98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -240,7 +240,7 @@ endif
.dfn.out:
rm -f $@ $*.c $*.tf[12]
test -d scripts || mkdir scripts || test -d scripts
- echo '#include "$<"' >$*.c
+ cp "$<" $*.c
$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
$(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1
$(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
diff --git a/scripts/symbols.dfn b/scripts/symbols.dfn
index 085832715..57266bf6a 100644
--- a/scripts/symbols.dfn
+++ b/scripts/symbols.dfn
@@ -26,8 +26,8 @@
/* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard'
* header file.
*/
-#include "pnglibconf.h.prebuilt"
-#include "../png.h"
+#include "scripts/pnglibconf.h.prebuilt"
+#include "png.h"
/* Some things are turned off by default. Turn these things
* on here (by hand) to get the APIs they expose and validate
@@ -45,7 +45,7 @@
#define PNG_SET_OPTION_SUPPORTED
#undef PNG_H
-#include "../png.h"
+#include "png.h"
/* Finally there are a couple of places where option support
* actually changes the APIs revealed using a #if/#else/#endif
@@ -55,4 +55,4 @@
#undef PNG_ERROR_TEXT_SUPPORTED /* Exposes unsupported APIs */
#undef PNG_H
-#include "../png.h"
+#include "png.h"