diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2006-03-08 23:35:59 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:08:39 -0500 |
commit | 1ce0836b4a9c1fe453a93d323ca0b806564d559e (patch) | |
tree | b7bf97f88915796f786328bda180cebebe907d26 /scripts | |
parent | 5c60b2367ee41cca4a2e43f8bb74797f4c066e60 (diff) | |
download | libpng-1ce0836b4a9c1fe453a93d323ca0b806564d559e.tar.gz |
Imported from libpng-1.2.9beta8.tarv1.2.9beta8
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/makefile.32sunu | 20 | ||||
-rw-r--r-- | scripts/makefile.64sunu | 20 | ||||
-rw-r--r-- | scripts/makefile.aix | 9 | ||||
-rw-r--r-- | scripts/makefile.beos | 2 | ||||
-rw-r--r-- | scripts/makefile.cygwin | 2 | ||||
-rw-r--r-- | scripts/makefile.darwin | 20 | ||||
-rw-r--r-- | scripts/makefile.dec | 20 | ||||
-rw-r--r-- | scripts/makefile.elf | 2 | ||||
-rw-r--r-- | scripts/makefile.gcmmx | 2 | ||||
-rw-r--r-- | scripts/makefile.hp64 | 2 | ||||
-rw-r--r-- | scripts/makefile.hpgcc | 2 | ||||
-rw-r--r-- | scripts/makefile.hpux | 2 | ||||
-rw-r--r-- | scripts/makefile.linux | 2 | ||||
-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 | 20 | ||||
-rw-r--r-- | scripts/makefile.sggcc | 22 | ||||
-rw-r--r-- | scripts/makefile.sgi | 2 | ||||
-rw-r--r-- | scripts/makefile.so9 | 22 | ||||
-rw-r--r-- | scripts/makefile.solaris | 4 | ||||
-rw-r--r-- | scripts/makefile.sunos | 2 | ||||
-rw-r--r-- | scripts/pngos2.def | 5 | ||||
-rw-r--r-- | scripts/pngw32.def | 5 |
25 files changed, 99 insertions, 96 deletions
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index ea593eb77..221d3da9e 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.9beta7 +version=1.2.9beta8 prefix="" libdir="" libs="" diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 37ab6684b..90daa53ce 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -7,7 +7,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc @@ -126,8 +126,8 @@ 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 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h @@ -135,7 +135,7 @@ install-headers: png.h pngconf.h (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 -@$(RM_F) $(DL)/libpng.a @@ -143,7 +143,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@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)/$(LIBNAME).so @@ -159,7 +159,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ $(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 + -@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 @@ -167,18 +167,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) 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 + -@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 + -@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 + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@$(RM_F) $(DB)/libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 764ec32db..577bc5e03 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -7,7 +7,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc @@ -126,8 +126,8 @@ 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 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h @@ -135,7 +135,7 @@ install-headers: png.h pngconf.h (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 -@$(RM_F) $(DL)/libpng.a @@ -143,7 +143,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@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)/$(LIBNAME).so @@ -159,7 +159,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ $(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 + -@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 @@ -167,18 +167,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) 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 + -@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 + -@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 + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@$(RM_F) $(DB)/libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 6687db9c9..08d883a8c 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -13,13 +13,14 @@ ZLIBLIB = ../zlib CC = gcc LD = $(CC) AR_RC = ar rcs +MKDIR_P = mkdir RANLIB = ranlib RM_F = rm -f LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -71,9 +72,9 @@ pngtest$(E): pngtest$(O) $(LIBNAME)$(A) $(LD) -o $@ pngtest$(O) $(LDFLAGS) 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 + -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi + -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi -@$(RM_F) $(DI)/$(LIBNAME)/png.h -@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h -@$(RM_F) $(DI)/png.h diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 439dc9741..7b27f850b 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -17,7 +17,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 4c81c911e..8c2714f74 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index fdcaa8ce3..5e3ecf87b 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -27,7 +27,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -108,8 +108,8 @@ 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 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h @@ -117,7 +117,7 @@ install-headers: png.h pngconf.h (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 $(RANLIB) $(DL)/$(LIBNAME).a @@ -126,7 +126,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).dylib libpng.pc \ libpng.3.$(PNGMIN).dylib - -@if [ ! -d $(DL) ]; then mkdir $(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)/$(LIBNAME).dylib @@ -142,7 +142,7 @@ install-shared: install-headers $(LIBNAME).dylib libpng.pc \ $(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 + -@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 @@ -150,18 +150,18 @@ install-shared: install-headers $(LIBNAME).dylib 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 + -@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 + -@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 + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@$(RM_F) $(DB)/libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 904b00c3b..a7e4744dc 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -33,7 +33,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -91,8 +91,8 @@ 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 @@ -100,7 +100,7 @@ install-headers: png.h pngconf.h (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 @@ -108,7 +108,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(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 @@ -123,7 +123,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ $(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 + -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc -@/bin/rm -f $(DL)/pkgconfig/libpng.pc cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc @@ -131,18 +131,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) 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 + -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi + -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi -@/bin/rm -f $(DM)/man3/libpng.3 -@/bin/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 + -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi -@/bin/rm -f $(DM)/man5/png.5 cp png.5 $(DM)/man5 install-config: libpng-config - -@if [ ! -d $(DB) ]; then mkdir $(DB); fi + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@/bin/rm -f $(DB)/libpng-config -@/bin/rm -f $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 6c1f10a71..20dd781a1 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -11,7 +11,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) AR_RC=ar rc diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 96fb8a8df..63577e7e5 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) # Compiler, linker, lib and other tools diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index b5c80a465..f5f2d4c64 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -32,7 +32,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 206f5f035..8194ef491 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -44,7 +44,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 635bfe21c..b2ed0f106 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -28,7 +28,7 @@ CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 88948df29..9e0082805 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) AR_RC=ar rc diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index e93e020cc..0b6fe5075 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.9beta7 +SHLIB_MINOR= 1.2.9beta8 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 9cf8bf1d2..e67cdf9e3 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.9beta7 +SHLIB_MINOR= 1.2.9beta8 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 78ccb66a5..963fabfc4 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.9beta7 +SHLIB_MINOR= 1.2.9beta8 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 14c268528..43fb560ab 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -27,7 +27,7 @@ CFLAGS= -dy -belf -I$(ZLIBINC) -O3 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -102,8 +102,8 @@ 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 -@$(RM_F) $(DI)/png.h -@$(RM_F) $(DI)/pngconf.h cp png.h pngconf.h $(DI)/$(LIBNAME) @@ -113,7 +113,7 @@ install-headers: png.h pngconf.h (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 -@$(RM_F) $(DL)/libpng.a @@ -121,7 +121,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@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 @@ -136,7 +136,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ $(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 + -@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 @@ -144,18 +144,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) 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 + -@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 + -@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 + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@$(RM_F) $(DB)/libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index d1cc49280..63f2af25f 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -19,7 +19,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) AR_RC=ar rc @@ -115,8 +115,8 @@ 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 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h @@ -124,7 +124,7 @@ install-headers: png.h pngconf.h (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 -@$(RM_F) $(DL)/libpng.a @@ -132,7 +132,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@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 @@ -147,7 +147,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ 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 + -@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 @@ -155,18 +155,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) 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 + -@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 + -@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 + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@$(RM_F) $(DB)/libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config @@ -200,7 +200,7 @@ test-installed: ./pngtesti pngtest.png clean: - $(RM_F)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 3128f8cc4..c0eafda03 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 6fef3e700..70fe48f8c 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -9,7 +9,7 @@ # gcc 2.95 doesn't work. CC=cc AR_RC=ar rc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -f -s RANLIB=echo RM_F=/bin/rm -f @@ -37,7 +37,7 @@ CFLAGS=-I$(ZLIBINC) -O3 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -124,8 +124,8 @@ 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 -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h @@ -133,7 +133,7 @@ install-headers: png.h pngconf.h (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 -@$(RM_F) $(DL)/libpng.a @@ -141,7 +141,7 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.0.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi + -@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 @@ -156,7 +156,7 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ $(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 + -@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 @@ -164,18 +164,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) 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 + -@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 + -@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 + -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi -@$(RM_F) $(DB)/libpng-config -@$(RM_F) $(DB)/$(LIBNAME)-config cp libpng-config $(DB)/$(LIBNAME)-config diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 4ccb892b7..f2b4c2c52 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -7,7 +7,7 @@ AR_RC=ar rc CC=gcc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -f -s RANLIB=echo RM_F=/bin/rm -f @@ -33,7 +33,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O \ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm PNGMAJ = 0 -PNGMIN = 1.2.9beta7 +PNGMIN = 1.2.9beta8 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 241224cd7..ff1959120 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -31,7 +31,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \ CC=gcc AR_RC=ar rc -MKDIR_P=mkdir +MKDIR_P=mkdir -p LN_SF=ln -f -s RANLIB=ranlib RM_F=/bin/rm -f diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 68f563b08..f26f242bc 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.9beta7 +; Version 1.2.9beta8 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" @@ -118,7 +118,7 @@ EXPORTS png_set_gAMA png_set_gAMA_fixed png_set_gamma - png_set_gray_1_2_4_to_8 + png_set_gray_1_2_4_to_8 ; deprecated as of libpng-1.2.9 png_set_gray_to_rgb png_set_hIST png_set_iCCP @@ -221,6 +221,7 @@ EXPORTS png_get_int_32 png_save_int_32 png_get_uint_31 + png_set_expand_gray_1_2_4_to_8 ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS png_libpng_ver diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 0177fc356..fca2e1fac 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.9beta7 +;Version 1.2.9beta8 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -114,7 +114,7 @@ EXPORTS png_set_gAMA @104 png_set_gAMA_fixed @105 png_set_gamma @106 - png_set_gray_1_2_4_to_8 @107 + png_set_gray_1_2_4_to_8 @107 ; deprecated png_set_gray_to_rgb @108 png_set_hIST @109 png_set_iCCP @110 @@ -232,3 +232,4 @@ EXPORTS png_get_int_32 @204 png_save_int_32 @205 png_get_uint_31 @206 + png_set_expand_gray_1_2_4_to_8 @207 |