aboutsummaryrefslogtreecommitdiff
path: root/zlib/amiga
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2012-03-02 17:15:20 +0000
committerMatthias Klose <doko@gcc.gnu.org>2012-03-02 17:15:20 +0000
commit43743d63b3e6026088cb5bacca87ccc08acd97cd (patch)
tree08301625dedcb8a8837a464f46ca0292c54c5ecb /zlib/amiga
parent5d216c70d980e3169b42e9734cf4bea1648ff8f0 (diff)
downloadgcc-43743d63b3e6026088cb5bacca87ccc08acd97cd.zip
gcc-43743d63b3e6026088cb5bacca87ccc08acd97cd.tar.gz
gcc-43743d63b3e6026088cb5bacca87ccc08acd97cd.tar.bz2
2012-03-02 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.5; merged local changes. From-SVN: r184805
Diffstat (limited to 'zlib/amiga')
-rw-r--r--zlib/amiga/Makefile.pup9
-rw-r--r--zlib/amiga/Makefile.sas9
2 files changed, 12 insertions, 6 deletions
diff --git a/zlib/amiga/Makefile.pup b/zlib/amiga/Makefile.pup
index 3f7e155..8940c12 100644
--- a/zlib/amiga/Makefile.pup
+++ b/zlib/amiga/Makefile.pup
@@ -14,8 +14,8 @@ LDFLAGS = -o
LDLIBS = LIB:scppc.a LIB:end.o
RM = delete quiet
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
- zutil.o inflate.o infback.o inftrees.o inffast.o
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+ uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
TEST_OBJS = example.o minigzip.o
@@ -55,7 +55,10 @@ compress.o: zlib.h zconf.h
crc32.o: crc32.h zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
example.o: zlib.h zconf.h
-gzio.o: zutil.h zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
diff --git a/zlib/amiga/Makefile.sas b/zlib/amiga/Makefile.sas
index 296ef48..749e291 100644
--- a/zlib/amiga/Makefile.sas
+++ b/zlib/amiga/Makefile.sas
@@ -13,8 +13,8 @@ SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
DEF=POSTINC
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
- zutil.o inflate.o infback.o inftrees.o inffast.o
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
+ uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
TEST_OBJS = example.o minigzip.o
@@ -54,7 +54,10 @@ compress.o: zlib.h zconf.h
crc32.o: crc32.h zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
example.o: zlib.h zconf.h
-gzio.o: zutil.h zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h