diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2006-03-07 07:09:22 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:08:37 -0500 |
| commit | 5c60b2367ee41cca4a2e43f8bb74797f4c066e60 (patch) | |
| tree | c14fc16a7dbb13ac63b960596542c1e266a563bc | |
| parent | b7f95937158f274bc48c14f510330a604c379266 (diff) | |
| download | libpng-1.2.9beta7.tar.gz | |
Imported from libpng-1.2.9beta7.tarv1.2.9beta7
61 files changed, 1307 insertions, 954 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.9beta6 - March 6, 2006 +Libpng 1.2.9beta7 - March 7, 2006 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. @@ -9,26 +9,26 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.2.9beta6.tar.gz - 1.2.9beta6.tar.bz2 + 1.2.9beta7.tar.gz + 1.2.9beta7.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp129b06.zip - lp129b06.tar.bz2 + lp129b07.zip + lp129b07.tar.bz2 Project files - 1.2.9beta6-project-netware.zip - 1.2.9beta6-project-wince.zip + 1.2.9beta7-project-netware.zip + 1.2.9beta7-project-wince.zip Other information: - 1.2.9beta6-README.txt - 1.2.9beta6-KNOWNBUGS.txt - 1.2.9beta6-LICENSE.txt - 1.2.9beta6-Y2K-compliance.txt + 1.2.9beta7-README.txt + 1.2.9beta7-KNOWNBUGS.txt + 1.2.9beta7-LICENSE.txt + 1.2.9beta7-Y2K-compliance.txt Changes since the last public release (1.2.8): @@ -102,7 +102,15 @@ version 1.2.9beta5 [March 4, 2006] Restored scripts/makefile.elf which was inadvertently deleted. version 1.2.9beta6 [March 6, 2006] - Fix typo (%RELEASE%) in configuration files. + Fixed typo (%RELEASE%) in configuration files. + +version 1.2.9beta7 [March 7, 2006] + Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am + Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s() + in png.h. + Updated makefile.elf as suggested by debian. + Made cosmetic changes to some makefiles, adding LN_SF and other macros. + Made some makefiles accept "exec_prefix". Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1481,7 +1481,15 @@ version 1.2.9beta5 [March 4, 2006] Restored scripts/makefile.elf which was inadvertently deleted. version 1.2.9beta6 [March 6, 2006] - Fix typo (9) in configuration files. + Fixed typo (9) in configuration files. + +version 1.2.9beta7 [March 7, 2006] + Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am + Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s() + in png.h. + Updated makefile.elf as suggested by debian. + Made cosmetic changes to some makefiles, adding LN_SF and other macros. + Made some makefiles accept "exec_prefix". version 1.4.0beta1 [future] Enabled iTXt support (changes png_struct, thus requires so-number change). @@ -1,5 +1,5 @@ -Installing libpng version 1.2.9beta6 - March 6, 2006 +Installing libpng version 1.2.9beta7 - March 7, 2006 On Unix/Linux and similar systems, you can simply type @@ -29,7 +29,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.9beta6" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.9beta7" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -85,11 +85,11 @@ include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.9beta6) + gcc, creates libpng12.so.0.1.2.9beta7) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta6) + (gcc, creates libpng12.so.0.1.2.9beta7) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta6, + (gcc, creates libpng12.so.0.1.2.9beta7, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -112,12 +112,12 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.9beta6) + creates libpng12.so.0.1.2.9beta7) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.9beta6) + creates libpng12.so.0.1.2.9beta7) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.9beta6) + creates libpng12.so.0.1.2.9beta7) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.9beta6 +Known bugs in libpng version 1.2.9beta7 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.9beta6, March 6, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.9beta7, March 7, 2006, are Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 6, 2006 +March 7, 2006 diff --git a/Makefile.am b/Makefile.am index 16e1c4e07..2edd83a3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,8 +34,7 @@ EXTRA_LTLIBRARIES= libpng.la libpng12_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.sym libpng.vers -BUILT_SOURCES = libpng.sym libpng.vers + png.h pngconf.h libpng_la_SOURCES = $(libpng12_la_SOURCES) # MAJOR UPGRADE: the version-number settings below must be changed. libpng12_la_LDFLAGS = -no-undefined -export-dynamic \ @@ -43,16 +42,17 @@ libpng12_la_LDFLAGS = -no-undefined -export-dynamic \ # -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 -libpng12_la_LIBADD = @PNG_LIBS@ -libpng_la_LIBADD = @PNG_LIBS@ if HAVE_LD_VERSION_SCRIPT # Versioned symbols and restricted exports libpng12_la_LDFLAGS += -Wl,--version-script=libpng.vers + libpng12_la_DEPENDENCIES = libpng.vers else # Only restricted exports when possible libpng12_la_LDFLAGS += -export-symbols libpng.sym + libpng12_la_DEPENDENCIES = libpng.sym endif +libpng_la_DEPENDENCIES = $(libpng12_la_DEPENDENCIES) #distribute headers in /usr/include/libpng/* pkgincludedir= $(includedir)/$(PNGLIB_BASENAME) @@ -90,21 +90,16 @@ $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ libpng.sym: png.h pngconf.h - rm -f $@ - $(CPP) $(CPPFLAGS) -DPNG_BUILDSYMS -DPNG_INTERNAL $(srcdir)/png.h | \ - $(AWK) -F '[\t [\\]();]' '{ \ - for (i=1;i+2<=NF;++i)\ - if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ - print $$(i+1) ;\ - for (i=1;i+1<=NF;++i)\ - if ($$(i)=="PNG_DATA_EXPORT")\ - print $$(i+1) ;\ - }' > $@.new + rm -f $@ $@.new + $(CPP) $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ + $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ + -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ + >$@.new mv $@.new $@ libpng.vers: libpng.sym - rm -f $@ - $(ECHO) PNG12_0 '{global:' > $@.new + rm -f $@ $@.new + $(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new $(SED) s/$$/\;/ $< >> $@.new $(ECHO) 'local: *; };' >> $@.new mv $@.new $@ diff --git a/Makefile.in b/Makefile.in index 56a1ee1b3..1cfb57f2c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,13 +78,13 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libpng_la_DEPENDENCIES = +libpng_la_LIBADD = am__objects_1 = png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo \ pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo \ pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo am_libpng_la_OBJECTS = $(am__objects_1) libpng_la_OBJECTS = $(am_libpng_la_OBJECTS) -libpng12_la_DEPENDENCIES = +libpng12_la_LIBADD = am_libpng12_la_OBJECTS = png.lo pngset.lo pngget.lo pngrutil.lo \ pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo \ pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo \ @@ -190,7 +190,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PNGLIB_MAJOR = @PNGLIB_MAJOR@ PNGLIB_MINOR = @PNGLIB_MINOR@ PNGLIB_VERSION = @PNGLIB_VERSION@ -PNG_LIBS = @PNG_LIBS@ POW_LIB = @POW_LIB@ RANLIB = @RANLIB@ SED = @SED@ @@ -270,9 +269,8 @@ EXTRA_LTLIBRARIES = libpng.la libpng12_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.sym libpng.vers + png.h pngconf.h -BUILT_SOURCES = libpng.sym libpng.vers libpng_la_SOURCES = $(libpng12_la_SOURCES) # MAJOR UPGRADE: the version-number settings below must be changed. libpng12_la_LDFLAGS = -no-undefined -export-dynamic -version-number \ @@ -281,8 +279,9 @@ libpng12_la_LDFLAGS = -no-undefined -export-dynamic -version-number \ libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \ -version-number 3:@PNGLIB_MINOR@:0 -libpng12_la_LIBADD = @PNG_LIBS@ -libpng_la_LIBADD = @PNG_LIBS@ +@HAVE_LD_VERSION_SCRIPT_FALSE@libpng12_la_DEPENDENCIES = libpng.sym +@HAVE_LD_VERSION_SCRIPT_TRUE@libpng12_la_DEPENDENCIES = libpng.vers +libpng_la_DEPENDENCIES = $(libpng12_la_DEPENDENCIES) pkginclude_HEADERS = png.h pngconf.h pkgconfig_DATA = libpng12.pc @@ -305,7 +304,7 @@ EXTRA_DIST = \ example.c libpng.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym -all: $(BUILT_SOURCES) config.h +all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -854,16 +853,14 @@ distcleancheck: distclean check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am +check: check-am all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) \ config.h installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am +install: install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -888,7 +885,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -985,21 +981,16 @@ $(PNGLIB_BASENAME)-config: libpng-config cp libpng-config $@ libpng.sym: png.h pngconf.h - rm -f $@ - $(CPP) $(CPPFLAGS) -DPNG_BUILDSYMS -DPNG_INTERNAL $(srcdir)/png.h | \ - $(AWK) -F '[\t [\\]();]' '{ \ - for (i=1;i+2<=NF;++i)\ - if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ - print $$(i+1) ;\ - for (i=1;i+1<=NF;++i)\ - if ($$(i)=="PNG_DATA_EXPORT")\ - print $$(i+1) ;\ - }' > $@.new + rm -f $@ $@.new + $(CPP) $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ + $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ + -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ + >$@.new mv $@.new $@ libpng.vers: libpng.sym - rm -f $@ - $(ECHO) PNG12_0 '{global:' > $@.new + rm -f $@ $@.new + $(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new $(SED) s/$$/\;/ $< >> $@.new $(ECHO) 'local: *; };' >> $@.new mv $@.new $@ @@ -1,4 +1,4 @@ -README for libpng version 1.2.9beta6 - March 6, 2006 (shared library 12.0) +README for libpng version 1.2.9beta7 - March 7, 2006 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -190,11 +190,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.9beta6) + gcc, creates libpng12.so.0.1.2.9beta7) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta6) + (gcc, creates libpng12.so.0.1.2.9beta7) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.9beta6, + (gcc, creates libpng12.so.0.1.2.9beta7, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -216,12 +216,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.9beta6) + (gcc, creates libpng12.so.0.1.2.9beta7) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.9beta6) + (gcc, creates libpng12.so.0.1.2.9beta7) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.9beta6) + (gcc, creates libpng12.so.0.1.2.9beta7) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - March 6, 2006 + March 7, 2006 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.9beta6 are Y2K compliant. It is my belief that earlier + upward through 1.2.9beta7 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/aclocal.m4 b/aclocal.m4 index 306743193..4a12a9c20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -219,6 +219,14 @@ AC_ARG_WITH([pic], [pic_mode=default]) test -z "$pic_mode" && pic_mode=default +# Check if we have a version mismatch between libtool.m4 and ltmain.sh. +# +# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. +# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually +# calls AC_LIBTOOL_CONFIG and creates libtool. +# +_LT_VERSION_CHECK + # Use C for the default configuration in the libtool script tagname= AC_LIBTOOL_LANG_C_CONFIG @@ -226,6 +234,41 @@ _LT_AC_TAGCONFIG ])# AC_LIBTOOL_SETUP +# _LT_VERSION_CHECK +# ----------------- +AC_DEFUN([_LT_VERSION_CHECK], +[AC_MSG_CHECKING([for correct ltmain.sh version]) +if test "x$ltmain" = "x" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([ + +*** @<:@Gentoo@:>@ sanity check failed! *** +*** \$ltmain is not defined, please check the patch for consistency! *** +]) +fi +gentoo_lt_version="1.5.22" +gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"` +if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([ + +*** @<:@Gentoo@:>@ sanity check failed! *** +*** libtool.m4 and ltmain.sh have a version mismatch! *** +*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** + +Please run: + + libtoolize --copy --force + +if appropriate, please contact the maintainer of this +package (or your distribution) for help. +]) +else + AC_MSG_RESULT(yes) +fi +])# _LT_VERSION_CHECK + + # _LT_AC_SYS_COMPILER # ------------------- AC_DEFUN([_LT_AC_SYS_COMPILER], @@ -1356,6 +1399,30 @@ cygwin* | mingw* | pw32*) esac ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + $archive_expsym_cmds="$archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; @@ -1420,7 +1487,14 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -1431,6 +1505,12 @@ freebsd* | dragonfly*) library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in diff --git a/config.h.in b/config.h.in index e6a839e74..89c260ded 100644 --- a/config.h.in +++ b/config.h.in @@ -6,6 +6,12 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ #undef HAVE_MALLOC @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta6. +# Generated by GNU Autoconf 2.59 for libpng 1.2.9beta7. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.9beta6' -PACKAGE_STRING='libpng 1.2.9beta6' +PACKAGE_VERSION='1.2.9beta7' +PACKAGE_STRING='libpng 1.2.9beta7' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP CPP SED ac_ct_SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PNG_LIBS HAVE_LD_VERSION_SCRIPT_TRUE HAVE_LD_VERSION_SCRIPT_FALSE PNGLIB_VERSION PNGLIB_MAJOR PNGLIB_MINOR pkgconfigdir binconfigs compatlib LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP CPP SED ac_ct_SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB HAVE_LD_VERSION_SCRIPT_TRUE HAVE_LD_VERSION_SCRIPT_FALSE PNGLIB_VERSION PNGLIB_MAJOR PNGLIB_MINOR pkgconfigdir binconfigs compatlib LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.2.9beta6 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.9beta7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.9beta6:";; + short | recursive ) echo "Configuration of libpng 1.2.9beta7:";; esac cat <<\_ACEOF @@ -1167,7 +1167,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.9beta6 +libpng configure 1.2.9beta7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1181,7 +1181,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.2.9beta6, which was +It was created by libpng $as_me 1.2.9beta7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1824,7 +1824,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.9beta6' + VERSION='1.2.9beta7' cat >>confdefs.h <<_ACEOF @@ -1979,7 +1979,7 @@ fi -PNGLIB_VERSION=1.2.9beta6 +PNGLIB_VERSION=1.2.9beta7 PNGLIB_MAJOR=12 PNGLIB_MINOR=9 @@ -3560,46 +3560,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$AWK" && break -done - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}sed", so it can be a program name with args. set dummy ${ac_tool_prefix}sed; ac_word=$2 @@ -4175,7 +4135,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4178 "configure"' > conftest.$ac_ext + echo '#line 4138 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5540,7 +5500,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5543:" \ +echo "$as_me:5503:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6530,6 +6490,67 @@ else fi; test -z "$pic_mode" && pic_mode=default +# Check if we have a version mismatch between libtool.m4 and ltmain.sh. +# +# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined. +# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually +# calls AC_LIBTOOL_CONFIG and creates libtool. +# +echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5 +echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6 +if test "x$ltmain" = "x" ; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: + +*** [Gentoo] sanity check failed! *** +*** \$ltmain is not defined, please check the patch for consistency! *** +" >&5 +echo "$as_me: error: + +*** [Gentoo] sanity check failed! *** +*** \$ltmain is not defined, please check the patch for consistency! *** +" >&2;} + { (exit 1); exit 1; }; } +fi +gentoo_lt_version="1.5.22" +gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"` +if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: + +*** [Gentoo] sanity check failed! *** +*** libtool.m4 and ltmain.sh have a version mismatch! *** +*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** + +Please run: + + libtoolize --copy --force + +if appropriate, please contact the maintainer of this +package (or your distribution) for help. +" >&5 +echo "$as_me: error: + +*** [Gentoo] sanity check failed! *** +*** libtool.m4 and ltmain.sh have a version mismatch! *** +*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** + +Please run: + + libtoolize --copy --force + +if appropriate, please contact the maintainer of this +package (or your distribution) for help. +" >&2;} + { (exit 1); exit 1; }; } +else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +fi + + # Use C for the default configuration in the libtool script tagname= lt_save_CC="$CC" @@ -6603,11 +6624,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6606: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6627: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6610: \$? = $ac_status" >&5 + echo "$as_me:6631: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6871,11 +6892,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6895: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6878: \$? = $ac_status" >&5 + echo "$as_me:6899: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6975,11 +6996,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6999: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6982: \$? = $ac_status" >&5 + echo "$as_me:7003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8218,6 +8239,30 @@ cygwin* | mingw* | pw32*) esac ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + $archive_expsym_cmds="$archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; @@ -8282,7 +8327,14 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -8293,6 +8345,12 @@ freebsd* | dragonfly*) library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -9320,7 +9378,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9323 "configure" +#line 9381 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9420,7 +9478,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9423 "configure" +#line 9481 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11760,11 +11818,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11763: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11821: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11767: \$? = $ac_status" >&5 + echo "$as_me:11825: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11864,11 +11922,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11867: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11925: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11871: \$? = $ac_status" >&5 + echo "$as_me:11929: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12174,6 +12232,30 @@ cygwin* | mingw* | pw32*) esac ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + $archive_expsym_cmds="$archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; @@ -12238,7 +12320,14 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -12249,6 +12338,12 @@ freebsd* | dragonfly*) library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -13434,11 +13529,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13437: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13532: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13441: \$? = $ac_status" >&5 + echo "$as_me:13536: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13538,11 +13633,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13541: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13636: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13545: \$? = $ac_status" >&5 + echo "$as_me:13640: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14761,6 +14856,30 @@ cygwin* | mingw* | pw32*) esac ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + $archive_expsym_cmds="$archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; @@ -14825,7 +14944,14 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -14836,6 +14962,12 @@ freebsd* | dragonfly*) library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -15741,11 +15873,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15744: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15876: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15748: \$? = $ac_status" >&5 + echo "$as_me:15880: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16009,11 +16141,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16012: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16144: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16016: \$? = $ac_status" >&5 + echo "$as_me:16148: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16113,11 +16245,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16116: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16248: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16120: \$? = $ac_status" >&5 + echo "$as_me:16252: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17356,6 +17488,30 @@ cygwin* | mingw* | pw32*) esac ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + $archive_expsym_cmds="$archive_cmds" + fi + else + ld_shlibs=no + fi + ;; + *) library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; @@ -17420,7 +17576,14 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -17431,6 +17594,12 @@ freebsd* | dragonfly*) library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -20021,7 +20190,8 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then _ACEOF else - echo "$as_me:$LINENO: checking for pow in -lm" >&5 + +echo "$as_me:$LINENO: checking for pow in -lm" >&5 echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6 if test "${ac_cv_lib_m_pow+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20086,7 +20256,12 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5 echo "${ECHO_T}$ac_cv_lib_m_pow" >&6 if test $ac_cv_lib_m_pow = yes; then - PNG_LIBS="$PNG_LIBS -lm" + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF + + LIBS="-lm $LIBS" + else { { echo "$as_me:$LINENO: error: cannot find pow" >&5 echo "$as_me: error: cannot find pow" >&2;} @@ -20096,6 +20271,7 @@ fi fi done + echo "$as_me:$LINENO: checking for zlibVersion in -lz" >&5 echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_zlibVersion+set}" = set; then @@ -20161,7 +20337,12 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_z_zlibVersion" >&5 echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6 if test $ac_cv_lib_z_zlibVersion = yes; then - PNG_LIBS="$PNG_LIBS -lz" + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF + + LIBS="-lz $LIBS" + else { { echo "$as_me:$LINENO: error: zlib not installed" >&5 echo "$as_me: error: zlib not installed" >&2;} @@ -20169,7 +20350,6 @@ echo "$as_me: error: zlib not installed" >&2;} fi - echo "$as_me:$LINENO: checking if libraries can be versioned" >&5 echo $ECHO_N "checking if libraries can be versioned... $ECHO_C" >&6 GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` @@ -20653,7 +20833,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by libpng $as_me 1.2.9beta6, which was +This file was extended by libpng $as_me 1.2.9beta7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20716,7 +20896,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.9beta6 +libpng config.status 1.2.9beta7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -20988,7 +21168,6 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@POW_LIB@,$POW_LIB,;t t -s,@PNG_LIBS@,$PNG_LIBS,;t t s,@HAVE_LD_VERSION_SCRIPT_TRUE@,$HAVE_LD_VERSION_SCRIPT_TRUE,;t t s,@HAVE_LD_VERSION_SCRIPT_FALSE@,$HAVE_LD_VERSION_SCRIPT_FALSE,;t t s,@PNGLIB_VERSION@,$PNGLIB_VERSION,;t t diff --git a/configure.ac b/configure.ac index 57153290a..1d78d57a3 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.9beta6], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.9beta7], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.9beta6 +PNGLIB_VERSION=1.2.9beta7 PNGLIB_MAJOR=12 PNGLIB_MINOR=9 @@ -36,7 +36,6 @@ AM_CONFIG_HEADER([config.h]) AC_PROG_CC AC_PROG_LD AC_PROG_CPP -AC_PROG_AWK AC_CHECK_TOOL(SED, sed, :) AC_PROG_INSTALL AC_PROG_LN_S @@ -56,9 +55,8 @@ AC_STRUCT_TM AC_FUNC_MALLOC AC_FUNC_STRTOD AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc])) -AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, PNG_LIBS="$PNG_LIBS -lm", AC_ERROR([cannot find pow])) ) -AC_CHECK_LIB(z, zlibVersion, PNG_LIBS="$PNG_LIBS -lz", AC_ERROR([zlib not installed])) -AC_SUBST(PNG_LIBS) +AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) ) +AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed])) AC_MSG_CHECKING([if libraries can be versioned]) GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 6, 2006" +.TH LIBPNG 3 "March 7, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta7 .SH SYNOPSIS \fI\fB @@ -817,7 +817,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.9beta6 - March 6, 2006 + libpng version 1.2.9beta7 - March 7, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3721,13 +3721,13 @@ application: .SH IX. Y2K Compliance in libpng -March 6, 2006 +March 7, 2006 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.9beta6 are Y2K compliant. It is my belief that earlier +upward through 1.2.9beta7 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3881,7 +3881,7 @@ the first widely used release: 1.0.18 10 10018 12.so.0.1.0.18 1.2.8 13 10208 12.so.0.1.2.8 1.2.9beta1-3 13 10209 12.so.0.1.2.9beta1-3 - 1.2.9beta4-6 13 10209 12.so.0.9[.0] + 1.2.9beta4-7 13 10209 12.so.0.9[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3937,7 +3937,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.9beta6 - March 6, 2006: +Libpng version 1.2.9beta7 - March 7, 2006: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3958,7 +3958,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.9beta6, March 6, 2006, are +libpng versions 1.2.6, August 15, 2004, through 1.2.9beta7, March 7, 2006, are Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -4057,7 +4057,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 6, 2006 +March 7, 2006 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 18a4bc2fd..7867d758e 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.9beta6 - March 6, 2006 + libpng version 1.2.9beta7 - March 7, 2006 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2904,13 +2904,13 @@ application: IX. Y2K Compliance in libpng -March 6, 2006 +March 7, 2006 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.9beta6 are Y2K compliant. It is my belief that earlier +upward through 1.2.9beta7 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpngpf.3 b/libpngpf.3 index e09c7df8a..e9df46ee1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 6, 2006" +.TH LIBPNGPF 3 "March 7, 2006" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.9beta7 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 6, 2006" +.TH PNG 5 "March 7, 2006" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_9beta6 Your_png_h_is_not_version_1_2_9beta6; +typedef version_1_2_9beta7 Your_png_h_is_not_version_1_2_9beta7; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.9beta6 - March 6, 2006\n\ + return ((png_charp) "\n libpng version 1.2.9beta7 - March 7, 2006\n\ Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.9beta6 - March 6, 2006 + * libpng version 1.2.9beta7 - March 7, 2006 * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -9,7 +9,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.9beta6 - March 6, 2006: Glenn + * libpng versions 0.97, January 1998, through 1.2.9beta7 - March 7, 2006: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -113,7 +113,7 @@ * 1.0.18 10 10018 12.so.0.1.0.18 * 1.2.8 13 10208 12.so.0.1.2.8 * 1.2.9beta1-3 13 10209 12.so.0.1.2.9beta1-3 - * 1.2.9beta4-6 13 10209 12.so.0.9[.0] + * 1.2.9beta4-7 13 10209 12.so.0.9[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -143,7 +143,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.9beta6, March 6, 2006, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.9beta7, March 7, 2006, are * Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -255,13 +255,13 @@ * Y2K compliance in libpng: * ========================= * - * March 6, 2006 + * March 7, 2006 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.9beta6 are Y2K compliant. It is my belief that earlier + * upward through 1.2.9beta7 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -317,9 +317,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.9beta6" +#define PNG_LIBPNG_VER_STRING "1.2.9beta7" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.9beta6 - March 6, 2006 (header)\n" + " libpng version 1.2.9beta7 - March 7, 2006 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -331,7 +331,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 6 +#define PNG_LIBPNG_VER_BUILD 7 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1361,7 +1361,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_2_9beta6; +typedef png_structp version_1_2_9beta7; typedef png_struct FAR * FAR * png_structpp; @@ -2337,11 +2337,12 @@ extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr, #ifdef PNG_FLOATING_POINT_SUPPORTED extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr, png_infop info_ptr, int unit, double width, double height)); -#endif +#else #ifdef PNG_FIXED_POINT_SUPPORTED extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr, png_infop info_ptr, int unit, png_charp swidth, png_charp sheight)); #endif +#endif #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */ #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) @@ -2437,7 +2438,9 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr, #define png_debug2(l, m, p1, p2) #endif +#if 0 extern PNG_EXPORT(png_bytep,png_sig_bytes) PNGARG((void)); +#endif extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr)); extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr)); @@ -2756,8 +2759,10 @@ extern PNG_EXPORT(void,png_save_uint_16) #ifdef PNG_USE_GLOBAL_ARRAYS PNG_EXPORT_VAR (const png_byte FARDATA) png_sig[8]; #else +#if 0 #define png_sig png_sig_bytes(NULL) #endif +#endif #endif /* PNG_NO_EXTERN */ /* Constant strings for known chunk types. If you need to add a chunk, @@ -4,7 +4,7 @@ #if defined(PNG_1_0_X) #endif #if defined (PNG_1_2_X) - * libpng version 1.2.9beta6 - March 6, 2006 + * libpng version 1.2.9beta7 - March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2005 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 8ae11d077..c1079244d 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 2690202ad..8c4cc9ef2 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -7,7 +7,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index bede4a7c5..22b473342 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index db51553a9..f6d6f8761 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1551,4 +1551,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_9beta6 your_png_h_is_not_version_1_2_9beta6; +typedef version_1_2_9beta7 your_png_h_is_not_version_1_2_9beta7; diff --git a/pngtrans.c b/pngtrans.c index 9708ac82a..60e52ae7b 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index 8253a73a4..9ebf83652 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index cfee8c14f..da8b85399 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index d577f9503..8cf3d2c60 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.9 March 6, 2006 + * Last changed in libpng 1.2.9 March 7, 2006 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2006 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 64dd8c305..ea593eb77 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.9beta6 +version=1.2.9beta7 prefix="" libdir="" libs="" diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index d686d2160..37ab6684b 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -1,16 +1,28 @@ # makefile for libpng on Solaris 2.x with cc # Contributed by William L. Sebok, based on makefile.linux -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h +LIBNAME=libpng12 +PNGMAJ = 0 +PNGMIN = 1.2.9beta7 +PNGVER = $(PNGMAJ).$(PNGMIN) + CC=cc +AR_RC=ar rc +MKDIR_P=mkdir -p +LN_SF=ln -f -s +RANLIB=echo +RM_F=/bin/rm -f + SUN_CC_FLAGS=-fast -xtarget=ultra SUN_LD_FLAGS=-fast -xtarget=ultra # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a +exec_prefix=$prefix # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want @@ -28,18 +40,10 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm -#RANLIB=ranlib -RANLIB=echo - -LIBNAME=libpng12 -PNGMAJ = 0 -PNGMIN = 1.2.9beta6 -PNGVER = $(PNGMAJ).$(PNGMIN) - INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -70,7 +74,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -90,10 +94,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) @case "`type ld`" in *ucb*) \ @@ -111,7 +115,7 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \ -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -libpng.so.0.$(PNGMIN): $(OBJS) +libpng.so.0.$(PNGMIN): $(OBJSDLL) $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.0 \ -o libpng.so.0.$(PNGMIN) $(OBJSDLL) @@ -126,59 +130,60 @@ install-headers: png.h pngconf.h -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm $(DI)/libpng - (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -f -s $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGVER)* + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGVER)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -f -s libpng.so.0 libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/libpng12.pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc - cp libpng.pc $(DL)/pkgconfig/libpng12.pc - chmod 644 $(DL)/pkgconfig/libpng12.pc - (cd $(DL)/pkgconfig; ln -f -s libpng12.pc libpng.pc) + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc + cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc + chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/libpng12-config - cp libpng-config $(DB)/libpng12-config - chmod 755 $(DB)/libpng12-config - (cd $(DB); ln -f -s libpng12-config libpng-config) + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config + cp libpng-config $(DB)/$(LIBNAME)-config + chmod 755 $(DB)/$(LIBNAME)-config + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -190,8 +195,8 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \ $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtestd pngtest.png @@ -199,13 +204,13 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index fcd38a151..764ec32db 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -1,16 +1,28 @@ # makefile for libpng on Solaris 2.x with cc # Contributed by William L. Sebok, based on makefile.linux -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h +LIBNAME=libpng12 +PNGMAJ = 0 +PNGMIN = 1.2.9beta7 +PNGVER = $(PNGMAJ).$(PNGMIN) + CC=cc +AR_RC=ar rc +MKDIR_P=mkdir -p +LN_SF=ln -f -s +RANLIB=echo +RM_F=/bin/rm -f + SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9 SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9 # where make install puts libpng.a, libpng12.so and libpng12/png.h prefix=/a +exec_prefix=$prefix # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want @@ -28,18 +40,10 @@ CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - -LIBNAME=libpng12 -PNGMAJ = 0 -PNGMIN = 1.2.9beta6 -PNGVER = $(PNGMAJ).$(PNGMIN) - INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -70,7 +74,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -90,10 +94,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) @case "`type ld`" in *ucb*) \ @@ -126,60 +130,60 @@ install-headers: png.h pngconf.h -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm $(DI)/libpng - (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -f -s $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ).$(PNGVER)* - -@/bin/rm -f $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGVER)* + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGVER)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -f -s libpng.so.0 libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -191,8 +195,8 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \ $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtestd pngtest.png @@ -200,13 +204,13 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags ` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 10c9b9e8c..6687db9c9 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -1,5 +1,5 @@ # makefile for libpng using gcc (generic, static library) -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. @@ -12,13 +12,14 @@ ZLIBLIB = ../zlib # Compiler, linker, lib and other tools CC = gcc LD = $(CC) -AR = ar rcs +AR_RC = ar rcs RANLIB = ranlib -RM = rm -f +RM_F = rm -f +LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -60,7 +61,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ all: $(LIBNAME)$(A) pngtest$(E) $(LIBNAME)$(A): $(OBJS) - $(AR) $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ test: pngtest$(E) @@ -73,24 +74,24 @@ install: $(LIBNAME)$(A) -@if [ ! -d $(DI) ]; then mkdir $(DI); fi -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@rm -f $(DI)/$(LIBNAME)/png.h - -@rm -f $(DI)/$(LIBNAME)/pngconf.h - -@rm -f $(DI)/png.h - -@rm -f $(DI)/pngconf.h + -@$(RM_F) $(DI)/$(LIBNAME)/png.h + -@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h + -@$(RM_F) $(DI)/png.h + -@$(RM_F) $(DI)/pngconf.h cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h \ $(DI)/$(LIBNAME)/pngconf.h - -@rm -rf $(DI)/libpng - (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) - -@rm -f $(DL)/$(LIBNAME)$(A) - -@rm -f $(DL)/libpng$(A) + -@$(RM_F) -r $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) + -@$(RM_F) $(DL)/$(LIBNAME)$(A) + -@$(RM_F) $(DL)/libpng$(A) cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A) chmod 644 $(DL)/$(LIBNAME)$(A) - (cd $(DL); ln -f -s $(LIBNAME)$(A) libpng$(A)) - (cd $(DI); ln -f -s libpng/* .;) + (cd $(DL); $(LN_SF) $(LIBNAME)$(A) libpng$(A)) + (cd $(DI); $(LN_SF) libpng/* .;) clean: - /bin/rm -f *.o $(LIBNAME)$(A) pngtest pngout.png + $(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png png$(O): png.h pngconf.h pngerror$(O): png.h pngconf.h diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 4963f9511..439dc9741 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -1,18 +1,23 @@ # makefile for libpng on BeOS x86 ELF with gcc # modified from makefile.linux by Sander Stoks -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h CC=gcc +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f # Where the zlib library and include files are located ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -30,15 +35,13 @@ CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \ # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm LDFLAGS=-L. -Wl,-soname=$(LIBNAME).so.$(PNGMAJ) -L$(ZLIBLIB) -lz -lm -RANLIB=ranlib -#RANLIB=echo - # where make install puts libpng.a, libpng12.so*, and png.h prefix=/usr/local +exec_prefix=$prefix INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -68,7 +71,7 @@ OBJSDLL = $(OBJS) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -83,11 +86,11 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so cp $(LIBNAME).so* /boot/home/config/lib $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(CC) -nostart -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -o \ @@ -104,63 +107,63 @@ test: pngtest ./pngtest install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -sf libpng.so.0 libpng.so; \ - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -172,20 +175,20 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) -W1,-rpath $(ZLIBLIB):$(DL) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ + $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index d76a561dc..4c81c911e 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -46,6 +46,7 @@ ifndef prefix prefix=/usr $(warning You haven't specified a 'prefix=' location. Defaulting to "/usr") endif +exec_prefix=$prefix # Where the zlib library and include files are located ZLIBLIB= /usr/lib @@ -79,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll @@ -98,9 +99,9 @@ RANLIB=ranlib #RANLIB=echo INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin MANPATH=$(prefix)/man MAN3PATH=$(MANPATH)/man3 MAN5PATH=$(MANPATH)/man5 diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 47713ac97..fdcaa8ce3 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -1,5 +1,5 @@ # makefile for libpng on Darwin / Mac OS X -# Copyright (C) 2002,2004 Glenn Randers-Pehrson +# Copyright (C) 2002, 2004, 2006 Glenn Randers-Pehrson # Copyright (C) 2001 Christoph Pfisterer # derived from makefile.linux: # Copyright (C) 1998, 1999 Greg Roelofs @@ -8,6 +8,7 @@ # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib @@ -16,21 +17,24 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CC=cc +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f + CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -#RANLIB=echo -RANLIB=ranlib - PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -61,7 +65,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -78,10 +82,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).dylib: $(LIBNAME).$(PNGMAJ).dylib - ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib + $(LN_SF) $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib $(LIBNAME).$(PNGMAJ).dylib: $(LIBNAME).$(PNGVER).dylib - ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib + $(LN_SF) $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).$(PNGVER).dylib: $(OBJSDLL) $(CC) -dynamiclib \ @@ -108,61 +112,61 @@ install-headers: png.h pngconf.h -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a $(RANLIB) $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).dylib libpng.pc \ libpng.3.$(PNGMIN).dylib -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGVER)*.dylib - -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib - -@/bin/rm -f $(DL)/$(LIBNAME).dylib - -@/bin/rm -f $(DL)/libpng.dylib - -@/bin/rm -f $(DL)/libpng.3.dylib - -@/bin/rm -f $(DL)/libpng.3.$(PNGMIN)*.dylib + -@$(RM_F) $(DL)/$(LIBNAME).$(PNGVER)*.dylib + -@$(RM_F) $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib + -@$(RM_F) $(DL)/$(LIBNAME).dylib + -@$(RM_F) $(DL)/libpng.dylib + -@$(RM_F) $(DL)/libpng.3.dylib + -@$(RM_F) $(DL)/libpng.3.$(PNGMIN)*.dylib cp $(LIBNAME).$(PNGVER).dylib $(DL) cp libpng.3.$(PNGMIN).dylib $(DL) chmod 755 $(DL)/$(LIBNAME).$(PNGVER).dylib chmod 755 $(DL)/libpng.3.$(PNGMIN).dylib (cd $(DL); \ - ln -sf libpng.3.$(PNGMIN).dylib libpng.3.dylib; \ - ln -sf libpng.3.dylib libpng.dylib; \ - ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \ - ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) + $(LN_SF) libpng.3.$(PNGMIN).dylib libpng.3.dylib; \ + $(LN_SF) libpng.3.dylib libpng.dylib; \ + $(LN_SF) $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \ + $(LN_SF) $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -174,20 +178,20 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - rm -f *.o libpng.a pngtest pngout.png libpng-config \ + $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ libpng.3.$(PNGMIN).dylib \ libpng.pc $(LIBNAME).*dylib pngtesti diff --git a/scripts/makefile.dec b/scripts/makefile.dec index b35960a0a..904b00c3b 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -1,14 +1,15 @@ # makefile for libpng on DEC Alpha Unix -# Copyright (C) 2000-2002 Glenn Randers-Pehrson +# Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h # where make install puts libpng.a and png.h prefix=/usr/local +exec_prefix=$prefix INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -32,17 +33,20 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 +AR_RC=ar rc CC=cc +MKDIR_P=mkdir +LN_SF=ln -f -s +RANLIB=ranlib +RM_F=/bin/rm -f + CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1 LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm -#RANLIB=echo -RANLIB=ranlib - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -50,7 +54,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: $(LIBNAME).so libpng.a pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -67,10 +71,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJS) $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \ @@ -93,14 +97,14 @@ install-headers: png.h pngconf.h chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + (cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + (cd $(DL); $(LN_SF)(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) @@ -115,16 +119,16 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -f -s libpng.so.0 libpng.so; \ - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF)(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF)(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc -@/bin/rm -f $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF)(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi @@ -143,7 +147,7 @@ install-config: libpng-config -@/bin/rm -f $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF)(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -155,18 +159,18 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -w1 -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) -w1 -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) -R$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 8e3318f57..6c1f10a71 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -1,25 +1,37 @@ # makefile for libpng.a and libpng12.so on Linux ELF with gcc -# Copyright (C) 1998, 1999, 2002 Greg Roelofs and Glenn Randers-Pehrson +# Copyright (C) 1998, 1999, 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h +# Modified for Debian by Junichi Uekawa and Josselin Mouette +# Major modifications are: +# * link libpng explicitly with libz and libm +# * libpng.so.%OLDSONUM% is a symlink rather than a different library +# * versioned symbols + LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) +AR_RC=ar rc CC=gcc +MKDIR_P=mkdir -p +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f # where "make install" puts libpng12.a, libpng12.so*, # libpng12/png.h and libpng12/pngconf.h # Prefix must be a full pathname. prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located. -#ZLIBLIB=/usr/local/lib -#ZLIBINC=/usr/local/include -ZLIBLIB=../zlib -ZLIBINC=../zlib +ZLIBLIB=/usr/local/lib +ZLIBINC=/usr/local/include +# ZLIBLIB=../zlib +# ZLIBINC=../zlib ALIGN= # for i386: @@ -31,19 +43,18 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ +CFLAGS=-Wall -D_REENTRANT -O2 \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm +LDFLAGS=-L. -lpng12 +LDFLAGS_A=libpng.a -lz -lm +LIBADDFLAGS=-lz -lm -RANLIB=ranlib -#RANLIB=echo INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -74,15 +85,15 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc libpng.syms: png.h pngconf.h - $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS png.h |\ - awk -F '[\t [\]();]' 'BEGIN{print "{global:"}\ + $(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\ + awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG12_%s {global:\n",PNGMAJ)}\ { for (i=1;i+2<=NF;++i)\ if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\ print $$(i+1) ";";\ @@ -90,24 +101,25 @@ libpng.syms: png.h pngconf.h if ($$(i)=="PNG_DATA_EXPORT")\ print $$(i+1) ";";}\ END{print "local: *; };"}' >$@.new - rm -f $@ + $(RM_F) $@ mv $@.new $@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo L_opts=\"-L$(LIBPATH)\"; \ - echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ - echo libs=\"-lpng12 -lz -lm\"; \ + echo L_opts=\"\"; \ + echo R_opts=\"\"; \ + echo libs=\"-lpng12\"; \ + echo all_libs=\"-lpng12 $(LIBADDFLAGS)\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) libpng.syms $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ @@ -131,70 +143,70 @@ test: pngtest pngtest-static @echo "" @echo " Running pngtest dynamically linked with $(LIBNAME).so:" @echo "" - ./pngtest + LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./pngtest @echo "" @echo " Running pngtest statically linked with libpng.a:" @echo "" ./pngtest-static install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -sf libpng.so.0 libpng.so; \ - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -206,20 +218,20 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a libpng.syms pngtest pngout.png libpng-config \ + $(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index f7fc36874..22daedd6c 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -10,9 +10,9 @@ ZLIBLIB = ../zlib # Compiler, linker, lib and other tools CC = gcc LD = $(CC) -AR = ar rcs +AR_RC = ar rcs RANLIB = ranlib -RM = rm -f +RM_F = rm -f CDEBUG = -g -DPNG_DEBUG=5 LDDEBUG = @@ -35,7 +35,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ all: libpng$(A) pngtest$(E) libpng$(A): $(OBJS) - $(AR) $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ test: pngtest$(E) @@ -45,7 +45,7 @@ pngtest$(E): pngtest$(O) libpng$(A) $(LD) -o $@ pngtest$(O) $(LDFLAGS) clean: - $(RM) *$(O) libpng$(A) pngtest$(E) pngout.png + $(RM_F) *$(O) libpng$(A) pngtest$(E) pngout.png png$(O): png.h pngconf.h pngerror$(O): png.h pngconf.h diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index d0260467b..96fb8a8df 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -1,6 +1,6 @@ # makefile for libpng.a and libpng12.so on Linux ELF with gcc using MMX # assembler code -# Copyright 2002 Greg Roelofs and Glenn Randers-Pehrson +# Copyright 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson # Copyright 1998-2001 Greg Roelofs # Copyright 1996-1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h @@ -15,15 +15,23 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) -CC=gcc +# Compiler, linker, lib and other tools +CC = gcc +LD = $(CC) +AR_RC = ar rc +LN_SF = ln -sf +MKDIR_P = mkdir +RANLIB = ranlib +RM_F = /bin/rm -f # where "make install" puts libpng12.a, libpng12.so*, # libpng12/png.h and libpng12/pngconf.h # Prefix must be a full pathname. prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located. #ZLIBLIB=/usr/local/lib @@ -58,13 +66,11 @@ CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm -RANLIB=ranlib -#RANLIB=echo INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -95,7 +101,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -119,10 +125,10 @@ pnggccrd.pic.o: pnggccrd.c png.h pngconf.h $(CC) -c $(CFLAGS) -fPIC -o $@ pnggccrd.c $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ @@ -151,63 +157,63 @@ test: pngtest pngtest-static ./pngtest-static install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -sf libpng.so.0 libpng.so; \ - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -219,20 +225,20 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ + $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 0305bb0e1..b5c80a465 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -15,7 +15,13 @@ ZLIBINC=/opt/zlib/include # LDSHARED=ld -b # SHAREDLIB=libz.sl +AR_RC=ar rc CC=cc +MKDIR_P=mkdir +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f + CFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP # Caution: be sure you have built zlib with the same CFLAGS. @@ -24,19 +30,19 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 # where make install puts libpng.a, libpng12.sl, and png.h prefix=/opt/libpng +exec_prefix=$prefix INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -67,7 +73,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -84,10 +90,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl + $(LN_SF) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) + $(LN_SF) $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) $(LD) -b +s \ @@ -104,63 +110,63 @@ test: pngtest ./pngtest install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \ libpng.sl.3.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.sl - -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl + -@$(RM_F) $(DL)/$(LIBNAME).sl.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.sl + -@$(RM_F) $(DL)/libpng.sl.3 + -@$(RM_F) $(DL)/libpng.sl.3.$(PNGMIN)* cp $(LIBNAME).sl.$(PNGVER) $(DL) cp libpng.sl.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ - ln -sf libpng.sl.3 libpng.sl; \ - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.sl.3.$(PNGMIN) libpng.sl.3; \ + $(LN_SF) libpng.sl.3 libpng.sl; \ + $(LN_SF) $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -172,22 +178,22 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) $(CCFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ libpng.sl.3.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 11f8ddae5..206f5f035 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -1,5 +1,5 @@ # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker. -# Copyright (C) 2002, Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 2001, Laurent faillie # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger @@ -7,9 +7,15 @@ CC=gcc LD=ld +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f # where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located ZLIBLIB=/opt/zlib/lib @@ -37,18 +43,15 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm -RANLIB=ranlib -#RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -79,7 +82,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -94,10 +97,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl + $(LN_SF) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) + $(LN_SF) $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) $(LD) -b +s \ @@ -115,63 +118,63 @@ test: pngtest install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \ libpng.sl.3.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.sl - -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl + -@$(RM_F) $(DL)/$(LIBNAME).sl.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.sl + -@$(RM_F) $(DL)/libpng.sl.3 + -@$(RM_F) $(DL)/libpng.sl.3.$(PNGMIN)* cp $(LIBNAME).sl.$(PNGVER) $(DL) cp libpng.sl.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ - ln -sf libpng.sl.3 libpng.sl; \ - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.sl.3.$(PNGMIN) libpng.sl.3; \ + $(LN_SF) libpng.sl.3 libpng.sl; \ + $(LN_SF) $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -183,22 +186,22 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) -W1,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ libpng.sl.3.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index d12c7abc3..635bfe21c 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -1,5 +1,5 @@ # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. -# Copyright (C) 1999-2002 Glenn Randers-Pehrson +# Copyright (C) 1999-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # For conditions of distribution and use, see copyright notice in png.h @@ -15,25 +15,30 @@ ZLIBINC=/opt/zlib/include # LDSHARED=ld -b # SHAREDLIB=libz.sl +AR_RC=ar rc CC=cc +MKDIR_P=mkdir +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f + CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 # Caution: be sure you have built zlib with the same CFLAGS. CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -RANLIB=ranlib - PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 # where make install puts libpng.a, libpng12.sl, and png.h prefix=/opt/libpng +exec_prefix=$prefix INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -64,7 +69,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -81,10 +86,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl + $(LN_SF) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) + $(LN_SF) $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl.$(PNGVER): $(OBJSDLL) $(LD) -b +s \ @@ -101,63 +106,63 @@ test: pngtest ./pngtest install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \ libpng.sl.3.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.sl - -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl + -@$(RM_F) $(DL)/$(LIBNAME).sl.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.sl + -@$(RM_F) $(DL)/libpng.sl.3 + -@$(RM_F) $(DL)/libpng.sl.3.$(PNGMIN)* cp $(LIBNAME).sl.$(PNGVER) $(DL) cp libpng.sl.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ - ln -sf libpng.sl.3 libpng.sl; \ - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.sl.3.$(PNGMIN) libpng.sl.3; \ + $(LN_SF) libpng.sl.3 libpng.sl; \ + $(LN_SF) $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -169,22 +174,22 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) $(CCFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ libpng.sl.3.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 8e3c6397d..88948df29 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -1,19 +1,25 @@ # makefile for libpng.a and libpng12.so on Linux ELF with gcc -# Copyright (C) 1998, 1999, 2002 Greg Roelofs and Glenn Randers-Pehrson +# Copyright (C) 1998, 1999, 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) +AR_RC=ar rc CC=gcc +MKDIR_P=mkdir -p +LN_SF=ln -sf +RANLIB=ranlib +RM_F=/bin/rm -f # where "make install" puts libpng12.a, libpng12.so*, # libpng12/png.h and libpng12/pngconf.h # Prefix must be a full pathname. prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located. #ZLIBLIB=/usr/local/lib @@ -37,13 +43,10 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm -RANLIB=ranlib -#RANLIB=echo - INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -74,7 +77,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest pngtest-static libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -91,10 +94,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ @@ -123,63 +126,63 @@ test: pngtest pngtest-static ./pngtest-static install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -sf libpng.so.0 libpng.so; \ - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -191,20 +194,20 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ + $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index a9bceb504..e93e020cc 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.9beta6 +SHLIB_MINOR= 1.2.9beta7 SRCS= pnggccrd.c 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 diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index ef2dc2d83..9cf8bf1d2 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.9beta6 +SHLIB_MINOR= 1.2.9beta7 SRCS= pnggccrd.c 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 diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index f0286102c..78ccb66a5 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.9beta6 +SHLIB_MINOR= 1.2.9beta7 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index b76051439..14c268528 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -1,15 +1,21 @@ # makefile for SCO OSr5 ELF and Unixware 7 with Native cc # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx # force ELF build dynamic linking, SONAME setting in lib and RPATH in app -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h CC=cc +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -f -s +RANLIB=echo +RM_F=/bin/rm -f # where make install puts libpng.a, libpng.so*, and png.h prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib @@ -20,18 +26,15 @@ ZLIBINC=../zlib CFLAGS= -dy -belf -I$(ZLIBINC) -O3 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 INCPATH=$(prefix)/include/libpng -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -62,7 +65,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -79,10 +82,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_FS) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_FS) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) $(CC) -G -Wl,-h,$(LIBNAME).so.$(PNGMAJ) -o $(LIBNAME).so.$(PNGVER) \ @@ -101,63 +104,63 @@ test: pngtest install-headers: png.h pngconf.h -@if [ ! -d $(DI) ]; then mkdir $(DI); fi -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi - -@/bin/rm -f $(DI)/png.h - -@/bin/rm -f $(DI)/pngconf.h + -@$(RM_F) $(DI)/png.h + -@$(RM_F) $(DI)/pngconf.h cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_FS) $(LIBNAME) libpng; $(LN_FS) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -f -s $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_FS) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -f -s libpng.so.0 libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + $(LN_FS) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_FS) libpng.so.0 libpng.so; \ + $(LN_FS) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_FS) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_FS) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_FS) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -169,20 +172,20 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: $(CC) $(CFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ + $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index c6d10a4d1..d1cc49280 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -1,5 +1,5 @@ # makefile for libpng.a and libpng12.so, SGI IRIX with 'cc' -# Copyright (C) 2001-2002 Glenn Randers-Pehrson +# Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -7,6 +7,7 @@ # Prefix must be a full pathname. prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib32 @@ -18,9 +19,15 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) + +AR_RC=ar rc CC=gcc +MKDIR_P=mkdir -p +LN_SF=ln -sf +RANLIB=echo +RM_F=/bin/rm -f # ABI can be blank to use default for your system, -32, -o32, -n32, or -64 # See "man abi". zlib must be built with the same ABI. @@ -39,10 +46,10 @@ RANLIB=echo #RANLIB=ranlib INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib -#LIBPATH=$(prefix)/lib32 +LIBPATH=$(exec_prefix)/lib +#LIBPATH=$(exec_prefix)/lib32 MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -66,7 +73,7 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest shared libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ shared: $(LIBNAME).so.$(PNGVER) @@ -94,7 +101,7 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGVER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) - rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) + $(RM_F) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) libpng.so.0.$(PNGMIN): $(OBJS) $(LDLEGACY) -o $@ $(OBJS) @@ -112,25 +119,25 @@ install-headers: png.h pngconf.h -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a + -@$(RM_F) $(DL)/libpng.a (cd $(DL); ln -sf $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) @@ -141,8 +148,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) @@ -150,18 +157,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) @@ -176,24 +183,24 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) \ -rpath $(ZLIBLIB):$(DL)\ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \ + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ + $(RM_F)libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ libpng.so.0.$(PNGMIN) \ so_locations diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 8745a9de4..3128f8cc4 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -1,17 +1,18 @@ # makefile for libpng.a and libpng12.so, SGI IRIX with 'cc' -# Copyright (C) 2001-2002 Glenn Randers-Pehrson +# Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h # Prefix must be a full pathname. prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located #ZLIBLIB=/usr/local/lib32 @@ -21,7 +22,12 @@ prefix=/usr/local ZLIBLIB=../zlib ZLIBINC=../zlib +AR_RC=ar rc CC=cc +MKDIR_P=mkdir -p +LN_SF=ln -sf +RANLIB=echo +RM_F=/bin/rm -f # ABI can be blank to use default for your system, -32, -o32, -n32, or -64 # See "man abi". zlib must be built with the same ABI. @@ -40,14 +46,11 @@ LDLEGACY=cc $(ABI) -shared -soname libpng.so.0 \ -set_version sgi$3.0 # See "man dso" for info about shared objects -RANLIB=echo -#RANLIB=ranlib - INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib -#LIBPATH=$(prefix)/lib32 +LIBPATH=$(exec_prefix)/lib +#LIBPATH=$(exec_prefix)/lib32 MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -71,7 +74,7 @@ OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest shared libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ shared: $(LIBNAME).so.$(PNGVER) @@ -93,14 +96,14 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) - rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) + $(RM_F) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) libpng.so.0.$(PNGMIN): $(OBJS) $(LDLEGACY) -o $@ $(OBJS) @@ -114,63 +117,63 @@ test: pngtest ./pngtest install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -sf $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -sf libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -sf libpng.so.0 libpng.so; \ - ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -sf $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -182,24 +185,24 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(DL) -L$(ZLIBLIB) \ -rpath $(ZLIBLIB):$(DL) \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtestd pngtest.png test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ -L$(ZLIBLIB) \ - -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` + -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \ + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ libpng.so.0.$(PNGMIN) \ so_locations diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 808764749..6fef3e700 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -1,16 +1,22 @@ # makefile for libpng on Solaris 9 (beta) with Forte cc # Updated by Chad Schrock for Solaris 9 # Contributed by William L. Sebok, based on makefile.linux -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998-2001 Greg Roelofs # Copyright (C) 1996-1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h # gcc 2.95 doesn't work. CC=cc +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -f -s +RANLIB=echo +RM_F=/bin/rm -f # Where make install puts libpng.a, libpng.so*, and png.h prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want @@ -30,18 +36,15 @@ ZLIBINC=/usr/include CFLAGS=-I$(ZLIBINC) -O3 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -72,7 +75,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -89,10 +92,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) @case "`type ld`" in *ucb*) \ @@ -125,59 +128,59 @@ install-headers: png.h pngconf.h -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -f -s $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -f -s libpng.so.0 libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + $(LN_SF) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_SF) libpng.so.0 libpng.so; \ + $(LN_SF) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + $(LN_SF) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(DM) ]; then mkdir $(DM); fi -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -189,8 +192,8 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \ -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) ./pngtestd pngtest.png @@ -198,13 +201,13 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 93742297a..4ccb892b7 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -1,14 +1,20 @@ # makefile for libpng on Solaris 2.x with gcc -# Copyright (C) 2004 Glenn Randers-Pehrson +# Copyright (C) 2004, 2006 Glenn Randers-Pehrson # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h +AR_RC=ar rc CC=gcc +MKDIR_P=mkdir +LN_SF=ln -f -s +RANLIB=echo +RM_F=/bin/rm -f # Where make install puts libpng.a, libpng12.so*, and png.h prefix=/usr/local +exec_prefix=$prefix # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want @@ -26,18 +32,15 @@ CFLAGS=-I$(ZLIBINC) -Wall -O \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm -#RANLIB=ranlib -RANLIB=echo - PNGMAJ = 0 -PNGMIN = 1.2.9beta6 +PNGMIN = 1.2.9beta7 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib +LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man -BINPATH=$(prefix)/bin +BINPATH=$(exec_prefix)/bin # override DESTDIR= on the make install command line to easily support # installing into a temporary location. Example: @@ -68,7 +71,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ libpng.pc: @@ -86,10 +89,10 @@ libpng-config: chmod +x libpng-config $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so + $(LN_FS) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER) - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + $(LN_FS) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so.$(PNGVER): $(OBJSDLL) @case "`type ld`" in *ucb*) \ @@ -118,63 +121,63 @@ test: pngtest ./pngtest install-headers: png.h pngconf.h - -@if [ ! -d $(DI) ]; then mkdir $(DI); fi - -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi cp png.h pngconf.h $(DI)/$(LIBNAME) chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h - -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h - -@/bin/rm -f $(DI)/libpng - (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .) + -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h + -@$(RM_F) $(DI)/libpng + (cd $(DI); $(LN_FS) $(LIBNAME) libpng; $(LN_FS) $(LIBNAME)/* .) install-static: install-headers libpng.a - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a - -@/bin/rm -f $(DL)/libpng.a - (cd $(DL); ln -f -s $(LIBNAME).a libpng.a) + -@$(RM_F) $(DL)/libpng.a + (cd $(DL); $(LN_FS) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ) - -@/bin/rm -f $(DL)/libpng.so - -@/bin/rm -f $(DL)/libpng.so.0 - -@/bin/rm -f $(DL)/libpng.so.0.$(PNGMIN)* + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so + -@$(RM_F) $(DL)/$(LIBNAME).so.$(PNGMAJ) + -@$(RM_F) $(DL)/libpng.so + -@$(RM_F) $(DL)/libpng.so.0 + -@$(RM_F) $(DL)/libpng.so.0.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.0.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.0.$(PNGMIN) (cd $(DL); \ - ln -f -s libpng.so.0.$(PNGMIN) libpng.so.0; \ - ln -f -s libpng.so.0 libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)) - -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi - -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc - -@/bin/rm -f $(DL)/pkgconfig/libpng.pc + $(LN_FS) libpng.so.0.$(PNGMIN) libpng.so.0; \ + $(LN_FS) libpng.so.0 libpng.so; \ + $(LN_FS) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \ + $(LN_FS) $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)) + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi + -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc + -@$(RM_F) $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc - (cd $(DL)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc) + (cd $(DL)/pkgconfig; $(LN_FS) $(LIBNAME).pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 - -@if [ ! -d $(DM) ]; then mkdir $(DM); fi - -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi - -@/bin/rm -f $(DM)/man3/libpng.3 - -@/bin/rm -f $(DM)/man3/libpngpf.3 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi + -@$(RM_F) $(DM)/man3/libpng.3 + -@$(RM_F) $(DM)/man3/libpngpf.3 cp libpng.3 $(DM)/man3 cp libpngpf.3 $(DM)/man3 - -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi - -@/bin/rm -f $(DM)/man5/png.5 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi + -@$(RM_F) $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi - -@/bin/rm -f $(DB)/libpng-config - -@/bin/rm -f $(DB)/$(LIBNAME)-config + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi + -@$(RM_F) $(DB)/libpng-config + -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config chmod 755 $(DB)/$(LIBNAME)-config - (cd $(DB); ln -s -f $(LIBNAME)-config libpng-config) + (cd $(DB); $(LN_FS) $(LIBNAME)-config libpng-config) install: install-static install-shared install-man install-config @@ -186,8 +189,8 @@ test-dd: echo echo Testing installed dynamic shared library in $(DL). $(CC) -I$(DI) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \ -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) ./pngtestd pngtest.png @@ -195,13 +198,13 @@ test-installed: echo echo Testing installed dynamic shared library. $(CC) -I$(ZLIBINC) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \ + `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \ + -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \ -L$(ZLIBLIB) -R$(ZLIBLIB) ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ + $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ libpng.so.0.$(PNGMIN) \ libpng.pc diff --git a/scripts/makefile.std b/scripts/makefile.std index 5d1f5290d..9b1925d6a 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -1,5 +1,5 @@ # makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -25,12 +25,15 @@ ZLIBLIB=../zlib ZLIBINC=../zlib CC=cc +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -sf +RANLIB=ranlib +RM_F=rm -f + CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -#RANLIB=echo -RANLIB=ranlib - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -38,7 +41,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a @@ -48,11 +51,11 @@ test: pngtest ./pngtest install: libpng.a - -@mkdir $(DESTDIR)$(INCPATH) - -@mkdir $(DESTDIR)$(INCPATH)/libpng - -@mkdir $(DESTDIR)$(LIBPATH) - -@rm -f $(DESTDIR)$(INCPATH)/png.h - -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h + -@$(MKDIR_P) $(DESTDIR)$(INCPATH) + -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng + -@$(MKDIR_P) $(DESTDIR)$(LIBPATH) + -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h + -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h cp png.h $(DESTDIR)$(INCPATH)/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h @@ -62,7 +65,7 @@ install: libpng.a chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a clean: - rm -f *.o libpng.a pngtest pngout.png + $(RM_F) *.o libpng.a pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 70a6e88af..241224cd7 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -1,5 +1,5 @@ # makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -28,13 +28,17 @@ ZLIBINC=../zlib WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes + CC=gcc +AR_RC=ar rc +MKDIR_P=mkdir +LN_SF=ln -f -s +RANLIB=ranlib +RM_F=/bin/rm -f + CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -RANLIB=ranlib -#RANLIB=echo - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o @@ -42,7 +46,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest libpng.a: $(OBJS) - ar rc $@ $(OBJS) + $(AR_RC) $@ $(OBJS) $(RANLIB) $@ pngtest: pngtest.o libpng.a @@ -52,21 +56,21 @@ test: pngtest ./pngtest install: libpng.a - -@mkdir $(DESTDIR)$(INCPATH) - -@mkdir $(DESTDIR)$(INCPATH)/libpng - -@mkdir $(DESTDIR)$(LIBPATH) - -@rm -f $(DESTDIR)$(INCPATH)/png.h - -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h + -@$(MKDIR_P) $(DESTDIR)$(INCPATH) + -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng + -@$(MKDIR_P) $(DESTDIR)$(LIBPATH) + -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h + -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h cp png.h $(DESTDIR)$(INCPATH)/libpng cp pngconf.h $(DESTDIR)$(INCPATH)/libpng chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h - (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) + (cd $(DESTDIR)$(INCPATH); $(LN_SF) libpng/* .) cp libpng.a $(DESTDIR)$(LIBPATH) chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a clean: - rm -f *.o libpng.a pngtest pngout.png + $(RM_F) *.o libpng.a pngtest pngout.png DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index fbdae3368..68f563b08 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.9beta6 +; Version 1.2.9beta7 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 581fa9ba1..0177fc356 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.9beta6 +;Version 1.2.9beta7 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |