[devel] Renamed scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt

This commit is contained in:
Glenn Randers-Pehrson 2010-08-24 16:16:35 -05:00
parent 15333cd28d
commit 8c66786419
44 changed files with 85 additions and 79 deletions

View File

@ -384,6 +384,7 @@ Version 1.5.0beta45 [August 24, 2010]
simply copies the file; in the future it may actually generate the simply copies the file; in the future it may actually generate the
file from scripts/pnglibconf.dfa as the other build systems do. file from scripts/pnglibconf.dfa as the other build systems do.
Changed pngvalid to work when floating point APIs are disabled Changed pngvalid to work when floating point APIs are disabled
Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt
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

@ -3021,6 +3021,7 @@ Version 1.5.0beta45 [August 24, 2010]
simply copies the file; in the future it may actually generate the simply copies the file; in the future it may actually generate the
file from scripts/pnglibconf.dfa as the other build systems do. file from scripts/pnglibconf.dfa as the other build systems do.
Changed pngvalid to work when floating point APIs are disabled Changed pngvalid to work when floating point APIs are disabled
Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt
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

@ -77,6 +77,7 @@ Your directory structure should look like this:
scripts scripts
makefile.* makefile.*
*.def (module definition files) *.def (module definition files)
etc.
pngtest.png pngtest.png
etc. etc.
zlib zlib

3
png.h
View File

@ -392,6 +392,9 @@
* the library has been built. * the library has been built.
*/ */
#ifndef PNGLCONF_H #ifndef PNGLCONF_H
/* If pnglibconf.h is missing, you can
* copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
*/
# include "pnglibconf.h" # include "pnglibconf.h"
#endif #endif

View File

@ -40,7 +40,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Command>copy ..\..\..\scripts\pnglibconf.h ..\..\..\pnglibconf.h</Command> <Command>copy ..\..\..\scripts\pnglibconf.h_prebuilt ..\..\..\pnglibconf.h</Command>
</CustomBuildStep> </CustomBuildStep>
<CustomBuildStep> <CustomBuildStep>
<Message>Generating pnglibconf.h</Message> <Message>Generating pnglibconf.h</Message>
@ -49,7 +49,7 @@
<Outputs>..\..\..\pnglibconf.h</Outputs> <Outputs>..\..\..\pnglibconf.h</Outputs>
</CustomBuildStep> </CustomBuildStep>
<CustomBuildStep> <CustomBuildStep>
<Inputs>..\..\..\scripts\pnglibconf.h</Inputs> <Inputs>..\..\..\scripts\pnglibconf.h_prebuilt</Inputs>
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@ -100,7 +100,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Command>copy ..\..\..\scripts\pnglibconf.h ..\..\..\pnglibconf.h</Command> <Command>copy ..\..\..\scripts\pnglibconf.h_prebuilt ..\..\..\pnglibconf.h</Command>
</CustomBuildStep> </CustomBuildStep>
<CustomBuildStep> <CustomBuildStep>
<Message>Generating pnglibconf.h</Message> <Message>Generating pnglibconf.h</Message>
@ -109,7 +109,7 @@
<Outputs>..\..\..\pnglibconf.h</Outputs> <Outputs>..\..\..\pnglibconf.h</Outputs>
</CustomBuildStep> </CustomBuildStep>
<CustomBuildStep> <CustomBuildStep>
<Inputs>..\..\..\scripts\pnglibconf.h</Inputs> <Inputs>..\..\..\scripts\pnglibconf.h_prebuilt</Inputs>
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,7 +1,7 @@
Makefiles for libpng version 1.5.0beta45 - August 24, 2010 Makefiles for libpng version 1.5.0beta45 - August 24, 2010
pnglibconf.h => Stores configuration settings pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng15.so.15.1.5.0beta45) (gcc, creates libpng15.so.15.1.5.0beta45)
makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.gcc => Generic makefile (gcc, creates static libpng.a)

View File

@ -43,8 +43,8 @@ $(AR) libpng.lib r $(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: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
$(CP) scripts/pnglibconf.h pnglibconf.h $(CP) scripts/pnglibconf.h.prebuilt pnglibconf.h
pngtest: pngtest.o libpng.lib pngtest: pngtest.o libpng.lib
$(LN) <WITH < $(LN) <WITH <

View File

@ -40,8 +40,8 @@ $(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: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h pnglibconf.h cp scripts/pnglibconf.h.prebuilt pnglibconf.h
pngtest.ttp: pngtest.o $(LBR) pngtest.ttp: pngtest.o $(LBR)
$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o $(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o

View File

@ -111,8 +111,8 @@ test: pngtest.exe
# see scripts\pnglibconf.mak for how to make this file # see scripts\pnglibconf.mak for how to make this file
# with different options # with different options
pnglibconf.h: scripts\pnglibconf.h pnglibconf.h: scripts\pnglibconf.h.prebuilt
copy scripts\pnglibconf.h $@ copy scripts\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

@ -79,8 +79,8 @@ OBJSDLL = $(OBJS)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# try include scripts/pnglibconf.mak for more options # try include scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -109,8 +109,8 @@ LIBNAME=libpng$(MODEL).lib
all: libpng pngtest all: libpng pngtest
# try !inlude scripts\pnglibconf.mak for more options # try !inlude scripts\pnglibconf.mak for more options
pnglibconf.h: scripts\pnglibconf.h pnglibconf.h: scripts\pnglibconf.h.prebuilt
copy scripts\pnglibconf.h $@ copy scripts\pnglibconf.h.prebuilt $@
libpng: $(LIBNAME) libpng: $(LIBNAME)

View File

@ -76,8 +76,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -63,8 +63,8 @@ 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
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -25,8 +25,8 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)

View File

@ -96,8 +96,8 @@ 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
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -43,8 +43,8 @@ test: pngtest
./pngtest ./pngtest
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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

@ -42,8 +42,8 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
all: static all: static
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
.c$(O): .c$(O):
$(CC) -c $(CFLAGS) -I$(ZLIBINC) $< $(CC) -c $(CFLAGS) -I$(ZLIBINC) $<

View File

@ -81,8 +81,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -78,8 +78,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -42,8 +42,8 @@ LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)
all: libpng$(A) pngtest$(E) all: libpng$(A) pngtest$(E)
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng$(A): $(OBJS) libpng$(A): $(OBJS)
$(AR) -out:$@ $(OBJS) $(AR) -out:$@ $(OBJS)

View File

@ -45,8 +45,8 @@ pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
all: test all: test
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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) $(CFLAGS) $*.c $(ERRFILE) $(CC) $(CFLAGS) $*.c $(ERRFILE)

View File

@ -42,8 +42,8 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: ansi2knr libpng.a pngtest all: ansi2knr libpng.a pngtest
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
# general rule to allow ansi2knr to work # general rule to allow ansi2knr to work
.c.o: .c.o:

View File

@ -88,8 +88,8 @@ 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
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -36,8 +36,8 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
ar rc $@ $(OBJS) ar rc $@ $(OBJS)

View File

@ -28,8 +28,8 @@ OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
all: libpng.lib all: libpng.lib
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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 $(CFLAGS) $*.c $(ERRFILE) $(CC) -c $(CFLAGS) $*.c $(ERRFILE)

View File

@ -35,8 +35,8 @@ CPPFLAGS+=-I${.CURDIR}
CLEANFILES+=pngtest.o pngtest pnglibconf.h CLEANFILES+=pngtest.o pngtest pnglibconf.h
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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

@ -35,8 +35,8 @@ CPPFLAGS+=-I${.CURDIR}
CLEANFILES+=pngtest.o pngtest pnglibconf.h CLEANFILES+=pngtest.o pngtest pnglibconf.h
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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

@ -31,8 +31,8 @@ MAN= libpng.3 libpngpf.3 png.5
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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

@ -34,8 +34,8 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP) all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
$(PNGLIB): $(OBJS) $(PNGLIB): $(OBJS)
$(AR) rc $@ $(OBJS) $(AR) rc $@ $(OBJS)

View File

@ -74,8 +74,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -77,8 +77,8 @@ 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
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -80,8 +80,8 @@ 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
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -84,8 +84,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -80,8 +80,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -80,8 +80,8 @@ OBJSDLL = $(OBJS:.o=.pic.o)
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -48,7 +48,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
# The standard pnglibconf.h exists as scripts/pnglibconf.h, # The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
# copy this if the following doesn't work. # copy this if the following doesn't work.
pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
$(RM_F) $@ dfn?.out $(RM_F) $@ dfn?.out

View File

@ -49,8 +49,8 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
all: libpng.a pngtest all: libpng.a pngtest
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
libpng.a: $(OBJS) libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS) $(AR_RC) $@ $(OBJS)

View File

@ -26,8 +26,8 @@ OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O)
all: libpng$(MODEL).lib pngtest$(E) all: libpng$(MODEL).lib pngtest$(E)
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/pnglibconf.h.prebuilt $@
pngtest: pngtest$(E) pngtest: pngtest$(E)

View File

@ -36,8 +36,8 @@ OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
all: libpng.lib all: libpng.lib
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h $@ cp scripts/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 $(CFLAGS) $*.c $(ERRFILE) $(CC) -c $(CFLAGS) $*.c $(ERRFILE)

View File

@ -51,13 +51,13 @@ all: test
# see scripts/pnglibconf.mak for more options # see scripts/pnglibconf.mak for more options
# to support watcom calling conventions it is necessary to set PNG_API_RULE to 2 # to support watcom calling conventions it is necessary to set PNG_API_RULE to 2
# in pnglibconf.h - copy scripts/pnglibconf.h, delete the first line and change # in pnglibconf.h - copy scripts/pnglibconf.h.prebuilt, delete the first line and change
# the definition of PNG_API_RULE from 0 to 2. # the definition of PNG_API_RULE from 0 to 2.
# #
# If you know how to do this with the Watcom build system please supply a patch # If you know how to do this with the Watcom build system please supply a patch
# for this makefile to the PNG implementation list. # for this makefile to the PNG implementation list.
pnglibconf.h: scripts/pnglibconf.h pnglibconf.h: scripts/pnglibconf.h.prebuilt
@echo please copy scripts/pnglibconf.h and change PNG_API_RULE to 2 @echo please copy scripts/pnglibconf.h.prebuilt and change PNG_API_RULE to 2
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) $(CFLAGS) $*.c $(ERRFILE) $(CC) $(CFLAGS) $*.c $(ERRFILE)

View File

@ -27,7 +27,7 @@ DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
# srcdir is a defacto standard for the location of the source # srcdir is a defacto standard for the location of the source
srcdir = . srcdir = .
# The standard pnglibconf.h exists as scripts/pnglibconf.h, # The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
# copy this if the following doesn't work. # copy this if the following doesn't work.
pnglibconf.h: pnglibconf.dfn pnglibconf.h: pnglibconf.dfn
$(DELETE) $@ dfn.c dfn1.out dfn2.out dfn3.out $(DELETE) $@ dfn.c dfn1.out dfn2.out dfn3.out

View File

@ -31,8 +31,8 @@ PNG_DEFN_MAGIC--PNG_DEFN_END
PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END
PNG_DEFN_MAGIC-;Version PNGLIB_VERSION-PNG_DEFN_END PNG_DEFN_MAGIC-;Version PNGLIB_VERSION-PNG_DEFN_END
/* Read the defaults, but use scripts/pnglibconf.h; the 'standard' /* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard'
* header file. * header file.
*/ */
#include "pnglibconf.h" #include "pnglibconf.h.prebuilt"
#include "../png.h" #include "../png.h"

View File

@ -11,7 +11,7 @@
/* NOTE: making 'symbols.chk' checks both that the exported /* NOTE: making 'symbols.chk' checks both that the exported
* symbols in the library don't change and (implicitly) that * symbols in the library don't change and (implicitly) that
* scripts/pnglibconf.h is as expected. If scripts/pnglibconf.h * scripts/pnglibconf.h.prebuilt is as expected. If scripts/pnglibconf.h.prebuilt
* is remade using scripts/pnglibconf.dfa then this checks the * is remade using scripts/pnglibconf.dfa then this checks the
* .dfa file too. * .dfa file too.
*/ */
@ -23,10 +23,10 @@
#define PNG_EXPORT_LAST_ORDINAL(ordinal)\ #define PNG_EXPORT_LAST_ORDINAL(ordinal)\
PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END
/* Read the defaults, but use scripts/pnglibconf.h; the 'standard' /* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard'
* header file. * header file.
*/ */
#include "pnglibconf.h" #include "pnglibconf.h.prebuilt"
#include "../png.h" #include "../png.h"
/* Some things are turned off by default. Turn these things /* Some things are turned off by default. Turn these things