diff --git a/ANNOUNCE b/ANNOUNCE index 19c822efb..1db52900a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.19beta05 - August 5, 2014 +Libpng 1.5.19beta05 - August 8, 2014 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. @@ -57,7 +57,10 @@ Version 1.5.19beta04 [August 4, 2014] due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT definitions from pngconf.h. -Version 1.5.19beta05 [August 5, 2014] +Version 1.5.19beta05 [August 8, 2014] + Eliminated use of "$<" in makefiles, when copying $PNGLIBCONF_H_PREBUILT. + This does not work on some versions of make; bug introduced in libpng + version 1.5.19beta03. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a41fd1d39..0fd3970a3 100644 --- a/CHANGES +++ b/CHANGES @@ -4233,7 +4233,10 @@ Version 1.5.19beta04 [August 4, 2014] due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT definitions from pngconf.h. -Version 1.5.19beta05 [August 5, 2014] +Version 1.5.19beta05 [August 8, 2014] + Eliminated use of "$<" in makefiles, when copying $PNGLIBCONF_H_PREBUILT. + This does not work on some versions of make; bug introduced in libpng + version 1.5.19beta03. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index 6fece9cd8..d488a54a0 100644 --- a/scripts/makefile.bc32 +++ b/scripts/makefile.bc32 @@ -51,8 +51,8 @@ CFLAGS=-O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt ## Variables OBJS = \ @@ -117,7 +117,7 @@ test: pngtest.exe ## Minor Targets pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h diff --git a/scripts/makefile.beos b/scripts/makefile.beos index c63b160ec..6ad21701c 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -87,7 +87,7 @@ OBJSDLL = $(OBJS) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.bor b/scripts/makefile.bor index 254de89e8..a01f73899 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.bor @@ -59,8 +59,8 @@ CFLAGS=-O2 -Z -X- -w -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt ## Variables @@ -117,7 +117,7 @@ all: libpng pngtest # try !include scripts\pnglibconf.mak for more options pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng: $(LIBNAME) diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e87ff9aed..3fbdd558e 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -84,7 +84,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 9bbfc96e1..636859df6 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -72,7 +72,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index e21546d6f..e59c432b4 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -36,7 +36,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) ar rc $@ $(OBJS) diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 84cfc2008..33820efd2 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -60,7 +60,7 @@ test: pngtest ./pngtest pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - cp $< $@ + cp $(PNGLIBCONF_H_PREBUILT) $@ DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index 8811a28a4..ba92d1509 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -43,7 +43,7 @@ OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \ all: static pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ .c.o: $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index d2a12711c..e253f2f6a 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -89,7 +89,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 474734a3d..19b002ed1 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -87,7 +87,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index 2f5a03cae..89b11966b 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -51,7 +51,7 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A) all: libpng$(A) pngtest$(E) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng$(A): $(OBJS) $(AR) -out:$@ $(OBJS) diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 9fa963f50..418726159 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -39,8 +39,8 @@ LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO CP=cp # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt O=.obj @@ -51,7 +51,7 @@ pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) all: test pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 38a67cb80..d8de064c4 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -50,7 +50,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: ansi2knr libpng.a pngtest pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ # general rule to allow ansi2knr to work .c.o: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index b495bd378..f76ebe789 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -97,7 +97,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.mips b/scripts/makefile.mips index d171dc411..5633608c8 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -46,7 +46,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) ar rc $@ $(OBJS) diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 6e30e81b1..539d62e94 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -20,8 +20,8 @@ CP=copy O=.obj # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt #uncomment next to put error messages in a file ERRFILE= >> pngerrs @@ -34,7 +34,7 @@ OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) all: libpng.lib pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) diff --git a/scripts/makefile.msys b/scripts/makefile.msys index f21fc7d9d..5f7cdd3fd 100644 --- a/scripts/makefile.msys +++ b/scripts/makefile.msys @@ -87,7 +87,7 @@ OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \ all: static shared pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ .c.o: $(CC) -c $(CPPFLAGS) $(CFLAGS) $< diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 2e2493e32..98803939f 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -28,7 +28,7 @@ CPPFLAGS+=-I${.CURDIR} # Pre-built configuration # See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt # We should be able to do something like this instead of the manual # uncommenting, but it core dumps for me at the moment: @@ -42,7 +42,7 @@ CLEANFILES+=pngtest.o pngtest pnglibconf.h $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - cp $< $@ + cp $(PNGLIBCONF_H_PREBUILT) $@ pngtest.o: pngtest.c ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 9fe91edda..58f357955 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -42,7 +42,7 @@ CLEANFILES+=pngtest.o pngtest pnglibconf.h $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - cp $< $@ + cp $(PNGLIBCONF_H_PREBUILT) $@ pngtest.o: pngtest.c ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index c36c4c63f..ff3cbef59 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -39,7 +39,7 @@ PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - cp $< $@ + cp $(PNGLIBCONF_H_PREBUILT) $@ pngtest.o: pngtest.c ${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET} diff --git a/scripts/makefile.sco b/scripts/makefile.sco index c247b5a3f..c4351d826 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -83,7 +83,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 433e43c29..23350a9b4 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -86,7 +86,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest shared libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 3668c57de..6e4ae2d65 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -89,7 +89,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest shared libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index ee2652c45..052abd99c 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -93,7 +93,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 1172c7180..b997fc2b2 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -89,7 +89,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 90149ebbb..b5742320c 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -88,7 +88,7 @@ OBJSDLL = $(OBJS:.o=.pic.o) all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index df661bf83..efe308c47 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -58,7 +58,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ all: libpng.a pngtest pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ libpng.a: $(OBJS) $(AR_RC) $@ $(OBJS) diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3 index e4744a774..c917a08f1 100644 --- a/scripts/makefile.tc3 +++ b/scripts/makefile.tc3 @@ -15,8 +15,8 @@ LDFLAGS=-m$(MODEL) -L..\zlib CP=copy # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt O=.obj E=.exe @@ -32,7 +32,7 @@ OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O) all: libpng$(MODEL).lib pngtest$(E) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ pngtest: pngtest$(E) diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index b17f6a46f..621969239 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -23,8 +23,8 @@ CP = copy RM = del # Pre-built configuration -# See scripts/pnglibconf.mak for more options -PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt +# See scripts\pnglibconf.mak for more options +PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt # File extensions O=.obj @@ -42,7 +42,7 @@ OBJS = $(OBJS1) $(OBJS2) $(OBJS3) all: libpng.lib pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) - $(CP) $< $@ + $(CP) $(PNGLIBCONF_H_PREBUILT) $@ png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)