Imported from libpng-1.4.0beta1.tar
diff --git a/Makefile.am b/Makefile.am
index 00010fa..497e503 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
# test programs - run on make check, make distcheck
check_PROGRAMS= pngtest
pngtest_SOURCES = pngtest.c
-pngtest_LDADD = libpng12.la
+pngtest_LDADD = libpng14.la
TESTS = test-pngtest.sh
TESTS_ENVIRONMENT= srcdir=$(srcdir)
@@ -24,39 +24,39 @@
dist_man_MANS= libpng.3 libpngpf.3 png.5
# generate the -config scripts if required
-binconfigs= libpng12-config
-EXTRA_SCRIPTS= libpng-config libpng12-config
+binconfigs= libpng14-config
+EXTRA_SCRIPTS= libpng-config libpng14-config
bin_SCRIPTS= @binconfigs@
# rules to build libpng, only build the old library on request
-lib_LTLIBRARIES=libpng12.la @compatlib@
+lib_LTLIBRARIES=libpng14.la @compatlib@
EXTRA_LTLIBRARIES= libpng.la
-libpng12_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 \
pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c \
- png.h pngconf.h
-libpng_la_SOURCES = $(libpng12_la_SOURCES)
+ png.h pngconf.h pngintrn.h
+libpng_la_SOURCES = $(libpng14_la_SOURCES)
libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
-libpng12_la_CPPFLAGS = @LIBPNG_DEFINES@
+libpng14_la_CPPFLAGS = @LIBPNG_DEFINES@
# MAJOR UPGRADE: the version-number settings below must be changed.
-libpng12_la_LDFLAGS = -no-undefined -export-dynamic \
+libpng14_la_LDFLAGS = -no-undefined -export-dynamic \
-version-number 0:@PNGLIB_MINOR@:0
# -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
- -version-number 3:@PNGLIB_MINOR@:0
+ -version-number 14:@PNGLIB_MINOR@:0
if HAVE_LD_VERSION_SCRIPT
# Versioned symbols and restricted exports
- libpng12_la_LDFLAGS += -Wl,--version-script=libpng.vers
- libpng12_la_DEPENDENCIES = libpng.vers
+ libpng14_la_LDFLAGS += -Wl,--version-script=libpng.vers
+ libpng14_la_DEPENDENCIES = libpng.vers
else
# Only restricted exports when possible
- libpng12_la_LDFLAGS += -export-symbols libpng.sym
- libpng12_la_DEPENDENCIES = libpng.sym
+ libpng14_la_LDFLAGS += -export-symbols libpng.sym
+ libpng14_la_DEPENDENCIES = libpng.sym
endif
-libpng_la_DEPENDENCIES = $(libpng12_la_DEPENDENCIES)
+libpng_la_DEPENDENCIES = $(libpng14_la_DEPENDENCIES)
#distribute headers in /usr/include/libpng/*
pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
@@ -65,7 +65,7 @@
# pkg-config stuff, note that libpng.pc is always required in order
# to get the correct library
pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libpng12.pc
+pkgconfig_DATA = libpng14.pc
#extra source distribution files.
EXTRA_DIST= \
@@ -85,7 +85,7 @@
$(TESTS) \
example.c libpng.txt pngvcrd.c
-CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
+CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers libpng.sym
$(PNGLIB_BASENAME).pc: libpng.pc
cp libpng.pc $@
@@ -116,7 +116,7 @@
cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-# do evil things to libpng to cause libpng12 to be used, if
+# do evil things to libpng to cause libpng14 to be used, if
# the compat library is not being built do nothing.
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config