[libpng16] $(CP) is now used alongside $(RM_F). Also, use 'copy' instead
of 'cp' where applicable, and applied other minor makefile changes.
diff --git a/scripts/README.txt b/scripts/README.txt
index 320c242..43f9dcb 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.11beta02 - March 17, 2014
+Makefiles for libpng version 1.6.11beta02 - March 22, 2014
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index 051d303..3c54b84 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -45,7 +45,7 @@
$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt pnglibconf.h
+ cp $< $@
pngtest.ttp: pngtest.o $(LBR)
$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index c2a9122..26b8b1f 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -11,10 +11,11 @@
## Where zlib.h, zconf.h and zlib.lib are
ZLIB_DIR=..\zlib
-## Compiler, linker and lib stuff
+## Compiler, linker, librarian and other tools
CC=bcc32
LD=bcc32
LIB=tlib
+CP=copy
# -3 = 386, -4 = 486, -5 = Pentium etc.
!ifndef TARGET_CPU
@@ -114,7 +115,7 @@
# see scripts\pnglibconf.mak for how to make this file
# with different options
pnglibconf.h: scripts\pnglibconf.h.prebuilt
- copy scripts\pnglibconf.h.prebuilt $@
+ $(CP) $< $@
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 f897d11..da62e98 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -24,6 +24,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
# Where the zlib library and include files are located
@@ -83,7 +84,7 @@
# try include scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index a032510..70236d6 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -12,10 +12,11 @@
## Where zlib.h, zconf.h and zlib_MODEL.lib are
ZLIB_DIR=..\zlib
-## Compiler, linker and lib stuff
+## Compiler, linker, librarian and other tools
CC=bcc
LD=bcc
LIB=tlib
+CP=copy
!ifndef MODEL
MODEL=l
@@ -112,7 +113,7 @@
# try !inlude scripts\pnglibconf.mak for more options
pnglibconf.h: scripts\pnglibconf.h.prebuilt
- copy scripts\pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng: $(LIBNAME)
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 7c38c26..e463099 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -34,6 +34,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
ARCH=-arch ppc -arch i386 -arch x86_64
@@ -80,7 +81,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 1ba9efb..3096c1e 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -22,6 +22,7 @@
MKDIR_P=mkdir
LN_SF=ln -f -s
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
# where make install puts libpng.a and png.h
@@ -68,7 +69,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
@@ -181,7 +182,7 @@
./pngtesti pngtest.png
clean:
- /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+ $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc pnglibconf.h
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index a43f34a..0ff3913 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -19,6 +19,9 @@
RANLIB=ranlib
+CP=cp
+RM_F=rm -f
+
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o pngwtran.o \
pngmem.o pngerror.o pngpread.o
@@ -30,7 +33,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
ar rc $@ $(OBJS)
@@ -43,7 +46,7 @@
test: pngtest
./pngtest
clean:
- rm -f *.o libpng.a pngtest pngout.png pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 6da6d4a..cdfbca9 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -30,6 +30,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
# where "make install" puts libpng16.a, libpng16.so*,
@@ -100,7 +101,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 03a15df..3add34a 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -13,7 +13,7 @@
SHLIB_MAJOR= ${SHLIB_VER}
SHLIB_MINOR= 0
NO_PROFILE= YES
-NO_OBJ= YES
+NO_OBJ= YES
# where make install puts libpng.a and png.h
DESTDIR= ${PREFIX}
@@ -57,7 +57,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ cp $< $@
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock:
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index a592294..3e1b84f 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -16,6 +16,7 @@
LD = $(CC)
AR_RC = ar rcs
RANLIB = ranlib
+CP = cp
RM_F = rm -f
WARNMORE = -Wwrite-strings -Wpointer-arith -Wshadow \
@@ -39,7 +40,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 6c15a0b..388babf 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -34,6 +34,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
CPPFLAGS=-I$(ZLIBINC) \
@@ -85,7 +86,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 67d8f42..5c8791b 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -25,6 +25,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
# where "make install" puts libpng.a, $(OLDSO)*, png.h, pngconf.h
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index bef2e23..429d8e9 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -84,7 +84,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index 861a551..1571d0e 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -21,6 +21,7 @@
CC = icc
LD = ilink
AR = ilib
+CP = copy
RM = del
CPPFLAGS = -I$(ZLIBINC)
@@ -47,7 +48,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng$(A): $(OBJS)
$(AR) -out:$@ $(OBJS)
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 1abfc6e..cdc7526 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -36,6 +36,7 @@
CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -nologo
LD=link
LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO
+CP=cp
O=.obj
@@ -47,7 +48,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 7209215..7395f65 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -36,6 +36,9 @@
RANLIB = ranlib
#RANLIB = echo
+CP = cp
+RM_F = rm -f
+
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
@@ -44,7 +47,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
# general rule to allow ansi2knr to work
.c.o:
@@ -83,7 +86,7 @@
chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
clean:
- rm -f *.o libpng.a pngtest pngout.png ansi2knr pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png ansi2knr pnglibconf.h
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 1705174..6d62dcd 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -24,6 +24,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
# where "make install" puts libpng16.a, libpng16.so*,
@@ -93,7 +94,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index a0df001..2297126 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -30,6 +30,8 @@
#RANLIB=ranlib
RANLIB=echo
+CP=cp
+
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
@@ -41,7 +43,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
ar rc $@ $(OBJS)
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 905ed72..f2f1d28 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -16,6 +16,7 @@
CC=cl
LD=link
LDFLAGS=/e/st:0x1500/noe
+CP=copy
O=.obj
#uncomment next to put error messages in a file
@@ -30,10 +31,10 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
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)
pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.msys b/scripts/makefile.msys
index 783fe70..151597c 100644
--- a/scripts/makefile.msys
+++ b/scripts/makefile.msys
@@ -37,6 +37,7 @@
LD = $(CC)
AR_RC = ar rcs
RANLIB = ranlib
+CP = cp
RM_F = rm -rf
MKDIR_P=mkdir -p
LN_SF=ln -sf
@@ -83,7 +84,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 1907735..85ae6e8 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -39,7 +39,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ cp $< $@
pngtest.o: pngtest.c
${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index db7c6c4..a6831e1 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -39,7 +39,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ cp $< $@
pngtest.o: pngtest.c
${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index c0eb5ab..5599d75 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -36,7 +36,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ cp $< $@
pngtest.o: pngtest.c
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index a8de13f..8fd66c7 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,6 +25,7 @@
MKDIR_P=mkdir
LN_SF=ln -f -s
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# where make install puts libpng.a, $(OLDSO)*, and png.h
@@ -79,7 +80,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index a2c203e..5bcc0e5 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -22,6 +22,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng16.so, and libpng16/png.h
@@ -82,7 +83,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 96c61b0..381ac55 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -22,6 +22,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng16.so, and libpng16/png.h
@@ -85,7 +86,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 67821f8..220d864 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -26,6 +26,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -f -s
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# Where make install puts libpng.a, $(OLDSO)*, and png.h
@@ -89,7 +90,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 8132199..92a5bed 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -24,6 +24,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -f -s
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng16.so*, and png.h
@@ -85,7 +86,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 8d24148..630ba1e 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -24,6 +24,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -f -s
RANLIB=echo
+CP=cp
RM_F=/bin/rm -f
# Where make install puts libpng.a, libpng16.so*, and png.h
@@ -84,7 +85,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.std b/scripts/makefile.std
index 30a21e2..db731c9 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -32,6 +32,7 @@
MKDIR_P = mkdir
LN_SF = ln -sf
RANLIB = ranlib
+CP = cp
RM_F = rm -f
AWK = awk
SED = sed
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index bc5f926..ce2a7f2 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -37,6 +37,7 @@
MKDIR_P=mkdir -p
LN_SF=ln -f -s
RANLIB=ranlib
+CP=cp
RM_F=/bin/rm -f
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
@@ -54,7 +55,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index 62279b7..43f8a84 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -12,6 +12,8 @@
LD=tcc
LIB=tlib
LDFLAGS=-m$(MODEL) -L..\zlib
+CP=copy
+
O=.obj
E=.exe
@@ -27,7 +29,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+ $(CP) $< $@
pngtest: pngtest$(E)
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index b26c4ac..4b9c7d7 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -9,9 +9,9 @@
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# 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
LD = link
AR = lib
@@ -19,6 +19,7 @@
CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3
LDFLAGS = -nologo
ARFLAGS = -nologo
+CP = copy
RM = del
# File extensions
@@ -38,7 +39,7 @@
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts\pnglibconf.h.prebuilt
- copy scripts\pnglibconf.h.prebuilt $@
+ $(CP) $< $@
png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 29b1add..acb7658 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.11beta02 - March 17, 2014 */
+/* Libpng version 1.6.11beta02 - March 22, 2014 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
diff --git a/scripts/symbols.dfn b/scripts/symbols.dfn
index 6f52918..1d69796 100644
--- a/scripts/symbols.dfn
+++ b/scripts/symbols.dfn
@@ -11,12 +11,18 @@
/* NOTE: making 'symbols.chk' checks both that the exported
* symbols in the library don't change and (implicitly) that
- * 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.
+ * 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.
*/
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
+ PNG_DFN "@" name "@ @@" ordinal "@"
+#define PNG_REMOVED(ordinal, type, name, args, attributes)\
+ PNG_DFN "; @" name "@ @@" ordinal "@"
+#define PNG_EXPORT_LAST_ORDINAL(ordinal)\
+
+#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" name "@ @@" ordinal "@"
#define PNG_REMOVED(ordinal, type, name, args, attributes)\
PNG_DFN "; @" name "@ @@" ordinal "@"
