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

ANNOUNCE

@@ -384,6 +384,7 @@ Version 1.5.0beta45 [August 24, 2010]
     simply copies the file; in the future it may actually generate the
     file from scripts/pnglibconf.dfa as the other build systems do.
   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:
 (subscription required; visit

CHANGES

@@ -3021,6 +3021,7 @@ Version 1.5.0beta45 [August 24, 2010]
     simply copies the file; in the future it may actually generate the
     file from scripts/pnglibconf.dfa as the other build systems do.
   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
 (subscription required; visit

INSTALL

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

png.h

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

projects/vstudio/pnglibconf/pnglibconf.vcxproj

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

scripts/README.txt

 
 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
                        (gcc, creates libpng15.so.15.1.5.0beta45)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)

scripts/makefile.amiga

@@ -43,8 +43,8 @@ $(AR) libpng.lib r $(OBJS)
 
 $(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
 
-pnglibconf.h: scripts/pnglibconf.h
-$(CP) scripts/pnglibconf.h pnglibconf.h
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+$(CP) scripts/pnglibconf.h.prebuilt pnglibconf.h
 
 pngtest: pngtest.o libpng.lib
 $(LN) <WITH <

scripts/makefile.atari

@@ -40,8 +40,8 @@ $(LBR): $(OBJS)
 
 $(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
 
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h pnglibconf.h
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt pnglibconf.h
 
 pngtest.ttp: pngtest.o $(LBR)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o

scripts/makefile.bc32

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

scripts/makefile.beos

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

scripts/makefile.bor

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

scripts/makefile.darwin

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

scripts/makefile.dec

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

scripts/makefile.dj2

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

scripts/makefile.elf

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

scripts/makefile.freebsd

@@ -43,8 +43,8 @@ test: pngtest
 	./pngtest
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:

scripts/makefile.gcc

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

scripts/makefile.hp64

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

scripts/makefile.hpux

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

scripts/makefile.ibmc

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

scripts/makefile.intel

@@ -45,8 +45,8 @@ pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
 all: test
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 	$(CC) $(CFLAGS) $*.c $(ERRFILE)

scripts/makefile.knr

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

scripts/makefile.linux

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

scripts/makefile.mips

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

scripts/makefile.msc

@@ -28,8 +28,8 @@ OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
 all: libpng.lib
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 		  $(CC) -c $(CFLAGS) $*.c $(ERRFILE)

scripts/makefile.ne12bsd

@@ -35,8 +35,8 @@ CPPFLAGS+=-I${.CURDIR}
 CLEANFILES+=pngtest.o pngtest pnglibconf.h
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 pngtest.o:	pngtest.c
 	${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}

scripts/makefile.netbsd

@@ -35,8 +35,8 @@ CPPFLAGS+=-I${.CURDIR}
 CLEANFILES+=pngtest.o pngtest pnglibconf.h
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 pngtest.o:	pngtest.c
 	${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}

scripts/makefile.openbsd

@@ -31,8 +31,8 @@ MAN=	libpng.3 libpngpf.3 png.5
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 pngtest.o:	pngtest.c
 	${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}

scripts/makefile.os2

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

scripts/makefile.sco

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

scripts/makefile.sggcc

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

scripts/makefile.sgi

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

scripts/makefile.so9

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

scripts/makefile.solaris

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

scripts/makefile.solaris-x86

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

scripts/makefile.std

@@ -48,7 +48,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 
 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.
 pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	$(RM_F) $@ dfn?.out

scripts/makefile.sunos

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

scripts/makefile.tc3

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

scripts/makefile.vcwin32

@@ -36,8 +36,8 @@ OBJS  = $(OBJS1) $(OBJS2) $(OBJS3)
 all: libpng.lib
 
 # see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h
-	cp scripts/pnglibconf.h $@
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	cp scripts/pnglibconf.h.prebuilt $@
 
 png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)

scripts/makefile.watcom

@@ -51,13 +51,13 @@ all: test
 
 # see scripts/pnglibconf.mak for more options
 # 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.
 #
 # If you know how to do this with the Watcom build system please supply a patch
 # for this makefile to the PNG implementation list.
-pnglibconf.h: scripts/pnglibconf.h
-	@echo please copy scripts/pnglibconf.h and change PNG_API_RULE to 2
+pnglibconf.h: scripts/pnglibconf.h.prebuilt
+	@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
 	$(CC) $(CFLAGS) $*.c $(ERRFILE)

scripts/pnglibconf.mak

@@ -27,7 +27,7 @@ DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
 # srcdir is a defacto standard for the location of the source
 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.
 pnglibconf.h: pnglibconf.dfn
 	$(DELETE) $@ dfn.c dfn1.out dfn2.out dfn3.out

scripts/pngwin.dfn

@@ -31,8 +31,8 @@ PNG_DEFN_MAGIC--PNG_DEFN_END
 PNG_DEFN_MAGIC-EXPORTS-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.
  */
-#include "pnglibconf.h"
+#include "pnglibconf.h.prebuilt"
 #include "../png.h"

scripts/symbols.dfn

@@ -11,7 +11,7 @@
 
 /* NOTE: making 'symbols.chk' checks both that the exported
  * 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
  * .dfa file too.
  */
@@ -23,10 +23,10 @@
 #define PNG_EXPORT_LAST_ORDINAL(ordinal)\
 	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.
  */
-#include "pnglibconf.h"
+#include "pnglibconf.h.prebuilt"
 #include "../png.h"
 
 /* Some things are turned off by default.  Turn these things