[alpha] Sync with "devel" branch.

This commit is contained in:
Glenn Randers-Pehrson
2010-01-02 17:42:21 -06:00
parent 8c8e58a2ee
commit 30109843c3
63 changed files with 381 additions and 381 deletions

View File

@@ -1,4 +1,4 @@
# makefile for libpng.a and libpng14.so, SGI IRIX with 'cc'
# makefile for libpng.a and libpng15.so, SGI IRIX with 'cc'
# Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -7,8 +7,8 @@
# and license in png.h
# Library name:
LIBNAME=libpng14
PNGMAJ = 14
LIBNAME=libpng15
PNGMAJ = 15
PNGMIN = 1.5.0alpha01
PNGVER = $(PNGMAJ).$(PNGMIN)
@@ -17,8 +17,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
OLDSOMAJ=libpng.so.15
OLDSOVER=libpng.so.15.$(PNGMIN)
# Utilities:
AR_RC=ar rc
@@ -28,7 +28,7 @@ LN_SF=ln -sf
RANLIB=echo
RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng14.so, and libpng14/png.h
# Where make install puts libpng.a, libpng15.so, and libpng15/png.h
# Prefix must be a full pathname.
prefix=/usr/local
@@ -93,7 +93,7 @@ libpng.pc:
-e s!@exec_prefix@!$(exec_prefix)! \
-e s!@libdir@!$(LIBPATH)! \
-e s!@includedir@!$(INCPATH)! \
-e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc
-e s!-lpng15!-lpng15\ -lz\ -lm! > libpng.pc
libpng-config:
( cat scripts/libpng-config-head.in; \
@@ -104,7 +104,7 @@ libpng-config:
echo ldopts=\"$(ABI)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \
echo libdir=\"$(LIBPATH)\"; \
echo libs=\"-lpng14 -lz -lm\"; \
echo libs=\"-lpng15 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config