AuroraMiddleware/libpng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[libpng16] Eliminated use of "$<" when copying $PNGLIBCONF_H_PREBUILT in

Browse Source 
makefiles. This does not work on some versions of make; bug introduced in
libpng version 1.6.11.
This commit is contained in:
Glenn Randers-Pehrson 2014-08-07 19:51:35 -05:00
parent 389e5cbabf
commit ff649a0710
32 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.13beta04 - August 4, 2014 Libpng 1.6.13beta04 - August 8, 2014
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.
@ -50,7 +50,12 @@ Version 1.6.13beta03 [August 3, 2014]
Ensure that CMakeLists.txt makes the target "lib" directory before making Ensure that CMakeLists.txt makes the target "lib" directory before making
symbolic link into it (SourceForge bug report #226 by Rolf Timmermans). symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
Version 1.6.13beta04 [August 4, 2014] Version 1.6.13beta04 [August 8, 2014]
Added opinion about the ECCN (Export Control Classification Number) for
libpng being EAR99 to README
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.6.11.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

7
CHANGES
View File

@ -4965,7 +4965,12 @@ Version 1.6.13beta03 [August 3, 2014]
Ensure that CMakeLists.txt makes the target "lib" directory before making Ensure that CMakeLists.txt makes the target "lib" directory before making
symbolic link into it (SourceForge bug report #226 by Rolf Timmermans). symbolic link into it (SourceForge bug report #226 by Rolf Timmermans).
Version 1.6.13beta04 [August 4, 2014] Version 1.6.13beta04 [August 8, 2014]
Added opinion about the ECCN (Export Control Classification Number) for
libpng being EAR99 to README
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.6.11.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

2
scripts/makefile.atari
View File

@ -49,7 +49,7 @@ $(LBR): $(OBJS)
$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h $(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
cp $< $@ cp $(PNGLIBCONF_H_PREBUILT) $@
pngtest.ttp: pngtest.o $(LBR) pngtest.ttp: pngtest.o $(LBR)
$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o $(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o

2
scripts/makefile.bc32
View File

@ -117,7 +117,7 @@ test: pngtest.exe
## Minor Targets ## Minor Targets
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) 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 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 pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h

2
scripts/makefile.beos
View File

@ -87,7 +87,7 @@ OBJSDLL = $(OBJS)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.bor
View File

@ -117,7 +117,7 @@ all: libpng pngtest
# try !include scripts\pnglibconf.mak for more options # try !include scripts\pnglibconf.mak for more options
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng: $(LIBNAME) libpng: $(LIBNAME)

2
scripts/makefile.darwin
View File

@ -84,7 +84,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.dec
View File

@ -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 all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.dj2
View File

@ -36,7 +36,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)

2
scripts/makefile.freebsd
View File

@ -60,7 +60,7 @@ test: pngtest
./pngtest ./pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
cp $< $@ cp $(PNGLIBCONF_H_PREBUILT) $@
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock: writelock:

2
scripts/makefile.gcc
View File

@ -43,7 +43,7 @@ OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
all: static all: static
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
.c.o: .c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<

2
scripts/makefile.hp64
View File

@ -89,7 +89,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.hpux
View File

@ -87,7 +87,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.ibmc
View File

@ -51,7 +51,7 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)
all: libpng$(A) pngtest$(E) all: libpng$(A) pngtest$(E)
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng$(A): $(OBJS) libpng$(A): $(OBJS)
$(AR) -out:$@ $(OBJS) $(AR) -out:$@ $(OBJS)

2
scripts/makefile.intel
View File

@ -51,7 +51,7 @@ pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
all: test all: test
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) 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 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)

2
scripts/makefile.knr
View File

@ -50,7 +50,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: ansi2knr libpng.a pngtest all: ansi2knr libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
# general rule to allow ansi2knr to work # general rule to allow ansi2knr to work
.c.o: .c.o:

2
scripts/makefile.linux
View File

@ -97,7 +97,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.mips
View File

@ -46,7 +46,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)

2
scripts/makefile.msc
View File

@ -34,7 +34,7 @@ OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
all: libpng.lib all: libpng.lib
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) 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 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)

2
scripts/makefile.msys
View File

@ -87,7 +87,7 @@ OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
all: static shared all: static shared
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
.c.o: .c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< $(CC) -c $(CPPFLAGS) $(CFLAGS) $<

2
scripts/makefile.ne12bsd
View File

@ -42,7 +42,7 @@ CLEANFILES+=pngtest.o pngtest pnglibconf.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
cp $< $@ cp $(PNGLIBCONF_H_PREBUILT) $@
pngtest.o: pngtest.c pngtest.o: pngtest.c
${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}

2
scripts/makefile.netbsd
View File

@ -42,7 +42,7 @@ CLEANFILES+=pngtest.o pngtest pnglibconf.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
cp $< $@ cp $(PNGLIBCONF_H_PREBUILT) $@
pngtest.o: pngtest.c pngtest.o: pngtest.c
${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}

2
scripts/makefile.openbsd
View File

@ -39,7 +39,7 @@ PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
cp $< $@ cp $(PNGLIBCONF_H_PREBUILT) $@
pngtest.o: pngtest.c pngtest.o: pngtest.c
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET} ${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}

2
scripts/makefile.sco
View File

@ -83,7 +83,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.sggcc
View File

@ -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 all: libpng.a pngtest shared libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.sgi
View File

@ -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 all: libpng.a pngtest shared libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.so9
View File

@ -93,7 +93,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.solaris
View File

@ -89,7 +89,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.solaris-x86
View File

@ -88,7 +88,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.sunos
View File

@ -58,7 +58,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

2
scripts/makefile.tc3
View File

@ -32,7 +32,7 @@ OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O)
all: libpng$(MODEL).lib pngtest$(E) all: libpng$(MODEL).lib pngtest$(E)
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $< $@ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
pngtest: pngtest$(E) pngtest: pngtest$(E)

2
scripts/makefile.vcwin32
View File

@ -42,7 +42,7 @@ OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
all: libpng.lib all: libpng.lib
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT) 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 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE) $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)