Imported from libpng-1.0.4-pre2.tar
diff --git a/scripts/makefile.aco b/scripts/makefile.acorn
similarity index 100%
rename from scripts/makefile.aco
rename to scripts/makefile.acorn
diff --git a/scripts/makefile.ama b/scripts/makefile.amiga
similarity index 100%
rename from scripts/makefile.ama
rename to scripts/makefile.amiga
diff --git a/scripts/makefile.atr b/scripts/makefile.atari
similarity index 100%
rename from scripts/makefile.atr
rename to scripts/makefile.atari
diff --git a/scripts/makefile.beo b/scripts/makefile.beos
similarity index 98%
rename from scripts/makefile.beo
rename to scripts/makefile.beos
index 8265012..bc7be4a 100644
--- a/scripts/makefile.beo
+++ b/scripts/makefile.beos
@@ -11,7 +11,7 @@
ZLIBINC=/usr/local/include
ALIGN=
-# For I-386:
+# For i386:
# ALIGN=-malign-loops=2 -malign-functions=2
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
@@ -31,7 +31,7 @@
# read libpng.txt or png.h to see why PNGMAJ is 2. You should not
# have to change it.
PNGMAJ = 2
-PNGMIN = 1.0.3
+PNGMIN = 1.0.4
PNGVER = $(PNGMAJ).$(PNGMIN)
# where make install puts libpng.a, libpng.so*, and png.h
diff --git a/scripts/makefile.bor b/scripts/makefile.borland
similarity index 100%
rename from scripts/makefile.bor
rename to scripts/makefile.borland
diff --git a/scripts/makefile.hux b/scripts/makefile.hpux
similarity index 100%
rename from scripts/makefile.hux
rename to scripts/makefile.hpux
diff --git a/scripts/makefile.lnx b/scripts/makefile.linux
similarity index 89%
rename from scripts/makefile.lnx
rename to scripts/makefile.linux
index 95564b6..4201201 100644
--- a/scripts/makefile.lnx
+++ b/scripts/makefile.linux
@@ -1,11 +1,11 @@
# makefile for libpng on Linux ELF with gcc
# Copyright (C) 1996, 1997 Andreas Dilger
-# Copyright (C) 1998 Greg Roelofs
+# Copyright (C) 1998, 1999 Greg Roelofs
# For conditions of distribution and use, see copyright notice in png.h
CC=gcc
-# where make install puts libpng.a, libpng.so*, and png.h
+# where "make install" puts libpng.a, libpng.so*, png.h and pngconf.h
prefix=/usr/local
# Where the zlib library and include files are located
@@ -15,7 +15,7 @@
ZLIBINC=../zlib
ALIGN=
-# For I-386:
+# for i386:
#ALIGN=-malign-loops=2 -malign-functions=2
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
@@ -56,10 +56,10 @@
$(RANLIB) $@
libpng.so: libpng.so.$(PNGMAJ)
- ln -f -s libpng.so.$(PNGMAJ) libpng.so
+ ln -sf libpng.so.$(PNGMAJ) libpng.so
libpng.so.$(PNGMAJ): libpng.so.$(PNGVER)
- ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ)
+ ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ)
libpng.so.$(PNGVER): $(OBJSDLL)
$(CC) -shared -Wl,-soname,libpng.so.$(PNGMAJ) -o libpng.so.$(PNGVER) \
@@ -78,8 +78,8 @@
cp libpng.a libpng.so.$(PNGVER) $(LIBPATH)
chmod 755 $(LIBPATH)/libpng.so.$(PNGVER)
-@/bin/rm -f $(LIBPATH)/libpng.so.$(PNGMAJ) $(LIBPATH)/libpng.so
- (cd $(LIBPATH); ln -f -s libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \
- ln -f -s libpng.so.$(PNGMAJ) libpng.so)
+ (cd $(LIBPATH); ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \
+ ln -sf libpng.so.$(PNGMAJ) libpng.so)
clean:
/bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png
diff --git a/scripts/makefile.mip b/scripts/makefile.mips
similarity index 100%
rename from scripts/makefile.mip
rename to scripts/makefile.mips
diff --git a/scripts/makefile.s2x b/scripts/makefile.solaris
similarity index 100%
rename from scripts/makefile.s2x
rename to scripts/makefile.solaris
diff --git a/scripts/makefile.sun b/scripts/makefile.sunos
similarity index 100%
rename from scripts/makefile.sun
rename to scripts/makefile.sunos
diff --git a/scripts/makefile.tc3 b/scripts/makefile.turboc3
similarity index 100%
rename from scripts/makefile.tc3
rename to scripts/makefile.turboc3
diff --git a/scripts/makefile.wat b/scripts/makefile.watcom
similarity index 100%
rename from scripts/makefile.wat
rename to scripts/makefile.watcom
diff --git a/scripts/makefile.w32 b/scripts/makefile.win32vc
similarity index 100%
rename from scripts/makefile.w32
rename to scripts/makefile.win32vc
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 2c8eaa4..94e859a 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -3,8 +3,8 @@
interface
const
- PNG_LIBPNG_VER_STRING = '1.0.3b';
- PNG_LIBPNG_VER = 10001;
+ PNG_LIBPNG_VER_STRING = '1.0.4';
+ PNG_LIBPNG_VER = 10004;
type
png_uint_32 = Cardinal;
