[libpng17] Updated scripts/makefiles from libpng-1.6.13beta04.

This commit is contained in:
Glenn Randers-Pehrson 2014-08-08 09:30:23 -05:00
parent cea01951da
commit 34e49ae1bc
32 changed files with 39 additions and 34 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta36 - August 6, 2014 Libpng 1.7.0beta36 - 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.
@ -592,8 +592,10 @@ Version 1.7.0beta35 [August 6, 2014]
definitions from pngconf.h. definitions from pngconf.h.
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).
libpng is EAR99 to the README file.
Version 1.7.0beta36 [August 6, 2014] Version 1.7.0beta36 [August 8, 2014]
Updated scripts/makefiles from libpng-1.6.13beta04.
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

View File

@ -4881,8 +4881,11 @@ Version 1.7.0beta35 [August 6, 2014]
definitions from pngconf.h. definitions from pngconf.h.
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).
Added opinion that the ECCN (Export Control Classification Number) for
libpng is EAR99 to the README file.
Version 1.7.0beta36 [August 6, 2014] Version 1.7.0beta36 [August 6, 2014]
Updated scripts/makefiles from libpng-1.6.13beta04.
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

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

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

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)

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)

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)

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)

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)

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:

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 $@ $<

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)

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)

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)

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)

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:

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)

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)

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)

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) $<

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}

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}

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}

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)

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)

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)

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)

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)

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)

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)

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)

View File

@ -9,9 +9,9 @@
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcwin32" # To use, do "nmake /f scripts\makefile.vcwin32"
# -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- # -------- Microsoft Visual C++ 2.0 and later --------
# Compiler, linker, librarian, and other tools # Compiler, linker, librarian and other tools
CC = cl CC = cl
LD = link LD = link
AR = lib AR = lib
@ -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)