cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Revised Makefile.am for better shared library names.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2009-11-12 18:10:00 -06:00
parent be199c1304
commit 1c6959cfbe
4 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.4.0beta97 - November 12, 2009 Libpng 1.4.0beta97 - November 13, 2009
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -658,9 +658,10 @@ version 1.4.0beta96 [November 12, 2009]
(evidently the same change made in libpng-1.0beta54 was lost). (evidently the same change made in libpng-1.0beta54 was lost).
Added PNG_PRIVATE macro definition in pngconf.h for possible future use. Added PNG_PRIVATE macro definition in pngconf.h for possible future use.
version 1.4.0beta97 [November 12, 2009] version 1.4.0beta97 [November 13, 2009]
Restored pngtest.png to the libpng-1.4.0beta7 version. Restored pngtest.png to the libpng-1.4.0beta7 version.
Removed projects/beos since no one seems to be supporting it. Removed projects/beos and netware.txt; no one seems to be supporting them.
Revised Makefile.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

5
CHANGES
View File

@ -2344,9 +2344,10 @@ version 1.4.0beta96 [November 12, 2009]
(evidently the same change made in libpng-1.0beta54 was lost). (evidently the same change made in libpng-1.0beta54 was lost).
Added PNG_PRIVATE macro definition in pngconf.h for possible future use. Added PNG_PRIVATE macro definition in pngconf.h for possible future use.
version 1.4.0beta97 [November 12, 2009] version 1.4.0beta97 [November 13, 2009]
Restored pngtest.png to the libpng-1.4.0beta7 version. Restored pngtest.png to the libpng-1.4.0beta7 version.
Removed projects/beos since no one seems to be supporting it. Removed projects/beos and netware.txt; no one seems to be supporting them.
Revised Makefile.in
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

15
Makefile.am
View File

@ -2,9 +2,9 @@
# Source file for Makefile.in (and hence Makefile) # Source file for Makefile.in (and hence Makefile)
# #
# Makefile.am need only be changed on a major version number # Makefile.am need only be changed on a major version number
# change (e.g. libpng12 --> libpng13). In that case seach # change (e.g. libpng12 --> libpng14). In that case seach
# this file for every instance of the old base name (libpng12) # this file for every instance of the old base name (libpng12)
# and change to the new one (libpng13), then change the # and change to the new one (libpng14), then change the
# -version-number settings below so that the new values have # -version-number settings below so that the new values have
# the correct major part (first field). # the correct major part (first field).
@ -34,7 +34,7 @@ EXTRA_LTLIBRARIES= libpng.la
libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c \ pngwtran.c pngmem.c pngerror.c pngpread.c \
png.h pngconf.h png.h pngconf.h pngpriv.h
libpng_la_SOURCES = $(libpng14_la_SOURCES) libpng_la_SOURCES = $(libpng14_la_SOURCES)
libpng_la_CPPFLAGS = @LIBPNG_DEFINES@ libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
@ -42,10 +42,10 @@ libpng14_la_CPPFLAGS = @LIBPNG_DEFINES@
# MAJOR UPGRADE: the version-number settings below must be changed. # MAJOR UPGRADE: the version-number settings below must be changed.
libpng14_la_LDFLAGS = -no-undefined -export-dynamic \ libpng14_la_LDFLAGS = -no-undefined -export-dynamic \
-version-number 14:@PNGLIB_RELEASE@:14 -version-number 14:@PNGLIB_RELEASE@:0
# -rpath is needed as automake doesn't know the directory # -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \ libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-version-number 14:@PNGLIB_RELEASE@:14 -version-number 14:@PNGLIB_RELEASE@:0
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
# Versioned symbols and restricted exports # Versioned symbols and restricted exports
@ -77,18 +77,15 @@ EXTRA_DIST= \
ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/cbuilder5/* \
${srcdir}/projects/beos/* \
${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc6/* \
${srcdir}/projects/visualc71/* \ ${srcdir}/projects/visualc71/* \
${srcdir}/projects/wince.txt \
${srcdir}/projects/netware.txt \
${srcdir}/scripts/* \ ${srcdir}/scripts/* \
${srcdir}/contrib/gregbook/* \ ${srcdir}/contrib/gregbook/* \
${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngminus/* \
${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \ ${srcdir}/contrib/visupng/* \
$(TESTS) \ $(TESTS) \
example.c libpng-1.4.0beta97.txt pngvcrd.c example.c libpng-1.4.0beta97.txt
CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \ CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
libpng.sym libpng.sym

15
Makefile.in
View File

@ -19,9 +19,9 @@
# Source file for Makefile.in (and hence Makefile) # Source file for Makefile.in (and hence Makefile)
# #
# Makefile.am need only be changed on a major version number # Makefile.am need only be changed on a major version number
# change (e.g. libpng12 --> libpng13). In that case seach # change (e.g. libpng12 --> libpng14). In that case seach
# this file for every instance of the old base name (libpng12) # this file for every instance of the old base name (libpng12)
# and change to the new one (libpng13), then change the # and change to the new one (libpng14), then change the
# -version-number settings below so that the new values have # -version-number settings below so that the new values have
# the correct major part (first field). # the correct major part (first field).
@ -314,7 +314,7 @@ EXTRA_LTLIBRARIES = libpng.la
libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ libpng14_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c \ pngwtran.c pngmem.c pngerror.c pngpread.c \
png.h pngconf.h png.h pngconf.h pngpriv.h
libpng_la_SOURCES = $(libpng14_la_SOURCES) libpng_la_SOURCES = $(libpng14_la_SOURCES)
libpng_la_CPPFLAGS = @LIBPNG_DEFINES@ libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
@ -322,10 +322,10 @@ libpng14_la_CPPFLAGS = @LIBPNG_DEFINES@
# MAJOR UPGRADE: the version-number settings below must be changed. # MAJOR UPGRADE: the version-number settings below must be changed.
libpng14_la_LDFLAGS = -no-undefined -export-dynamic -version-number \ libpng14_la_LDFLAGS = -no-undefined -export-dynamic -version-number \
14:@PNGLIB_RELEASE@:14 $(am__append_2) $(am__append_4) 14:@PNGLIB_RELEASE@:0 $(am__append_2) $(am__append_4)
# -rpath is needed as automake doesn't know the directory # -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \ libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-version-number 14:@PNGLIB_RELEASE@:14 $(am__append_1) \ -version-number 14:@PNGLIB_RELEASE@:0 $(am__append_1) \
$(am__append_3) $(am__append_3)
@HAVE_LD_VERSION_SCRIPT_FALSE@libpng14_la_DEPENDENCIES = libpng.sym @HAVE_LD_VERSION_SCRIPT_FALSE@libpng14_la_DEPENDENCIES = libpng.sym
@HAVE_LD_VERSION_SCRIPT_TRUE@libpng14_la_DEPENDENCIES = libpng.vers @HAVE_LD_VERSION_SCRIPT_TRUE@libpng14_la_DEPENDENCIES = libpng.vers
@ -341,18 +341,15 @@ EXTRA_DIST = \
ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/cbuilder5/* \
${srcdir}/projects/beos/* \
${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc6/* \
${srcdir}/projects/visualc71/* \ ${srcdir}/projects/visualc71/* \
${srcdir}/projects/wince.txt \
${srcdir}/projects/netware.txt \
${srcdir}/scripts/* \ ${srcdir}/scripts/* \
${srcdir}/contrib/gregbook/* \ ${srcdir}/contrib/gregbook/* \
${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngminus/* \
${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \ ${srcdir}/contrib/visupng/* \
$(TESTS) \ $(TESTS) \
example.c libpng-1.4.0beta97.txt pngvcrd.c example.c libpng-1.4.0beta97.txt
CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \ CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
libpng.sym libpng.sym