[master] Revised the makefiles to install the same files and symbolic

links as configure, except for libpng.la and libpng14.la.
This commit is contained in:
Glenn Randers-Pehrson 2010-01-06 23:11:53 -06:00
parent 6e6a844baf
commit 772b72139a
23 changed files with 158 additions and 464 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.1beta01 - January 6, 2010 Libpng 1.4.1beta01 - January 7, 2010
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -26,12 +26,12 @@ Other information:
Changes since the last public release (1.4.0): Changes since the last public release (1.4.0):
version 1.4.1beta01 [January 6, 2010] version 1.4.1beta01 [January 7, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman). unclosed if-statement warning (Philip Lowman).
Revised Makefile.am and Makefile.in to remove references to Y2KINFO, Revised Makefile.am and Makefile.in to remove references to Y2KINFO,
KNOWNBUG, and libpng.la (Robert Schwebel). KNOWNBUG, and libpng.la (Robert Schwebel).
Revised scripts/makefile.linux to install the same files and symbolic Revised the makefiles to install the same files and symbolic
links as configure, except for libpng.la and libpng14.la. links as configure, except for libpng.la and libpng14.la.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2458,12 +2458,12 @@ version 1.4.0rc08 [January 2, 2010]
version 1.4.0 [January 3, 2010] version 1.4.0 [January 3, 2010]
No changes. No changes.
version 1.4.1beta01 [January 6, 2010] version 1.4.1beta01 [January 7, 2010]
Updated CMakeLists.txt for consistent indentation and to avoid an Updated CMakeLists.txt for consistent indentation and to avoid an
unclosed if-statement warning (Philip Lowman). unclosed if-statement warning (Philip Lowman).
Revised Makefile.am and Makefile.in to remove references to Y2KINFO, Revised Makefile.am and Makefile.in to remove references to Y2KINFO,
KNOWNBUG, and libpng.la (Robert Schwebel). KNOWNBUG, and libpng.la (Robert Schwebel).
Revised scripts/makefile.linux to install the same files and symbolic Revised the makefiles to install the same files and symbolic
links as configure, except for libpng.la and libpng14.la. links as configure, except for libpng.la and libpng14.la.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -1,5 +1,5 @@
Makefiles for libpng version 1.4.1beta01 - January 3, 2010 Makefiles for libpng version 1.4.1beta01 - January 7, 2010
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.4.1beta01) (gcc, creates libpng14.so.14.1.4.1beta01)

View File

@ -11,16 +11,11 @@
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
CC=cc CC=cc
@ -113,10 +108,7 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
@case "`type ld`" in *ucb*) \ @case "`type ld`" in *ucb*) \
echo; \ echo; \
echo '## WARNING:'; \ echo '## WARNING:'; \
@ -130,11 +122,7 @@ $(LIBSOVER): $(OBJSDLL)
;; \ ;; \
esac esac
$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \ $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \
-o $(LIBSOVER) $(OBJSDLL) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJSDLL)
$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(OLDSOMAJ) \
-o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -158,24 +146,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOMAJ).$(PNGVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -229,7 +210,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -11,16 +11,11 @@
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
CC=cc CC=cc
@ -113,10 +108,7 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
@case "`type ld`" in *ucb*) \ @case "`type ld`" in *ucb*) \
echo; \ echo; \
echo '## WARNING:'; \ echo '## WARNING:'; \
@ -130,11 +122,7 @@ $(LIBSOVER): $(OBJSDLL)
;; \ ;; \
esac esac
$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \ $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \
-o $(LIBSOVER) $(OBJSDLL) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJSDLL)
$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(OLDSOMAJ) \
-o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -158,24 +146,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOMAJ).$(PNGVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -229,7 +210,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -23,8 +23,6 @@ LN_SF = ln -f -s
LIBNAME=libpng14 LIBNAME=libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local prefix=/usr/local
INCPATH=$(prefix)/include INCPATH=$(prefix)/include

View File

@ -11,16 +11,11 @@
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
CC=gcc CC=gcc
@ -105,16 +100,9 @@ $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(LIBSO)* /boot/home/config/lib cp $(LIBSO)* /boot/home/config/lib
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
$(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \ $(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \
$(LIBSOVER) $(OBJSDLL) $(LDFLAGS) $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)
$(OLDSOVER): $(OBJSDLL)
$(CC) -nostart -Wl,-soname,$(OLDSOMAJ) -o \
$(OLDSOVER) $(OBJSDLL) $(LDFLAGS)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -L$(ZLIBLIB) -L. -lz -lpng14 -o pngtest pngtest.o $(CC) -L$(ZLIBLIB) -L. -lz -lpng14 -o pngtest pngtest.o
@ -138,23 +126,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -206,7 +188,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
$(LIBSO) $(LIBSOMAJ)* pngtesti \ $(LIBSO) $(LIBSOMAJ)* pngtesti \
$(OLDSOVER) \
libpng.pc libpng.pc
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.

View File

@ -28,7 +28,7 @@ VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng NAME = libpng
PACKAGE = $(NAME)-$(VER) PACKAGE = $(NAME)-$(VER)
BIN = libpng14-0.dll libpng-14.dll BIN = libpng14-0.dll
LIB = libpng14.a libpng14.dll.a libpng.a libpng.dll.a scripts/png32ce.def LIB = libpng14.a libpng14.dll.a libpng.a libpng.dll.a scripts/png32ce.def
INCLUDE = png.h pngconf.h pngpriv.h INCLUDE = png.h pngconf.h pngpriv.h
PC = libpng14.pc libpng.pc PC = libpng14.pc libpng.pc
@ -64,7 +64,7 @@ copy-src:
compilation: compilation:
@echo " * Compilation of $(PACKAGE)" @echo " * Compilation of $(PACKAGE)"
cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -DPNG_NO_MMX_CODE -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce && make cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce && make
copy: copy:
@echo " * Copy of binary and development files" @echo " * Copy of binary and development files"

View File

@ -68,8 +68,6 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
CYGDLL = 14 CYGDLL = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll SHAREDLIB=cygpng$(CYGDLL).dll
STATLIB=libpng.a STATLIB=libpng.a

View File

@ -22,16 +22,11 @@ ZLIBINC=../zlib
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).dylib LIBSO=$(LIBNAME).dylib
LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib
LIBSOVER=$(LIBNAME).$(PNGVER).dylib
OLDSO=libpng.dylib OLDSO=libpng.dylib
OLDSOMAJ=libpng.14.dylib
OLDSOVER=libpng.14.$(PNGMIN).dylib
# Utilities: # Utilities:
CC=cc CC=cc
@ -101,21 +96,11 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
$(CC) -dynamiclib \ $(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBSOMAJ) \ -install_name $(LIBPATH)/$(LIBSOMAJ) \
-current_version 14 -compatibility_version 14 \ -current_version 14 -compatibility_version 14 \
-o $(LIBSOVER) \ -o $(LIBSOMAJ) \
$(OBJSDLL) -L$(ZLIBLIB) -lz
$(OLDSOVER): $(OBJSDLL)
$(CC) -dynamiclib \
-install_name $(LIBPATH)/$(OLDSOMAJ) \
-current_version 14 -compatibility_version 14 \
-o $(OLDSOVER) \
$(OBJSDLL) -L$(ZLIBLIB) -lz $(OBJSDLL) -L$(ZLIBLIB) -lz
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
@ -141,24 +126,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSO) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBNAME).$(PNGVER)*.dylib
-@$(RM_F) $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib
-@$(RM_F) $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/libpng.3.$(PNGMIN)*.dylib chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -209,7 +187,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
$(OLDSOVER) \
libpng.pc $(LIBNAME).*dylib pngtesti libpng.pc $(LIBNAME).*dylib pngtesti
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -8,17 +8,12 @@
# Library name: # Library name:
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14 LIBNAME = libpng14
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -90,17 +85,10 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJS)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJS)
$(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \ $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
-soname $(LIBSOMAJ) -soname $(LIBSOMAJ)
$(OLDSOVER): $(OBJS)
$(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
-soname $(OLDSOMAJ)
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -123,29 +111,23 @@ install-static: install-headers libpng.a
-@/bin/rm -f $(DL)/libpng.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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@/bin/rm -f $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@/bin/rm -f $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@/bin/rm -f $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@/bin/rm -f $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@/bin/rm -f $(DL)/$(OLDSOVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF)(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF)(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@/bin/rm -f $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
chmod 644 $(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 install-man: libpng.3 libpngpf.3 png.5
-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
@ -193,7 +175,6 @@ test-installed:
clean: clean:
/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.

View File

@ -1,5 +1,5 @@
# makefile for libpng.a and libpng14.so on Linux ELF with gcc # makefile for libpng.a and libpng14.so on Linux ELF with gcc
# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs # Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010 Greg Roelofs
# and Glenn Randers-Pehrson # and Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger # Copyright (C) 1996, 1997 Andreas Dilger
# #
@ -16,16 +16,12 @@
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14 OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -136,19 +132,10 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL) libpng.syms
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL) libpng.syms
$(CC) -shared -Wl,-soname,$(LIBSOMAJ) \ $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
-Wl,-version-script,libpng.syms \ -Wl,-version-script,libpng.syms \
-o $(LIBSOVER) \ -o $(LIBSOMAJ) \
$(OBJSDLL)
$(OLDSOVER): $(OBJSDLL) libpng.syms
$(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
-Wl,-version-script,libpng.syms \
-o $(OLDSOVER) \
$(OBJSDLL) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
@ -183,23 +170,16 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* (cd $(DL);
cp $(LIBSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(LIBSOVER)
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -251,7 +231,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \ $(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \
$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \ $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -21,16 +21,11 @@ ZLIBINC=/opt/zlib/include
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).sl LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
LIBSOVER=$(LIBNAME).sl.$(PNGVER)
OLDSO=libpng.sl OLDSO=libpng.sl
OLDSOMAJ=libpng.sl.14
OLDSOVER=libpng.sl.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -108,16 +103,9 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
$(LD) -b +s \ $(LD) -b +s \
+h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJSDLL)
$(LD) -b +s \
+h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
@ -141,23 +129,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -211,7 +193,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -11,16 +11,11 @@
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).sl LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
LIBSOVER=$(LIBNAME).sl.$(PNGVER)
OLDSO=libpng.sl OLDSO=libpng.sl
OLDSOMAJ=libpng.sl.14
OLDSOVER=libpng.sl.14.$(PNGMIN)
# Utilities: # Utilities:
CC=gcc CC=gcc
@ -116,16 +111,9 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
$(LD) -b +s \ $(LD) -b +s \
+h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJSDLL)
$(LD) -b +s \
+h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -150,23 +138,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -220,7 +202,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -21,16 +21,11 @@ ZLIBINC=/opt/zlib/include
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).sl LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
LIBSOVER=$(LIBNAME).sl.$(PNGVER)
OLDSO=libpng.sl OLDSO=libpng.sl
OLDSOMAJ=libpng.sl.14
OLDSOVER=libpng.sl.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -105,16 +100,9 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
$(LD) -b +s \ $(LD) -b +s \
+h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) +h $(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJSDLL)
$(LD) -b +s \
+h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
@ -138,23 +126,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -208,7 +190,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -150,6 +150,7 @@ install-shared: install-headers $(LIBSOMAJ) libpng.pc
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
cp $(LIBSOMAJ) $(DL) cp $(LIBSOMAJ) $(DL)
chmod 755 $(DL)/$(LIBSOMAJ)
(cd $(DL); (cd $(DL);
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LN_SF) $(LIBSO) $(OLDSO)) $(LN_SF) $(LIBSO) $(OLDSO))

View File

@ -68,8 +68,6 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
MINGDLL = 14 MINGDLL = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll SHAREDLIB=libpng$(MINGDLL).dll
STATLIB=libpng.a STATLIB=libpng.a

View File

@ -12,16 +12,11 @@
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
CC=cc CC=cc
@ -101,15 +96,8 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ) $(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOMAJ) \
$(LIBSOVER): $(OBJSDLL)
$(CC) -G -Wl,-h,$(LIBSOMAJ) -o $(LIBSOVER) \
$(OBJSDLL)
$(OLDSOVER): $(OBJSDLL)
$(CC) -G -Wl,-h,$(OLDSOMAJ) -o $(OLDSOVER) \
$(OBJSDLL) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
@ -136,23 +124,16 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* (cd $(DL);
cp $(LIBSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(LIBSOVER)
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -204,7 +185,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \ $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \ $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -9,16 +9,11 @@
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -51,8 +46,6 @@ CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
-set_version sgi$(PNGMAJ).0 -set_version sgi$(PNGMAJ).0
LDLEGACY=cc $(ABI) -shared -soname $(OLDSOMAJ) \
-set_version sgi$3.0
# See "man dso" for info about shared objects # See "man dso" for info about shared objects
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -86,7 +79,7 @@ libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
shared: $(LIBSOVER) shared: $(LIBSOMAJ)
libpng.pc: libpng.pc:
cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
@ -111,16 +104,10 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJS)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJS)
$(LDSHARED) -o $@ $(OBJS) $(LDSHARED) -o $@ $(OBJS)
$(RM_F) $(LIBSO) $(LIBSOMAJ) $(RM_F) $(LIBSO) $(LIBSOMAJ)
$(OLDSOVER): $(OBJS)
$(LDLEGACY) -o $@ $(OBJS)
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -145,23 +132,16 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* (cd $(DL);
cp $(LIBSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(LIBSOVER)
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -216,7 +196,7 @@ test-installed:
clean: clean:
$(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \ $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \
so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* $(OLDSOVER) so_locations libpng-config $(LIBSO) $(LIBSOMAJ)*
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock: writelock:

View File

@ -9,16 +9,11 @@
# Library name: # Library name:
LIBNAME=libpng14 LIBNAME=libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -54,8 +49,6 @@ LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm
LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
-set_version sgi$(PNGMAJ).0 -set_version sgi$(PNGMAJ).0
LDLEGACY=cc $(ABI) -shared -soname $(OLDSOMAJ) \
-set_version sgi$3.0
# See "man dso" for info about shared objects # See "man dso" for info about shared objects
INCPATH=$(prefix)/include INCPATH=$(prefix)/include
@ -89,8 +82,6 @@ libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
shared: $(LIBSOVER)
libpng.pc: libpng.pc:
cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \ cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
-e s!@exec_prefix@!$(exec_prefix)! \ -e s!@exec_prefix@!$(exec_prefix)! \
@ -113,16 +104,10 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJS)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJS)
$(LDSHARED) -o $@ $(OBJS) $(LDSHARED) -o $@ $(OBJS)
$(RM_F) $(LIBSO) $(LIBSOMAJ) $(RM_F) $(LIBSO) $(LIBSOMAJ)
$(OLDSOVER): $(OBJS)
$(LDLEGACY) -o $@ $(OBJS)
pngtest: pngtest.o libpng.a pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -147,23 +132,17 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* chmod 755 $(DL)/$(LIBSOMAJ)
cp $(LIBSOVER) $(DL) (cd $(DL);
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
chmod 755 $(DL)/$(LIBSOVER) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -219,7 +198,6 @@ test-installed:
clean: 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 \
$(LIBSO) $(LIBSOMAJ)* \ $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
so_locations so_locations
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -11,17 +11,12 @@
# Library name: # Library name:
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng14 LIBNAME = libpng14
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
# gcc 2.95 doesn't work. # gcc 2.95 doesn't work.
@ -111,10 +106,7 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
@case "`type ld`" in *ucb*) \ @case "`type ld`" in *ucb*) \
echo; \ echo; \
echo '## WARNING:'; \ echo '## WARNING:'; \
@ -128,11 +120,7 @@ $(LIBSOVER): $(OBJSDLL)
;; \ ;; \
esac esac
$(LD) -G -h $(LIBSOMAJ) \ $(LD) -G -h $(LIBSOMAJ) \
-o $(LIBSOVER) $(OBJSDLL) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJS)
$(LD) -G -h $(OLDSOMAJ) \
-o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -156,23 +144,16 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* (cd $(DL);
cp $(LIBSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(LIBSOVER)
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
$(LN_SF) $(LIBSOMAJ) $(LIBSO))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -226,7 +207,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -11,16 +11,11 @@
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -108,10 +103,7 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
@case "`type ld`" in *ucb*) \ @case "`type ld`" in *ucb*) \
echo; \ echo; \
echo '## WARNING:'; \ echo '## WARNING:'; \
@ -125,11 +117,7 @@ $(LIBSOVER): $(OBJSDLL)
;; \ ;; \
esac esac
$(LD) -G -h $(LIBSOMAJ) \ $(LD) -G -h $(LIBSOMAJ) \
-o $(LIBSOVER) $(OBJSDLL) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJS)
$(LD) -G -h $(OLDSOMAJ) \
-o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -153,23 +141,16 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* (cd $(DL);
cp $(LIBSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(LIBSOVER)
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -223,7 +204,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO

View File

@ -11,16 +11,11 @@
# Library name: # Library name:
LIBNAME = libpng14 LIBNAME = libpng14
PNGMAJ = 14 PNGMAJ = 14
PNGMIN = 1.4.1beta01
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names: # Shared library names:
LIBSO=$(LIBNAME).so LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so OLDSO=libpng.so
OLDSOMAJ=libpng.so.14
OLDSOVER=libpng.so.14.$(PNGMIN)
# Utilities: # Utilities:
AR_RC=ar rc AR_RC=ar rc
@ -108,10 +103,7 @@ libpng-config:
$(LIBSO): $(LIBSOMAJ) $(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(LIBSOVER) $(LIBSOMAJ): $(OBJSDLL)
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
$(LIBSOVER): $(OBJSDLL)
@case "`type ld`" in *ucb*) \ @case "`type ld`" in *ucb*) \
echo; \ echo; \
echo '## WARNING:'; \ echo '## WARNING:'; \
@ -125,11 +117,7 @@ $(LIBSOVER): $(OBJSDLL)
;; \ ;; \
esac esac
$(LD) -G -h $(LIBSOMAJ) \ $(LD) -G -h $(LIBSOMAJ) \
-o $(LIBSOVER) $(OBJSDLL) -o $(LIBSOMAJ) $(OBJSDLL)
$(OLDSOVER): $(OBJS)
$(LD) -G -h $(OLDSOMAJ) \
-o $(OLDSOVER) $(OBJSDLL)
pngtest: pngtest.o $(LIBSO) pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@ -153,23 +141,16 @@ install-static: install-headers libpng.a
-@$(RM_F) $(DL)/libpng.a -@$(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 $(LIBSOVER) libpng.pc \ install-shared: install-headers $(LIBSOMAJ) libpng.pc
$(OLDSOVER)
-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO) -@$(RM_F) $(DL)/$(LIBSO)
-@$(RM_F) $(DL)/$(LIBSOMAJ) -@$(RM_F) $(DL)/$(LIBSOMAJ)
-@$(RM_F) $(DL)/$(OLDSO) -@$(RM_F) $(DL)/$(OLDSO)
-@$(RM_F) $(DL)/$(OLDSOMAJ) cp $(LIBSOMAJ) $(DL)
-@$(RM_F) $(DL)/$(OLDSOVER)* (cd $(DL);
cp $(LIBSOVER) $(DL) $(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(OLDSOVER) $(DL) $(LN_SF) $(LIBSO) $(OLDSO))
chmod 755 $(DL)/$(LIBSOVER)
chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
$(LN_SF) $(LIBSOVER) $(LIBSO); \
$(LN_SF) $(LIBSOVER) $(LIBSOMAJ))
-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc
@ -223,7 +204,6 @@ test-installed:
clean: clean:
$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \ libpng-config $(LIBSO) $(LIBSOMAJ)* \
$(OLDSOVER) \
libpng.pc libpng.pc
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO