[libpng15] Updated scripts/pnglibconf.mak and scripts/makefile.std

to handle the new PNG_JOIN macro.
This commit is contained in:
John Bowler
2011-11-05 12:24:53 -05:00
committed by Glenn Randers-Pehrson
parent 8b67ee5d3d
commit 61bd4f76ad
5 changed files with 16 additions and 12 deletions

View File

@@ -35,7 +35,7 @@ pnglibconf.h: pnglibconf.dfn
$(ECHO) '#include "pnglibconf.dfn"' >dfn.c
$(CPP) $(DFNFLAGS) dfn.c >dfn1.out
$(ECHO) "If 'cpp -e' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
$(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
$(SED) -n -e 's|^.*PNG_DEFN_MAGIC *-\(.*\)- *PNG_DEFN_END.*$$|\1|p'\
dfn1.out >dfn2.out
$(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
$(COPY) dfn3.out $@