Imported from libpng-1.2.3rc3.tar

This commit is contained in:
Glenn Randers-Pehrson
2002-05-01 16:55:46 -05:00
parent 25d8224d15
commit 299d73503c
59 changed files with 167 additions and 125 deletions

View File

@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
Name: libpng12
Description: Loads and saves PNG files
Version: 1.2.3rc2
Version: 1.2.3rc3
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}/libpng12

View File

@@ -33,7 +33,7 @@ RANLIB=echo
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -133,7 +133,9 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)

View File

@@ -33,7 +33,7 @@ RANLIB=echo
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
INCPATH=$(prefix)/include
@@ -127,13 +127,15 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)

View File

@@ -19,7 +19,7 @@ RM = rm -f
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

View File

@@ -14,7 +14,7 @@ ZLIBINC=/usr/local/include
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
ALIGN=
@@ -123,6 +123,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -52,7 +52,7 @@ CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
LIBNAME=libpng12
PNGMAJ = 0
PNGDLL = 12
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(PNGDLL).dll
@@ -162,6 +162,8 @@ install-shared: $(SHAREDLIB) libpng.pc install-headers install-man
-@if [ ! -d $(DESTDIR)$(BINPATH) ]; then mkdir -p $(DESTDIR)$(BINPATH); fi
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir -p $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
install -m 644 $(IMPLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).dll.a
-@rm -f $(DESTDIR)$(LIBPATH)/$(IMPLIB)
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).dll.a $(IMPLIB))

View File

@@ -25,7 +25,7 @@ RANLIB=ranlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -115,6 +115,8 @@ install-shared: install-headers $(LIBNAME).dylib libpng.pc
ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -28,7 +28,7 @@ ZLIBINC=../zlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -102,6 +102,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -15,7 +15,7 @@
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -161,6 +161,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -35,7 +35,7 @@ RANLIB=ranlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -126,6 +126,8 @@ install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc
ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
$(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -19,7 +19,7 @@ RANLIB=ranlib
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -111,6 +111,8 @@ install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc
ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -5,7 +5,7 @@
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
CC=gcc
@@ -135,6 +135,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
$(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)

View File

@@ -17,7 +17,7 @@ ZLIBINC=../zlib
CC=cc
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
@@ -105,15 +105,17 @@ install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) libpng
libpng.3.$(SHARED_POSTFIX); \
ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) \
libpng.3.$(PNGMIN).$(SHARED_POSTFIX); \
ln -sf $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \
ln -f -s $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \
$(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX); \
ln -sf $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \
ln -f -s $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \
$(LIBNAME).$(SHAREDLIB_POSTFIX))
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi

View File

@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.3rc2
SHLIB_MINOR= 1.2.3rc3
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

View File

@@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.3rc2
SHLIB_MINOR= 1.2.3rc3
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

View File

@@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.3rc2
SHLIB_MINOR= 1.2.3rc3
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

View File

@@ -26,7 +26,7 @@ RANLIB=echo
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -119,6 +119,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)

View File

@@ -36,7 +36,7 @@ LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=CC $(ABI) -shared
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
# See "man dso" for info about shared objects
LIBS=libpng12.so.$(PNGVER)
@@ -74,8 +74,8 @@ libpng.pc:
$(LIBNAME).so.$(PNGVER): $(OBJS)
$(LDSHARED) -o $@ $(OBJS)
rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
ln -s $@ $(LIBNAME).so
ln -s $@ $(LIBNAME).so.$(PNGMAJ)
ln -s -f $@ $(LIBNAME).so
ln -s -f $@ $(LIBNAME).so.$(PNGMAJ)
pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -93,15 +93,15 @@ install-headers: png.h pngconf.h
$(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; \
ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a
-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
(cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
@@ -113,16 +113,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi

View File

@@ -31,7 +31,7 @@ LDSHARED=cc $(ABI) -shared
# See "man dso" for info about shared objects
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
RANLIB=echo
@@ -70,8 +70,8 @@ libpng.a: $(OBJS)
$(LIBNAME).so.$(PNGVER): $(OBJS)
$(LDSHARED) -o $@ $(OBJS)
rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
ln -s $@ $(LIBNAME).so
ln -s $@ $(LIBNAME).so.$(PNGMAJ)
ln -s -f $@ $(LIBNAME).so
ln -s -f $@ $(LIBNAME).so.$(PNGMAJ)
pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -88,15 +88,15 @@ install-headers: png.h pngconf.h
$(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h
-@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng
(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
ln -f -s $(LIBNAME)/* .)
(cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; \
ln -sf $(LIBNAME)/* .)
install-static: install-headers libpng.a
-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a
(cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a)
(cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a)
install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
-@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi
@@ -108,16 +108,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH)
chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER)
(cd $(DESTDIR)$(LIBPATH); \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc)
install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi

View File

@@ -36,7 +36,7 @@ RANLIB=echo
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -138,6 +138,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \
$(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)

View File

@@ -32,7 +32,7 @@ RANLIB=echo
# read libpng.txt or png.h to see why PNGMAJ is 0. You should not
# have to change it.
PNGMAJ = 0
PNGMIN = 1.2.3rc2
PNGMIN = 1.2.3rc3
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@@ -134,6 +134,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ))
-@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \
mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc
-@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc
cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc
(cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc)

View File

@@ -7,7 +7,7 @@ unit pngdef;
interface
const
PNG_LIBPNG_VER_STRING = '1.2.3rc2';
PNG_LIBPNG_VER_STRING = '1.2.3rc3';
PNG_LIBPNG_VER = 10203;
type

View File

@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.3rc2
; Version 1.2.3rc3
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"