diff --git a/ANNOUNCE b/ANNOUNCE index d3f81229..80a9da0e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.47beta01 - July 10, 2011 +Libpng 1.2.47beta01 - July 11, 2011 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. @@ -42,7 +42,8 @@ Other information: Changes since the last public release (1.2.46): -version 1.2.47beta01 [July 10, 2011] +version 1.2.47beta01 [July 11, 2011] + Updated contrib/pngminus/makefile.std (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index 64034df5..43d21691 100644 --- a/CHANGES +++ b/CHANGES @@ -2736,7 +2736,8 @@ version 1.2.46rc02 and 1.0.56rc02 [July 8, 2011] version 1.2.46 and 1.0.56 [July 9, 2011] Udated copyright year to 2011. -version 1.2.47beta01 [July 10, 2011] +version 1.2.47beta01 [July 11, 2011] + Updated contrib/pngminus/makefile.std Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/contrib/pngminus/makefile.std b/contrib/pngminus/makefile.std index 2fb061bb..1c283051 100644 --- a/contrib/pngminus/makefile.std +++ b/contrib/pngminus/makefile.std @@ -1,9 +1,9 @@ # Makefile for PngMinus (png2pnm and pnm2png) # Linux / Unix -#CC=cc -CC=gcc -LD=$(CC) +#CC?=cc +CC?=gcc +LD?=$(CC) RM=rm -f @@ -23,9 +23,9 @@ ZINC = -I../../../zlib ZLIB = -L../../../zlib -lz ZLIBS = ../../../zlib/libz.a -CFLAGS=-O3 $(PNGINC) $(ZINC) -LDFLAGS=$(PNGLIB) $(ZLIB) -LDFLAGSS=$(PNGLIBS) $(ZLIBS) +CFLAGS+=$(PNGINC) $(ZINC) +LDLIBS=$(PNGLIB) $(ZLIB) +LDLIBSS=$(PNGLIBS) $(ZLIBS) C=.c O=.o L=.a @@ -40,19 +40,19 @@ png2pnm$(O): png2pnm$(C) $(CC) -c $(CFLAGS) png2pnm$(C) png2pnm$(E): png2pnm$(O) - $(LD) -o png2pnm$(E) png2pnm$(O) $(LDFLAGS) -lm + $(LD) $(LDFLAGS) -o png2pnm$(E) png2pnm$(O) $(LDLIBS) -lm png2pnm-static$(E): png2pnm$(O) - $(LD) -o png2pnm-static$(E) png2pnm$(O) $(LDFLAGSS) -lm + $(LD) $(LDFLAGS) -o png2pnm-static$(E) png2pnm$(O) $(LDLIBSS) -lm pnm2png$(O): pnm2png$(C) $(CC) -c $(CFLAGS) pnm2png$(C) pnm2png$(E): pnm2png$(O) - $(LD) -o pnm2png$(E) pnm2png$(O) $(LDFLAGS) -lm + $(LD) $(LDFLAGS) -o pnm2png$(E) pnm2png$(O) $(LDLIBS) -lm pnm2png-static$(E): pnm2png$(O) - $(LD) -o pnm2png-static$(E) pnm2png$(O) $(LDFLAGSS) -lm + $(LD) $(LDFLAGS) -o pnm2png-static$(E) pnm2png$(O) $(LDLIBSS) -lm clean: $(RM) png2pnm$(O)