Skip to content

T
Third Party Libpng

OpenHarmony / Third Party Libpng
11 个月 前同步成功

通知 4
Star 22
Fork 0
T
Third Party Libpng

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 98b4f003 编写于 作者: G Glenn Randers-Pehrson
浏览文件
操作

[devel] Renamed pnglconf.h to pnglibconf.h

上级 294e3804
隐藏空白更改
内联 并排
Showing with 229 addition and 86 deletion
Makefile.am
浏览文件 @ 98b4f003
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
# libpng does not follow GNU file name conventions # libpng does not follow GNU file name conventions
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign color-tests
# test programs - run on make check, make distcheck # test programs - run on make check, make distcheck
check_PROGRAMS= pngtest check_PROGRAMS= pngtest
...@@ -31,6 +31,8 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil ...@@ -31,6 +31,8 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil
pngwtran.c pngmem.c pngerror.c pngpread.c \ pngwtran.c pngmem.c pngerror.c pngpread.c \
png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
...@@ -49,6 +51,7 @@ endif ...@@ -49,6 +51,7 @@ endif
#distribute headers in /usr/include/libpng/* #distribute headers in /usr/include/libpng/*
pkgincludedir= $(includedir)/$(PNGLIB_BASENAME) pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
pkginclude_HEADERS= png.h pngconf.h pkginclude_HEADERS= png.h pngconf.h
nodist_pkginclude_HEADERS= pnglibconf.h
# pkg-config stuff, note that libpng.pc is always required in order # pkg-config stuff, note that libpng.pc is always required in order
# to get the correct library # to get the correct library
...@@ -71,14 +74,17 @@ EXTRA_DIST= \ ...@@ -71,14 +74,17 @@ EXTRA_DIST= \
$(TESTS) \ $(TESTS) \
CMakeLists.txt example.c libpng-@PNGLIB_VERSION@.txt CMakeLists.txt example.c libpng-@PNGLIB_VERSION@.txt
SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
CLEANFILES= dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ CLEANFILES= dfn.c dfn?.out 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 \
libpng.def symbols.new symbols.chk scripts/*.out pngwin.def check.new pnglibconf.* symbols.new \
$(SCRIPT_CLEANFILES)
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
config.sub configure depcomp install-sh ltmain.sh missing config.sub configure depcomp install-sh ltmain.sh missing
SUFFIXES = .dfn .out SUFFIXES = .chk .dfn .out
$(PNGLIB_BASENAME).pc: libpng.pc $(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@ cp libpng.pc $@
...@@ -86,7 +92,8 @@ $(PNGLIB_BASENAME).pc: libpng.pc ...@@ -86,7 +92,8 @@ $(PNGLIB_BASENAME).pc: libpng.pc
$(PNGLIB_BASENAME)-config: libpng-config $(PNGLIB_BASENAME)-config: libpng-config
cp libpng-config $@ cp libpng-config $@
scripts/sym.out scripts/vers.out scritps/def.out scripts/checksym.out: png.h pngconf.h scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
scripts/symbols.out scripts/pngwin.out: png.h pngconf.h scripts/pnglibconf.h
libpng.sym: scripts/sym.out libpng.sym: scripts/sym.out
rm -f $@ rm -f $@
...@@ -94,9 +101,16 @@ libpng.sym: scripts/sym.out ...@@ -94,9 +101,16 @@ libpng.sym: scripts/sym.out
libpng.vers: scripts/vers.out libpng.vers: scripts/vers.out
rm -f $@ rm -f $@
cp $? $@ cp $? $@
libpng.def: scripts/def.out pngwin.def: scripts/pngwin.out
rm -f $@
cp $? $@
pnglibconf.h: pnglibconf.out
rm -f $@ rm -f $@
cp $? $@ cp $? $@
scripts/pnglibconf.h:
@echo "This is a machine generated file, but if you want to make" >&2
@echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
@exit 1
SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
-DPNGLIB_VERSION='@PNGLIB_VERSION@'\ -DPNGLIB_VERSION='@PNGLIB_VERSION@'\
...@@ -106,28 +120,66 @@ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ ...@@ -106,28 +120,66 @@ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
rm -f $@ dfn.c dfn?.out rm -f $@ dfn.c dfn?.out
test -d scripts || mkdir scripts test -d scripts || mkdir scripts
echo '#include "$<"' >dfn.c echo '#include "$<"' >dfn.c
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c >dfn1.out $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
$(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p' dfn1.out >dfn2.out $(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c >dfn1.out
$(SED) -e 's| *@@@ *||' -e 's| *$$||' dfn2.out >dfn3.out $(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
dfn1.out >dfn2.out
$(SED) -e 's| *@@@ *||g' -e 's| *$$||' dfn2.out >dfn3.out
rm -f dfn.c dfn[12].out rm -f dfn.c dfn[12].out
mv dfn3.out $@ mv dfn3.out $@
symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/checksym.out # The .dfn file for pnglibconf.h is machine generated
pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
rm -f $@ dfn?.out
$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
# Symbol checks (.def and .out files should match)
scripts/pngwin.chk: scripts/checksym.awk scripts/pngwin.def scripts/pngwin.out
scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
.out.chk:
rm -f $@ symbols.new rm -f $@ symbols.new
$(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/symbols.def\ $(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
scripts/checksym.out >&2 $< >&2
mv symbols.new $@ mv symbols.new $@
dist: symbols.chk # 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
rm -f $@ dfn?.out
test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
logunsupported=1 dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h
test: check-am
# Extra checks
check: scripts/symbols.chk scripts/pngwin.chk
test: check # Don't distribute the generated script files
dist-hook:
cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)
# install the .../include headers as links to the new ones # install the .../include headers as links to the new ones
install-data-hook: install-data-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \ cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
pngconf.h pngconf.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
pnglibconf.h
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
...@@ -145,7 +197,7 @@ install-exec-hook: ...@@ -145,7 +197,7 @@ install-exec-hook:
done done
uninstall-hook: uninstall-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
rm -f $(DESTDIR)$(bindir)/libpng-config rm -f $(DESTDIR)$(bindir)/libpng-config
rm -f $(DESTDIR)$(libdir)/libpng.a rm -f $(DESTDIR)$(libdir)/libpng.a
......
Makefile.in
浏览文件 @ 98b4f003
...@@ -83,7 +83,8 @@ am__base_list = \ ...@@ -83,7 +83,8 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" \
"$(DESTDIR)$(pkgincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD =
am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \ am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \
...@@ -102,8 +103,10 @@ am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \ ...@@ -102,8 +103,10 @@ am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-pngmem.lo \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-pngmem.lo \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-pngerror.lo \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-pngerror.lo \
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-pngpread.lo libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la-pngpread.lo
nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS =
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = \
$(am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) $(am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) \
$(nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS)
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LINK = $(LIBTOOL) --tag=CC \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LINK = $(LIBTOOL) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) \ $(AM_CFLAGS) $(CFLAGS) \
...@@ -127,6 +130,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ...@@ -127,6 +130,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
SOURCES = $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \ SOURCES = $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \
$(nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \
$(pngtest_SOURCES) $(pngtest_SOURCES)
DIST_SOURCES = $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \ DIST_SOURCES = $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \
$(pngtest_SOURCES) $(pngtest_SOURCES)
...@@ -135,11 +139,24 @@ man5dir = $(mandir)/man5 ...@@ -135,11 +139,24 @@ man5dir = $(mandir)/man5
NROFF = nroff NROFF = nroff
MANS = $(dist_man_MANS) MANS = $(dist_man_MANS)
DATA = $(pkgconfig_DATA) DATA = $(pkgconfig_DATA)
HEADERS = $(pkginclude_HEADERS) HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
# If stdout is a non-dumb tty, use colors. If test -t is not supported,
# then this fails; a conservative approach. Of course do not redirect
# stdout here, just stderr.
am__tty_colors = \ am__tty_colors = \
red=; grn=; lgn=; blu=; std= red=; grn=; lgn=; blu=; std=; \
test "X$(AM_COLOR_TESTS)" != Xno \
&& test "X$$TERM" != Xdumb \
&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
&& { \
red=''; \
grn=''; \
lgn=''; \
blu=''; \
std=''; \
}
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION) distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir) top_distdir = $(distdir)
...@@ -285,7 +302,7 @@ top_srcdir = @top_srcdir@ ...@@ -285,7 +302,7 @@ top_srcdir = @top_srcdir@
PNGLIB_BASENAME = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ PNGLIB_BASENAME = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
# libpng does not follow GNU file name conventions # libpng does not follow GNU file name conventions
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign color-tests
pngtest_SOURCES = pngtest.c pngtest_SOURCES = pngtest.c
pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
TESTS = test-pngtest.sh TESTS = test-pngtest.sh
...@@ -305,6 +322,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil ...@@ -305,6 +322,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil
pngwtran.c pngmem.c pngerror.c pngpread.c \ pngwtran.c pngmem.c pngerror.c pngpread.c \
png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \
-export-dynamic -version-number \ -export-dynamic -version-number \
...@@ -313,6 +331,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \ ...@@ -313,6 +331,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \
@HAVE_LD_VERSION_SCRIPT_FALSE@libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym @HAVE_LD_VERSION_SCRIPT_FALSE@libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
@HAVE_LD_VERSION_SCRIPT_TRUE@libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers @HAVE_LD_VERSION_SCRIPT_TRUE@libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
pkginclude_HEADERS = png.h pngconf.h pkginclude_HEADERS = png.h pngconf.h
nodist_pkginclude_HEADERS = pnglibconf.h
pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
#extra source distribution files. #extra source distribution files.
...@@ -331,14 +350,16 @@ EXTRA_DIST = \ ...@@ -331,14 +350,16 @@ EXTRA_DIST = \
$(TESTS) \ $(TESTS) \
CMakeLists.txt example.c libpng-@PNGLIB_VERSION@.txt CMakeLists.txt example.c libpng-@PNGLIB_VERSION@.txt
SCRIPT_CLEANFILES = scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
CLEANFILES = dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ CLEANFILES = dfn.c dfn?.out 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 \
libpng.def symbols.new symbols.chk scripts/*.out pngwin.def check.new pnglibconf.* symbols.new \
$(SCRIPT_CLEANFILES)
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
config.sub configure depcomp install-sh ltmain.sh missing config.sub configure depcomp install-sh ltmain.sh missing
SUFFIXES = .dfn .out SUFFIXES = .chk .dfn .out
SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
-DPNGLIB_VERSION='@PNGLIB_VERSION@'\ -DPNGLIB_VERSION='@PNGLIB_VERSION@'\
-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'
...@@ -347,7 +368,7 @@ all: config.h ...@@ -347,7 +368,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .dfn .out .c .lo .o .obj .SUFFIXES: .chk .dfn .out .c .lo .o .obj
am--refresh: am--refresh:
@: @:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
...@@ -736,6 +757,26 @@ uninstall-pkgconfigDATA: ...@@ -736,6 +757,26 @@ uninstall-pkgconfigDATA:
test -n "$$files" || exit 0; \ test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
@list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
$(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
done
uninstall-nodist_pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
install-pkgincludeHEADERS: $(pkginclude_HEADERS) install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
...@@ -946,6 +987,9 @@ distdir: $(DISTFILES) ...@@ -946,6 +987,9 @@ distdir: $(DISTFILES)
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \ -test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
...@@ -1067,7 +1111,7 @@ check: check-am ...@@ -1067,7 +1111,7 @@ check: check-am
all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) \ all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) \
config.h config.h
installdirs: installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-am install: install-am
...@@ -1121,8 +1165,8 @@ info: info-am ...@@ -1121,8 +1165,8 @@ info: info-am
info-am: info-am:
install-data-am: install-man install-pkgconfigDATA \ install-data-am: install-man install-nodist_pkgincludeHEADERS \
install-pkgincludeHEADERS install-pkgconfigDATA install-pkgincludeHEADERS
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-am install-dvi: install-dvi-am
...@@ -1173,8 +1217,8 @@ ps: ps-am ...@@ -1173,8 +1217,8 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES \ uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES \
uninstall-man uninstall-pkgconfigDATA \ uninstall-man uninstall-nodist_pkgincludeHEADERS \
uninstall-pkgincludeHEADERS uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man3 uninstall-man5 uninstall-man: uninstall-man3 uninstall-man5
...@@ -1185,23 +1229,24 @@ uninstall-man: uninstall-man3 uninstall-man5 ...@@ -1185,23 +1229,24 @@ uninstall-man: uninstall-man3 uninstall-man5
.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \ clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \
dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
distclean distclean-compile distclean-generic distclean-hdr \ distcheck distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distcleancheck distdir \ distclean-hdr distclean-libtool distclean-tags distcleancheck \
distuninstallcheck dvi dvi-am html html-am info info-am \ distdir distuninstallcheck dvi dvi-am html html-am info \
install install-am install-binSCRIPTS install-data \ info-am install install-am install-binSCRIPTS install-data \
install-data-am install-data-hook install-dvi install-dvi-am \ install-data-am install-data-hook install-dvi install-dvi-am \
install-exec install-exec-am install-exec-hook install-html \ install-exec install-exec-am install-exec-hook install-html \
install-html-am install-info install-info-am \ install-html-am install-info install-info-am \
install-libLTLIBRARIES install-man install-man3 install-man5 \ install-libLTLIBRARIES install-man install-man3 install-man5 \
install-pdf install-pdf-am install-pkgconfigDATA \ install-nodist_pkgincludeHEADERS install-pdf install-pdf-am \
install-pkgincludeHEADERS install-ps install-ps-am \ install-pkgconfigDATA install-pkgincludeHEADERS install-ps \
install-strip installcheck installcheck-am installdirs \ install-ps-am install-strip installcheck installcheck-am \
maintainer-clean maintainer-clean-generic mostlyclean \ installdirs maintainer-clean maintainer-clean-generic \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ mostlyclean mostlyclean-compile mostlyclean-generic \
pdf pdf-am ps ps-am tags uninstall uninstall-am \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-binSCRIPTS uninstall-hook uninstall-libLTLIBRARIES \ uninstall-am uninstall-binSCRIPTS uninstall-hook \
uninstall-man uninstall-man3 uninstall-man5 \ uninstall-libLTLIBRARIES uninstall-man uninstall-man3 \
uninstall-man5 uninstall-nodist_pkgincludeHEADERS \
uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
...@@ -1214,7 +1259,8 @@ $(PNGLIB_BASENAME).pc: libpng.pc ...@@ -1214,7 +1259,8 @@ $(PNGLIB_BASENAME).pc: libpng.pc
$(PNGLIB_BASENAME)-config: libpng-config $(PNGLIB_BASENAME)-config: libpng-config
cp libpng-config $@ cp libpng-config $@
scripts/sym.out scripts/vers.out scritps/def.out scripts/checksym.out: png.h pngconf.h scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
scripts/symbols.out scripts/pngwin.out: png.h pngconf.h scripts/pnglibconf.h
libpng.sym: scripts/sym.out libpng.sym: scripts/sym.out
rm -f $@ rm -f $@
...@@ -1222,36 +1268,81 @@ libpng.sym: scripts/sym.out ...@@ -1222,36 +1268,81 @@ libpng.sym: scripts/sym.out
libpng.vers: scripts/vers.out libpng.vers: scripts/vers.out
rm -f $@ rm -f $@
cp $? $@ cp $? $@
libpng.def: scripts/def.out pngwin.def: scripts/pngwin.out
rm -f $@ rm -f $@
cp $? $@ cp $? $@
pnglibconf.h: pnglibconf.out
rm -f $@
cp $? $@
scripts/pnglibconf.h:
@echo "This is a machine generated file, but if you want to make" >&2
@echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
@exit 1
.dfn.out: .dfn.out:
rm -f $@ dfn.c dfn?.out rm -f $@ dfn.c dfn?.out
test -d scripts || mkdir scripts test -d scripts || mkdir scripts
echo '#include "$<"' >dfn.c echo '#include "$<"' >dfn.c
$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c >dfn1.out $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) @LIBPNG_DEFINES@\
$(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p' dfn1.out >dfn2.out $(CPPFLAGS) $(SYMBOL_CFLAGS) dfn.c >dfn1.out
$(SED) -e 's| *@@@ *||' -e 's| *$$||' dfn2.out >dfn3.out $(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
dfn1.out >dfn2.out
$(SED) -e 's| *@@@ *||g' -e 's| *$$||' dfn2.out >dfn3.out
rm -f dfn.c dfn[12].out rm -f dfn.c dfn[12].out
mv dfn3.out $@ mv dfn3.out $@
symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/checksym.out # The .dfn file for pnglibconf.h is machine generated
pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
rm -f $@ dfn?.out
$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
# Symbol checks (.def and .out files should match)
scripts/pngwin.chk: scripts/checksym.awk scripts/pngwin.def scripts/pngwin.out
scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
.out.chk:
rm -f $@ symbols.new rm -f $@ symbols.new
$(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/symbols.def\ $(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
scripts/checksym.out >&2 $< >&2
mv symbols.new $@ mv symbols.new $@
dist: symbols.chk # 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
rm -f $@ dfn?.out
test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
logunsupported=1 dfn1.out 1>&2
rm dfn1.out
mv dfn2.out $@
$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h
test: check-am
# Extra checks
check: scripts/symbols.chk scripts/pngwin.chk
test: check # Don't distribute the generated script files
dist-hook:
cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)
# install the .../include headers as links to the new ones # install the .../include headers as links to the new ones
install-data-hook: install-data-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \ cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
pngconf.h pngconf.h
cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
pnglibconf.h
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
...@@ -1269,7 +1360,7 @@ install-exec-hook: ...@@ -1269,7 +1360,7 @@ install-exec-hook:
done done
uninstall-hook: uninstall-hook:
cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
rm -f $(DESTDIR)$(bindir)/libpng-config rm -f $(DESTDIR)$(bindir)/libpng-config
rm -f $(DESTDIR)$(libdir)/libpng.a rm -f $(DESTDIR)$(libdir)/libpng.a
......
png.h
浏览文件 @ 98b4f003
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
* the library has been built. * the library has been built.
*/ */
#ifndef PNGLCONF_H #ifndef PNGLCONF_H
# include "pnglconf.h" # include "pnglibconf.h"
#endif #endif
#ifndef PNG_VERSION_INFO_ONLY #ifndef PNG_VERSION_INFO_ONLY
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
* StringFileInfo block must contain a SpecialBuild string. * StringFileInfo block must contain a SpecialBuild string.
*/ */
#ifdef PNG_USER_PRIVATEBUILD /* From pnglconf.h */ #ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */
# define PNG_LIBPNG_BUILD_TYPE \ # define PNG_LIBPNG_BUILD_TYPE \
(PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE) (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
#else #else
...@@ -450,7 +450,7 @@ extern "C" { ...@@ -450,7 +450,7 @@ extern "C" {
/* This file is arranged in several sections: /* This file is arranged in several sections:
* *
* 1. Any configuration options that can be specified by for the application * 1. Any configuration options that can be specified by for the application
* code when it is built. (Build time configuration is in pnglconf.h) * code when it is built. (Build time configuration is in pnglibconf.h)
* 2. Type definitions (base types are defined in pngconf.h), structure * 2. Type definitions (base types are defined in pngconf.h), structure
* definitions. * definitions.
* 3. Exported library functions. * 3. Exported library functions.
...@@ -459,11 +459,11 @@ extern "C" { ...@@ -459,11 +459,11 @@ extern "C" {
* allow configuration of the library. * allow configuration of the library.
*/ */
/* Section 1: run time configuration /* Section 1: run time configuration
* See pnglconf.h for build time configuration * See pnglibconf.h for build time configuration
* *
* Run time configuration allows the application to choose between * Run time configuration allows the application to choose between
* implementations of certain arithmetic APIs. The default is set * implementations of certain arithmetic APIs. The default is set
* at build time and recorded in pnglconf.h, but it is safe to * at build time and recorded in pnglibconf.h, but it is safe to
* override these (and only these) settings. Note that this won't * override these (and only these) settings. Note that this won't
* change what the library does, only application code, and the * change what the library does, only application code, and the
* settings can (and probably should) be made on a per-file basis * settings can (and probably should) be made on a per-file basis
......
pngconf.h
浏览文件 @ 98b4f003
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
* (x86 DOS/Windows sytems) and, even then, this does not apply to * (x86 DOS/Windows sytems) and, even then, this does not apply to
* Cygwin running on those systems. * Cygwin running on those systems.
* *
* Note that the value must be defined in pnglconf.h so that what * Note that the value must be defined in pnglibconf.h so that what
* the application uses to call the library matches the conventions * the application uses to call the library matches the conventions
* set when building the library. * set when building the library.
*/ */
......
scripts/options.awk
浏览文件 @ 98b4f003
...@@ -251,7 +251,7 @@ $1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default")) ...@@ -251,7 +251,7 @@ $1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default"))
# The order of the dependency lines (option, chunk, setting) is irrelevant # The order of the dependency lines (option, chunk, setting) is irrelevant
# - the 'enables', 'requires' and 'if' settings will be used to determine # - the 'enables', 'requires' and 'if' settings will be used to determine
# the correct order in the output and the final values in pnglconf.h are # the correct order in the output and the final values in pnglibconf.h are
# not order dependent. 'requires' and 'if' entries take precedence over # not order dependent. 'requires' and 'if' entries take precedence over
# 'enables' from other options; if an option requires another option it # 'enables' from other options; if an option requires another option it
# won't be set regardless of any options that enable it unless the other # won't be set regardless of any options that enable it unless the other
...@@ -306,7 +306,7 @@ $1 ~ /^@/{ ...@@ -306,7 +306,7 @@ $1 ~ /^@/{
} }
# For checking purposes names that start with "ok_" or "fail_" are # For checking purposes names that start with "ok_" or "fail_" are
# not output to pnglconf.h and must be either enabled or disabled # not output to pnglibconf.h and must be either enabled or disabled
# respectively for the build to succeed. This allows interdependencies # respectively for the build to succeed. This allows interdependencies
# between options of the form "at least one of" or "at most one of" # between options of the form "at least one of" or "at most one of"
# to be checked. For example: # to be checked. For example:
...@@ -526,7 +526,7 @@ END{ ...@@ -526,7 +526,7 @@ END{
print "# endif" >out print "# endif" >out
print "# endif /*!command line*/" >out print "# endif /*!command line*/" >out
# If PNG_on is still set the option should be defined in # If PNG_on is still set the option should be defined in
# pnglconf.h # pnglibconf.h
print "# ifdef PNG_on" >out print "# ifdef PNG_on" >out
if (i ~ /^fail_/) if (i ~ /^fail_/)
print error, i, "if" iffs[i], "requires" requires[i] end >out print error, i, "if" iffs[i], "requires" requires[i] end >out
......
scripts/pnglconf.dfa → scripts/pnglibconf.dfa
浏览文件 @ 98b4f003
# scripts/pnglconf.dfa - library build configuration control # scripts/pnglibconf.dfa - library build configuration control
# #
@/*- pnglconf.dfn intermediate file @/*- pnglibconf.dfn intermediate file
@ * generated from scripts/pnglconf.dfa @ * generated from scripts/pnglibconf.dfa
@ */ @ */
# #
com pnglconf.h - library build configuration com pnglibconf.h - library build configuration
com com
com libpng version PNGLIB_VERSION - April 2, 2010 com libpng version PNGLIB_VERSION - April 2, 2010
com com
...@@ -14,13 +14,13 @@ com This code is released under the libpng license. ...@@ -14,13 +14,13 @@ com This code is released under the libpng license.
com For conditions of distribution and use, see the disclaimer com For conditions of distribution and use, see the disclaimer
com and license in png.h com and license in png.h
com com
file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# This file is preprocessed by scripts/options.awk and the # This file is preprocessed by scripts/options.awk and the
# C compiler to generate 'pnglconf.h' - a list of all the # C compiler to generate 'pnglibconf.h' - a list of all the
# configuration options. The file lists the various options # configuration options. The file lists the various options
# that can *only* be specified during the libpng build; # that can *only* be specified during the libpng build;
# pnglconf.h freezes the definitons selected for the specific # pnglibconf.h freezes the definitons selected for the specific
# build. # build.
# #
# The syntax is detailed in scripts/options.awk, this is a summary # The syntax is detailed in scripts/options.awk, this is a summary
...@@ -56,13 +56,13 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H ...@@ -56,13 +56,13 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
# detailed below and #define PNG_NO_<option> for each option you # detailed below and #define PNG_NO_<option> for each option you
# don't want in that file in that file. You can also turn on options # don't want in that file in that file. You can also turn on options
# using PNG_<option>_SUPPORTED. When you have finished rerun # using PNG_<option>_SUPPORTED. When you have finished rerun
# configure and rebuild pnglconf.h file with -DPNG_USER_CONFIG: # configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG:
# #
# make clean # make clean
# CPPFLAGS='-DPNG_USER_CONFIG' ./configure # CPPFLAGS='-DPNG_USER_CONFIG' ./configure
# make pnglconf.h # make pnglibconf.h
# #
# pngusr.h is only used during the creation of pnglconf.h, but it # pngusr.h is only used during the creation of pnglibconf.h, but it
# is safer to ensure that -DPNG_USER_CONFIG is specified throughout # is safer to ensure that -DPNG_USER_CONFIG is specified throughout
# the build by changing the CPPFLAGS passed to the initial ./configure # the build by changing the CPPFLAGS passed to the initial ./configure
# #
...@@ -89,9 +89,9 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H ...@@ -89,9 +89,9 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# PNG_USER_CONFIG has to be defined on the compiler command line # PNG_USER_CONFIG has to be defined on the compiler command line
# to cause pngusr.h to be read while constructing pnglconf.h # to cause pngusr.h to be read while constructing pnglibconf.h
# #
# If this is set during the build 'pnglconf.h' will define # If this is set during the build 'pnglibconf.h' will define
# PNG_USER_PRIVATEBUILD to the value that *must* be set by pngusr.h # PNG_USER_PRIVATEBUILD to the value that *must* be set by pngusr.h
# and contain other definitions as below. # and contain other definitions as below.
# #
...@@ -119,7 +119,7 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H ...@@ -119,7 +119,7 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
@#endif @#endif
# Note that PNG_USR_CONFIG only has an effect when building # Note that PNG_USR_CONFIG only has an effect when building
# pnglconf.h # pnglibconf.h
setting USER_CONFIG requires USER_PRIVATEBUILD USER_DLLFNAME_POSTFIX setting USER_CONFIG requires USER_PRIVATEBUILD USER_DLLFNAME_POSTFIX
setting USER_PRIVATEBUILD setting USER_PRIVATEBUILD
setting USER_DLLFNAME_POSTFIX setting USER_DLLFNAME_POSTFIX
......
scripts/pnglconf.h → scripts/pnglibconf.h
浏览文件 @ 98b4f003
/* 1.5.0beta17 STANDARD API DEFINITION */ /* 1.5.0beta17 STANDARD API DEFINITION */
/* pnglconf.h - library build configuration */ /* pnglibconf.h - library build configuration */
/* libpng version 1.5.0beta17 - April 2, 2010 */ /* libpng version 1.5.0beta17 - April 2, 2010 */
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
/* For conditions of distribution and use, see the disclaimer */ /* For conditions of distribution and use, see the disclaimer */
/* and license in png.h */ /* and license in png.h */
/* pnglconf.h */ /* pnglibconf.h */
/* Machine generated file: DO NOT EDIT */ /* Machine generated file: DO NOT EDIT */
/* Derived from: scripts/pnglconf.dfa */ /* Derived from: scripts/pnglibconf.dfa */
#ifndef PNGLCONF_H #ifndef PNGLCONF_H
#define PNGLCONF_H #define PNGLCONF_H
/* settings */ /* settings */
......
scripts/pngwin.dfn
浏览文件 @ 98b4f003
...@@ -31,8 +31,8 @@ PNG_DEFN_MAGIC--PNG_DEFN_END ...@@ -31,8 +31,8 @@ PNG_DEFN_MAGIC--PNG_DEFN_END
PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END
PNG_DEFN_MAGIC-;Version PNGLIB_VERSION-PNG_DEFN_END PNG_DEFN_MAGIC-;Version PNGLIB_VERSION-PNG_DEFN_END
/* Read the defaults, but use scripts/pnglconf.h; the 'standard' /* Read the defaults, but use scripts/pnglibconf.h; the 'standard'
* header file. * header file.
*/ */
#include "pnglconf.h" #include "pnglibconf.h"
#include "../png.h" #include "../png.h"
scripts/symbols.dfn
浏览文件 @ 98b4f003
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
/* NOTE: making 'symbols.chk' checks both that the exported /* NOTE: making 'symbols.chk' checks both that the exported
* symbols in the library don't change and (implicitly) that * symbols in the library don't change and (implicitly) that
* scripts/pnglconf.h is as expected. If scripts/pnglconf.h * scripts/pnglibconf.h is as expected. If scripts/pnglibconf.h
* is remade using scripts/pnglconf.dfa then this checks the * is remade using scripts/pnglibconf.dfa then this checks the
* .dfa file too. * .dfa file too.
*/ */
...@@ -23,18 +23,18 @@ ...@@ -23,18 +23,18 @@
#define PNG_EXPORT_LAST_ORDINAL(ordinal)\ #define PNG_EXPORT_LAST_ORDINAL(ordinal)\
PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END
/* Read the defaults, but use scripts/pnglconf.h; the 'standard' /* Read the defaults, but use scripts/pnglibconf.h; the 'standard'
* header file. * header file.
*/ */
#include "pnglconf.h" #include "pnglibconf.h"
#include "../png.h" #include "../png.h"
/* Some things are turned off by default. Turn these things /* Some things are turned off by default. Turn these things
* on here (by hand) to get the APIs they expose and validate * on here (by hand) to get the APIs they expose and validate
* that no harm is done. This list is the set of options * that no harm is done. This list is the set of options
* defaulted to 'off' in scripts/pnglconf.dfa * defaulted to 'off' in scripts/pnglibconf.dfa
* *
* Maintenance: if scripts/pnglconf.dfa options are changed * Maintenance: if scripts/pnglibconf.dfa options are changed
* from, or to, 'off' this needs updating! * from, or to, 'off' this needs updating!
*/ */
#define PNG_BENIGN_ERRORS_SUPPORTED #define PNG_BENIGN_ERRORS_SUPPORTED
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或