summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@acm.org>2011-11-08 19:34:54 -0600
committerGlenn Randers-Pehrson <glennrp@shaggy.simplesystems.org>2011-11-08 19:34:54 -0600
commitd4973837b2ce831eacc800e1460cdc594d87a693 (patch)
tree170e1a6292d784dc510cf5e809973255e896b8af /Makefile.in
parentdd81915d5b52cfd8ee8abf5a452c6afd456f4944 (diff)
downloadlibpng-d4973837b2ce831eacc800e1460cdc594d87a693.tar.gz
[libpng15] Change options.awk to use pngconf.h for versioning
instead of ANNOUNCE
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 993d89618..61e04171b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1347,10 +1347,11 @@ pngvalid.o pngtest.o: pnglibconf.h
mv dfn3.out $@
# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
+pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
rm -f $@ dfn?.out
- $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
- ${srcdir}/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
+ $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out version=search\
+ ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
+ $(DFA_XTRA) 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
@@ -1365,12 +1366,13 @@ scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.ou
# 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
+scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
rm -f $@ dfn?.out
test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
- $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
- logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2
+ $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1
+ version=search ${srcdir}/pngconf.h -\
+ ${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@