[libpng16] Eliminated use of "$<" when copying $PNGLIBCONF_H_PREBUILT in
makefiles. This does not work on some versions of make; bug introduced in
libpng version 1.6.11.
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index d0aa481..b5dbd49 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -49,7 +49,7 @@
$(OBJS): pngpriv.h png.h pngconf.h pnglibconf.h pnginfo.h pngstruct.h pngdebug.h
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $< $@
+ cp $(PNGLIBCONF_H_PREBUILT) $@
pngtest.ttp: pngtest.o $(LBR)
$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index cefbef0..d488a54 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -117,7 +117,7 @@
## Minor Targets
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
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 edac365..01346f1 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -87,7 +87,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index c4eed60..a01f738 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -117,7 +117,7 @@
# try !include scripts\pnglibconf.mak for more options
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng: $(LIBNAME)
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index fd6adff..fdc744d 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -84,7 +84,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 54cbcac..8566a02 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -72,7 +72,7 @@
all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index e21546d..e59c432 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -36,7 +36,7 @@
all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
ar rc $@ $(OBJS)
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index c008435..cad1a5a 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -60,7 +60,7 @@
./pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $< $@
+ cp $(PNGLIBCONF_H_PREBUILT) $@
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock:
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index 8811a28..ba92d15 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -43,7 +43,7 @@
all: static
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 2883d65..36f91e4 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -89,7 +89,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 2a4a0b3..0797107 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -87,7 +87,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index 2f5a03c..89b1196 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -51,7 +51,7 @@
all: libpng$(A) pngtest$(E)
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng$(A): $(OBJS)
$(AR) -out:$@ $(OBJS)
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 5e752ae..4187261 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -51,7 +51,7 @@
all: test
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
$(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 38a67cb..d8de064 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -50,7 +50,7 @@
all: ansi2knr libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
# general rule to allow ansi2knr to work
.c.o:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 12598fa..a595cf8 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -97,7 +97,7 @@
all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index d171dc4..5633608 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -46,7 +46,7 @@
all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
ar rc $@ $(OBJS)
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index c380644..539d62e 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -34,7 +34,7 @@
all: libpng.lib
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
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
diff --git a/scripts/makefile.msys b/scripts/makefile.msys
index 5cc3b08..a10b79a 100644
--- a/scripts/makefile.msys
+++ b/scripts/makefile.msys
@@ -87,7 +87,7 @@
all: static shared
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index bd03968..be6066e 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -42,7 +42,7 @@
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $< $@
+ cp $(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 1bee02b..e3b39bb 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -42,7 +42,7 @@
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $< $@
+ cp $(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 f80baf2..38bb2d5 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -39,7 +39,7 @@
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $< $@
+ cp $(PNGLIBCONF_H_PREBUILT) $@
pngtest.o: pngtest.c
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 6e5457d..b9c7c40 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -83,7 +83,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index f8721c9..a0d051d 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -86,7 +86,7 @@
all: libpng.a pngtest shared libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 561ce83..7df0902 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -89,7 +89,7 @@
all: libpng.a pngtest shared libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 9102e69..ba9308c 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -93,7 +93,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 879e6a4..8a450d3 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -89,7 +89,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 509d5a3..b6d2437 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -88,7 +88,7 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index df661bf..efe308c 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -58,7 +58,7 @@
all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index c921f84..c917a08 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -32,7 +32,7 @@
all: libpng$(MODEL).lib pngtest$(E)
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $< $@
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
pngtest: pngtest$(E)
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 794e640..6219692 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -42,7 +42,7 @@
all: libpng.lib
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
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)