[devel] Renamed scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt
diff --git a/ANNOUNCE b/ANNOUNCE
index 1b7afa2..4a9330a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -384,6 +384,7 @@
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
diff --git a/CHANGES b/CHANGES
index a5667dc..41adc8c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3021,6 +3021,7 @@
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
diff --git a/INSTALL b/INSTALL
index fa879ea..c041a3d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -77,6 +77,7 @@
scripts
makefile.*
*.def (module definition files)
+ etc.
pngtest.png
etc.
zlib
diff --git a/png.h b/png.h
index 1376c8d..51186ff 100644
--- a/png.h
+++ b/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
diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj
index 39bfaed..2da2d0a 100644
--- a/projects/vstudio/pnglibconf/pnglibconf.vcxproj
+++ b/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>
diff --git a/scripts/README.txt b/scripts/README.txt
index 75b4dc6..06c6dba 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,7 +1,7 @@
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)
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga
index f66c07f..228b5c2 100644
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -43,8 +43,8 @@
$(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 <
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index fc3a4d6..1aeb7d5 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -40,8 +40,8 @@
$(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
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index 7fdd3e6..ebbd5ce 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -111,8 +111,8 @@
# 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
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index af540b5..0ac0cc9 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -79,8 +79,8 @@
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)
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index cc4379b..96d5e86 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -109,8 +109,8 @@
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)
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index bf4a8e5..37656dd 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -76,8 +76,8 @@
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)
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 7ec7173..f21c1a6 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -63,8 +63,8 @@
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)
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index c821cba..47a33e9 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -25,8 +25,8 @@
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)
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index d9b6730..cb239a6 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -96,8 +96,8 @@
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)
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 58e8434..994608c 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -43,8 +43,8 @@
./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:
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index 606240a..2e5b611 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -42,8 +42,8 @@
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) $<
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 31e85f8..a53802b 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -81,8 +81,8 @@
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)
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index d6597e4..d48909b 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -78,8 +78,8 @@
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)
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index d530609..209d513 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -42,8 +42,8 @@
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)
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index dc15650..1cb9ef3 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -45,8 +45,8 @@
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)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 6c49ce5..18a39f5 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -42,8 +42,8 @@
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:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 1df1ea7..280a583 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -88,8 +88,8 @@
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)
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index 7a5a414..179d385 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -36,8 +36,8 @@
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)
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index abe22dd..baa863d 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -28,8 +28,8 @@
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)
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 1051d65..4eb2226 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -35,8 +35,8 @@
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}
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index adec854..18ff453 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -35,8 +35,8 @@
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}
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index ec0eddc..be12795 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -31,8 +31,8 @@
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}
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2
index af60332..2512ec1 100644
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -34,8 +34,8 @@
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)
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 364b1db..8b71c72 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -74,8 +74,8 @@
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)
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 13e2374..8daf5f9 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -77,8 +77,8 @@
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)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index a6b3eaf..b3e563b 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -80,8 +80,8 @@
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)
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index a843822..762855a 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -84,8 +84,8 @@
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)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index b89a751..f0b918f 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -80,8 +80,8 @@
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)
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 97813bf..0a7d3f4 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -80,8 +80,8 @@
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)
diff --git a/scripts/makefile.std b/scripts/makefile.std
index 08b4092..30e1646 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -48,7 +48,7 @@
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
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index f893c2f..3839549 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -49,8 +49,8 @@
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)
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index 8a95f1a..462c47f 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -26,8 +26,8 @@
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)
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index e5d5b4c..e3b2b82 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -36,8 +36,8 @@
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)
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom
index aa1cf5b..983b4e3 100644
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -51,13 +51,13 @@
# 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)
diff --git a/scripts/pnglibconf.h b/scripts/pnglibconf.h.prebuilt
similarity index 100%
rename from scripts/pnglibconf.h
rename to scripts/pnglibconf.h.prebuilt
diff --git a/scripts/pnglibconf.mak b/scripts/pnglibconf.mak
index 772be7c..bced8d3 100755
--- a/scripts/pnglibconf.mak
+++ b/scripts/pnglibconf.mak
@@ -27,7 +27,7 @@
# 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
diff --git a/scripts/pngwin.dfn b/scripts/pngwin.dfn
index 495b8ca..8cb6790 100644
--- a/scripts/pngwin.dfn
+++ b/scripts/pngwin.dfn
@@ -31,8 +31,8 @@
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"
diff --git a/scripts/symbols.dfn b/scripts/symbols.dfn
index 54d2496..dfbd8c1 100644
--- a/scripts/symbols.dfn
+++ b/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
