[devel] Revised Makefile.am for better shared library names.
diff --git a/ANNOUNCE b/ANNOUNCE
index 2bd15f2..1f26622 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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
within a few weeks by a public version or by another test version.
@@ -658,9 +658,10 @@
(evidently the same change made in libpng-1.0beta54 was lost).
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.
- 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
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index b91d5ff..9361222 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2344,9 +2344,10 @@
(evidently the same change made in libpng-1.0beta54 was lost).
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.
- 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
(subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index e404186..50cc606 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@
# Source file for Makefile.in (and hence Makefile)
#
# 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)
-# 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
# the correct major part (first field).
@@ -34,7 +34,7 @@
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 \
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_CPPFLAGS = @LIBPNG_DEFINES@
@@ -42,10 +42,10 @@
# MAJOR UPGRADE: the version-number settings below must be changed.
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
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
# Versioned symbols and restricted exports
@@ -77,18 +77,15 @@
ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/projects/cbuilder5/* \
- ${srcdir}/projects/beos/* \
${srcdir}/projects/visualc6/* \
${srcdir}/projects/visualc71/* \
- ${srcdir}/projects/wince.txt \
- ${srcdir}/projects/netware.txt \
${srcdir}/scripts/* \
${srcdir}/contrib/gregbook/* \
${srcdir}/contrib/pngminus/* \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(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 \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index b8a160a..a0fdaf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,9 +19,9 @@
# Source file for Makefile.in (and hence Makefile)
#
# 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)
-# 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
# the correct major part (first field).
@@ -314,7 +314,7 @@
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 \
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_CPPFLAGS = @LIBPNG_DEFINES@
@@ -322,10 +322,10 @@
# MAJOR UPGRADE: the version-number settings below must be changed.
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
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)
@HAVE_LD_VERSION_SCRIPT_FALSE@libpng14_la_DEPENDENCIES = libpng.sym
@HAVE_LD_VERSION_SCRIPT_TRUE@libpng14_la_DEPENDENCIES = libpng.vers
@@ -341,18 +341,15 @@
ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/projects/cbuilder5/* \
- ${srcdir}/projects/beos/* \
${srcdir}/projects/visualc6/* \
${srcdir}/projects/visualc71/* \
- ${srcdir}/projects/wince.txt \
- ${srcdir}/projects/netware.txt \
${srcdir}/scripts/* \
${srcdir}/contrib/gregbook/* \
${srcdir}/contrib/pngminus/* \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(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 \
libpng.sym
