diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-01-07 23:28:16 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-01-07 23:28:16 -0600 |
commit | ad1f8180a5b7c454f6a4b958fe232713b573b7ae (patch) | |
tree | aa9485cb555903d64d50478b4ffd1bb7cc6a0032 /scripts | |
parent | e364f899af72bc6b7dc5c0b6d0f88c0470ff7837 (diff) | |
download | libpng-ad1f8180a5b7c454f6a4b958fe232713b573b7ae.tar.gz |
[master] Updated makefiles to link to libpng14.so.14.1
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.32sunu | 10 | ||||
-rw-r--r-- | scripts/makefile.64sunu | 10 | ||||
-rw-r--r-- | scripts/makefile.beos | 11 | ||||
-rw-r--r-- | scripts/makefile.darwin | 10 | ||||
-rw-r--r-- | scripts/makefile.dec | 10 | ||||
-rw-r--r-- | scripts/makefile.elf | 9 | ||||
-rw-r--r-- | scripts/makefile.hp64 | 10 | ||||
-rw-r--r-- | scripts/makefile.hpgcc | 10 | ||||
-rw-r--r-- | scripts/makefile.hpux | 10 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.sco | 9 | ||||
-rw-r--r-- | scripts/makefile.sggcc | 9 | ||||
-rw-r--r-- | scripts/makefile.sgi | 10 | ||||
-rw-r--r-- | scripts/makefile.so9 | 9 | ||||
-rw-r--r-- | scripts/makefile.solaris | 9 | ||||
-rw-r--r-- | scripts/makefile.solaris-x86 | 9 | ||||
-rw-r--r-- | scripts/png32ce.def | 2 | ||||
-rw-r--r-- | scripts/pngos2.def | 2 | ||||
-rw-r--r-- | scripts/pngwin.def | 2 |
24 files changed, 90 insertions, 83 deletions
diff --git a/scripts/README.txt b/scripts/README.txt index 4a06e090e..e033e3df0 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.1beta01 - January 8, 2010 +Makefiles for libpng version 1.4.1beta02 - January 8, 2010 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.1beta01) + (gcc, creates libpng14.so.14.1.4.1beta02) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -20,7 +20,7 @@ Makefiles for libpng version 1.4.1beta01 - January 8, 2010 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.14.1.4.1beta01) + gcc, creates libpng14.so.14.1.4.1beta02) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.1beta01 - January 8, 2010 makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng14.so.14.1.4.1beta01) + creates libpng14.so.14.1.4.1beta02) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.1beta01) + creates libpng14.so.14.1.4.1beta02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.1beta01) + creates libpng14.so.14.1.4.1beta02) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 4fee87a96..387be4c98 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.1beta01 +version=1.4.1beta02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 35dbab320..c13bd2a2d 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.1beta01 +Version: 1.4.1beta02 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 4f6c35add..3dd9fefe3 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -15,6 +15,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -149,14 +150,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 6f09e0bbe..916d94e29 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -15,6 +15,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -149,14 +150,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ea0cd77f7..bcf0980f6 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -15,6 +15,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -127,16 +128,16 @@ install-static: install-headers libpng.a (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBSOMAJ) libpng.pc + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e17e65287..88e7f0690 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -26,6 +26,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).dylib LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib +LIBSOREL=$(LIBNAME).$(PNGMAJ).$(RELEASE).dylib OLDSO=libpng.dylib # Utilities: @@ -129,14 +130,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 9da8ad6f3..85d6e198d 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -13,6 +13,7 @@ LIBNAME = libpng14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -114,14 +115,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 28e5ca88c..090b8785d 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -20,6 +20,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so OLDSOMAJ=libpng.so.14 @@ -173,13 +174,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index b5debb7fc..cbefecaeb 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -25,6 +25,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).sl LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.sl # Utilities: @@ -132,14 +133,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ab9f2f202..55976f61e 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -15,6 +15,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).sl LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.sl # Utilities: @@ -141,14 +142,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 43d6e5eeb..d26a6008f 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -25,6 +25,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).sl LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.sl # Utilities: @@ -129,14 +130,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index aa90edac5..2e261b66a 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.1beta01 +SHLIB_MINOR= 1.4.1beta02 SRCS= 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 17a6969a7..237073f14 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.1beta01 +SHLIB_MINOR= 1.4.1beta02 SRCS= 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 f7cd76ba5..87682878c 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.1beta01 +SHLIB_MINOR= 1.4.1beta02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 5e4049f6d..1dcb7d96b 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -16,6 +16,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -127,13 +128,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 47256486b..2a49fb9c8 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -13,6 +13,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -135,13 +136,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 4deb734c1..0c381da74 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -13,6 +13,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -135,14 +136,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) - chmod 755 $(DL)/$(LIBSOMAJ) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index bc784deaa..fd52e3d2c 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -16,6 +16,7 @@ LIBNAME = libpng14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -147,13 +148,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index fde7fe71f..fe9405e97 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -15,6 +15,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -144,13 +145,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index d1535a10b..e98b29293 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -15,6 +15,7 @@ PNGMAJ = 14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) +LIBSOREL=$(LIBSOMAJ).$(RELEASE) OLDSO=libpng.so # Utilities: @@ -144,13 +145,13 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBSOMAJ) libpng.pc -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DL)/$(LIBSO) - -@$(RM_F) $(DL)/$(LIBSOMAJ) + -@$(RM_F) $(DL)/$(LIBSOREL) -@$(RM_F) $(DL)/$(OLDSO) - cp $(LIBSOMAJ) $(DL) + cp $(LIBSOMAJ) $(DL)/$(LIBSOREL) + chmod 755 $(DL)/$(LIBSOREL) (cd $(DL); \ - $(LN_SF) $(LIBSOMAJ) $(LIBSO); \ + $(LN_SF) $(LIBSOREL) $(LIBSO); \ $(LN_SF) $(LIBSO) $(OLDSO)) - -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc -@$(RM_F) $(DL)/pkgconfig/libpng.pc diff --git a/scripts/png32ce.def b/scripts/png32ce.def index ed70bd30f..db41bb47e 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.1beta01 +;Version 1.4.1beta02 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 4188df825..97c9ce6fc 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.1beta01 +; Version 1.4.1beta02 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index b0c7d0c59..9333e7db0 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.1beta01 +;Version 1.4.1beta02 png_build_grayscale_palette png_chunk_error png_chunk_warning |