[devel] Revise references to zlib/libpng license

This commit is contained in:
Glenn Randers-Pehrson
2009-07-28 16:46:03 -05:00
parent 0d6ade69e2
commit 922ad083e6
8 changed files with 173 additions and 171 deletions

View File

@@ -16,7 +16,7 @@ AUTOMAKE_OPTIONS = foreign
# test programs - run on make check, make distcheck
check_PROGRAMS= pngtest
pngtest_SOURCES = pngtest.c
pngtest_LDADD = libpng%NN%.la
pngtest_LDADD = libpngQQNNQQ.la
TESTS = test-pngtest.sh
TESTS_ENVIRONMENT= srcdir=$(srcdir)
@@ -24,39 +24,39 @@ TESTS_ENVIRONMENT= srcdir=$(srcdir)
dist_man_MANS= libpng.3 libpngpf.3 png.5
# generate the -config scripts if required
binconfigs= libpng%NN%-config
EXTRA_SCRIPTS= libpng-config libpng%NN%-config
binconfigs= libpngQQNNQQ-config
EXTRA_SCRIPTS= libpng-config libpngQQNNQQ-config
bin_SCRIPTS= @binconfigs@
# rules to build libpng, only build the old library on request
lib_LTLIBRARIES=libpng%NN%.la @compatlib@
lib_LTLIBRARIES=libpngQQNNQQ.la @compatlib@
EXTRA_LTLIBRARIES= libpng.la
libpng%NN%_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
libpngQQNNQQ_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c \
png.h pngconf.h
libpng_la_SOURCES = $(libpng%NN%_la_SOURCES)
libpng_la_SOURCES = $(libpngQQNNQQ_la_SOURCES)
libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
libpng%NN%_la_CPPFLAGS = @LIBPNG_DEFINES@
libpngQQNNQQ_la_CPPFLAGS = @LIBPNG_DEFINES@
# MAJOR UPGRADE: the version-number settings below must be changed.
libpng%NN%_la_LDFLAGS = -no-undefined -export-dynamic \
-version-number %NN%:@PNGLIB_RELEASE@:%NN%
libpngQQNNQQ_la_LDFLAGS = -no-undefined -export-dynamic \
-version-number QQNNQQ:@PNGLIB_RELEASE@:QQNNQQ
# -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-version-number 14:@PNGLIB_RELEASE@:%NN%
-version-number QQOLDSONUMQQ:@PNGLIB_RELEASE@:QQNNQQ
if HAVE_LD_VERSION_SCRIPT
# Versioned symbols and restricted exports
libpng%NN%_la_LDFLAGS += -Wl,--version-script=libpng.vers
libpng%NN%_la_DEPENDENCIES = libpng.vers
libpngQQNNQQ_la_LDFLAGS += -Wl,--version-script=libpng.vers
libpngQQNNQQ_la_DEPENDENCIES = libpng.vers
else
# Only restricted exports when possible
libpng%NN%_la_LDFLAGS += -export-symbols libpng.sym
libpng%NN%_la_DEPENDENCIES = libpng.sym
libpngQQNNQQ_la_LDFLAGS += -export-symbols libpng.sym
libpngQQNNQQ_la_DEPENDENCIES = libpng.sym
endif
libpng_la_DEPENDENCIES = $(libpng%NN%_la_DEPENDENCIES)
libpng_la_DEPENDENCIES = $(libpngQQNNQQ_la_DEPENDENCIES)
# Avoid depending upon Character Ranges.
AN = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
@@ -68,7 +68,7 @@ pkginclude_HEADERS= png.h pngconf.h
# pkg-config stuff, note that libpng.pc is always required in order
# to get the correct library
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libpng%NN%.pc
pkgconfig_DATA = libpngQQNNQQ.pc
#extra source distribution files.
EXTRA_DIST= \
@@ -86,9 +86,9 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
example.c libpng-1.4.0beta71.txt pngvcrd.c
example.c libpng-QQVERQQ.txt pngvcrd.c
CLEANFILES= pngout.png libpng%NN%.pc libpng%NN%-config libpng.vers \
CLEANFILES= pngout.png libpngQQNNQQ.pc libpngQQNNQQ-config libpng.vers \
libpng.sym
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
@@ -127,7 +127,7 @@ install-data-hook:
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
# do evil things to libpng to cause libpng%NN% to be used
# do evil things to libpng to cause libpngQQNNQQ to be used
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config
cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config