| commit | 00fb66d0b1488e4ca655906f82b27eb2ccc3e309 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 10 17:23:47 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu May 10 17:28:12 2012 -0700 |
| tree | ab1a1f230a9e066738e21a4ac8b2a84575a117d9 | |
| parent | 5dd6e2841de742f8076508b70be639f79da203d0 [diff] |
Separate the Android build stuff from the upstream zlib stuff. Another step towards a script that does the zlib upgrades for us... Change-Id: I940b5b4e79d2a8daf7a47129bbea7bdaffd4140c
diff --git a/Android.mk b/Android.mk index f96a36f..e02b488 100644 --- a/Android.mk +++ b/Android.mk
@@ -6,21 +6,21 @@ LOCAL_ARM_MODE := arm zlib_files := \ - adler32.c \ - compress.c \ - crc32.c \ - deflate.c \ - gzclose.c \ - gzlib.c \ - gzread.c \ - gzwrite.c \ - infback.c \ - inflate.c \ - inftrees.c \ - inffast.c \ - trees.c \ - uncompr.c \ - zutil.c + src/adler32.c \ + src/compress.c \ + src/crc32.c \ + src/deflate.c \ + src/gzclose.c \ + src/gzlib.c \ + src/gzread.c \ + src/gzwrite.c \ + src/infback.c \ + src/inflate.c \ + src/inftrees.c \ + src/inffast.c \ + src/trees.c \ + src/uncompr.c \ + src/zutil.c LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional @@ -92,7 +92,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - test/minigzip.c + src/test/minigzip.c LOCAL_MODULE:= gzip @@ -103,7 +103,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - test/minigzip.c + src/test/minigzip.c LOCAL_MODULE:= minigzip
diff --git a/CMakeLists.txt b/src/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to src/CMakeLists.txt
diff --git a/ChangeLog b/src/ChangeLog similarity index 100% rename from ChangeLog rename to src/ChangeLog
diff --git a/FAQ b/src/FAQ similarity index 100% rename from FAQ rename to src/FAQ
diff --git a/INDEX b/src/INDEX similarity index 100% rename from INDEX rename to src/INDEX
diff --git a/Makefile b/src/Makefile similarity index 100% rename from Makefile rename to src/Makefile
diff --git a/Makefile.in b/src/Makefile.in similarity index 100% rename from Makefile.in rename to src/Makefile.in
diff --git a/README b/src/README similarity index 100% rename from README rename to src/README
diff --git a/adler32.c b/src/adler32.c similarity index 100% rename from adler32.c rename to src/adler32.c
diff --git a/amiga/Makefile.pup b/src/amiga/Makefile.pup similarity index 100% rename from amiga/Makefile.pup rename to src/amiga/Makefile.pup
diff --git a/amiga/Makefile.sas b/src/amiga/Makefile.sas similarity index 100% rename from amiga/Makefile.sas rename to src/amiga/Makefile.sas
diff --git a/as400/bndsrc b/src/as400/bndsrc similarity index 100% rename from as400/bndsrc rename to src/as400/bndsrc
diff --git a/as400/compile.clp b/src/as400/compile.clp similarity index 100% rename from as400/compile.clp rename to src/as400/compile.clp
diff --git a/as400/readme.txt b/src/as400/readme.txt similarity index 100% rename from as400/readme.txt rename to src/as400/readme.txt
diff --git a/as400/zlib.inc b/src/as400/zlib.inc similarity index 100% rename from as400/zlib.inc rename to src/as400/zlib.inc
diff --git a/compress.c b/src/compress.c similarity index 100% rename from compress.c rename to src/compress.c
diff --git a/configure b/src/configure similarity index 100% rename from configure rename to src/configure
diff --git a/contrib/README.contrib b/src/contrib/README.contrib similarity index 100% rename from contrib/README.contrib rename to src/contrib/README.contrib
diff --git a/contrib/ada/buffer_demo.adb b/src/contrib/ada/buffer_demo.adb similarity index 100% rename from contrib/ada/buffer_demo.adb rename to src/contrib/ada/buffer_demo.adb
diff --git a/contrib/ada/mtest.adb b/src/contrib/ada/mtest.adb similarity index 100% rename from contrib/ada/mtest.adb rename to src/contrib/ada/mtest.adb
diff --git a/contrib/ada/read.adb b/src/contrib/ada/read.adb similarity index 100% rename from contrib/ada/read.adb rename to src/contrib/ada/read.adb
diff --git a/contrib/ada/readme.txt b/src/contrib/ada/readme.txt similarity index 100% rename from contrib/ada/readme.txt rename to src/contrib/ada/readme.txt
diff --git a/contrib/ada/test.adb b/src/contrib/ada/test.adb similarity index 100% rename from contrib/ada/test.adb rename to src/contrib/ada/test.adb
diff --git a/contrib/ada/zlib-streams.adb b/src/contrib/ada/zlib-streams.adb similarity index 100% rename from contrib/ada/zlib-streams.adb rename to src/contrib/ada/zlib-streams.adb
diff --git a/contrib/ada/zlib-streams.ads b/src/contrib/ada/zlib-streams.ads similarity index 100% rename from contrib/ada/zlib-streams.ads rename to src/contrib/ada/zlib-streams.ads
diff --git a/contrib/ada/zlib-thin.adb b/src/contrib/ada/zlib-thin.adb similarity index 100% rename from contrib/ada/zlib-thin.adb rename to src/contrib/ada/zlib-thin.adb
diff --git a/contrib/ada/zlib-thin.ads b/src/contrib/ada/zlib-thin.ads similarity index 100% rename from contrib/ada/zlib-thin.ads rename to src/contrib/ada/zlib-thin.ads
diff --git a/contrib/ada/zlib.adb b/src/contrib/ada/zlib.adb similarity index 100% rename from contrib/ada/zlib.adb rename to src/contrib/ada/zlib.adb
diff --git a/contrib/ada/zlib.ads b/src/contrib/ada/zlib.ads similarity index 100% rename from contrib/ada/zlib.ads rename to src/contrib/ada/zlib.ads
diff --git a/contrib/ada/zlib.gpr b/src/contrib/ada/zlib.gpr similarity index 100% rename from contrib/ada/zlib.gpr rename to src/contrib/ada/zlib.gpr
diff --git a/contrib/amd64/amd64-match.S b/src/contrib/amd64/amd64-match.S similarity index 100% rename from contrib/amd64/amd64-match.S rename to src/contrib/amd64/amd64-match.S
diff --git a/contrib/asm686/README.686 b/src/contrib/asm686/README.686 similarity index 100% rename from contrib/asm686/README.686 rename to src/contrib/asm686/README.686
diff --git a/contrib/asm686/match.S b/src/contrib/asm686/match.S similarity index 100% rename from contrib/asm686/match.S rename to src/contrib/asm686/match.S
diff --git a/contrib/blast/Makefile b/src/contrib/blast/Makefile similarity index 100% rename from contrib/blast/Makefile rename to src/contrib/blast/Makefile
diff --git a/contrib/blast/README b/src/contrib/blast/README similarity index 100% rename from contrib/blast/README rename to src/contrib/blast/README
diff --git a/contrib/blast/blast.c b/src/contrib/blast/blast.c similarity index 100% rename from contrib/blast/blast.c rename to src/contrib/blast/blast.c
diff --git a/contrib/blast/blast.h b/src/contrib/blast/blast.h similarity index 100% rename from contrib/blast/blast.h rename to src/contrib/blast/blast.h
diff --git a/contrib/blast/test.pk b/src/contrib/blast/test.pk similarity index 100% rename from contrib/blast/test.pk rename to src/contrib/blast/test.pk Binary files differ
diff --git a/contrib/blast/test.txt b/src/contrib/blast/test.txt similarity index 100% rename from contrib/blast/test.txt rename to src/contrib/blast/test.txt
diff --git a/contrib/delphi/ZLib.pas b/src/contrib/delphi/ZLib.pas similarity index 100% rename from contrib/delphi/ZLib.pas rename to src/contrib/delphi/ZLib.pas
diff --git a/contrib/delphi/ZLibConst.pas b/src/contrib/delphi/ZLibConst.pas similarity index 100% rename from contrib/delphi/ZLibConst.pas rename to src/contrib/delphi/ZLibConst.pas
diff --git a/contrib/delphi/readme.txt b/src/contrib/delphi/readme.txt similarity index 100% rename from contrib/delphi/readme.txt rename to src/contrib/delphi/readme.txt
diff --git a/contrib/delphi/zlibd32.mak b/src/contrib/delphi/zlibd32.mak similarity index 100% rename from contrib/delphi/zlibd32.mak rename to src/contrib/delphi/zlibd32.mak
diff --git a/contrib/dotzlib/DotZLib.build b/src/contrib/dotzlib/DotZLib.build similarity index 100% rename from contrib/dotzlib/DotZLib.build rename to src/contrib/dotzlib/DotZLib.build
diff --git a/contrib/dotzlib/DotZLib.chm b/src/contrib/dotzlib/DotZLib.chm similarity index 100% rename from contrib/dotzlib/DotZLib.chm rename to src/contrib/dotzlib/DotZLib.chm Binary files differ
diff --git a/contrib/dotzlib/DotZLib.sln b/src/contrib/dotzlib/DotZLib.sln similarity index 100% rename from contrib/dotzlib/DotZLib.sln rename to src/contrib/dotzlib/DotZLib.sln
diff --git a/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/src/contrib/dotzlib/DotZLib/AssemblyInfo.cs similarity index 100% rename from contrib/dotzlib/DotZLib/AssemblyInfo.cs rename to src/contrib/dotzlib/DotZLib/AssemblyInfo.cs
diff --git a/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/src/contrib/dotzlib/DotZLib/ChecksumImpl.cs similarity index 100% rename from contrib/dotzlib/DotZLib/ChecksumImpl.cs rename to src/contrib/dotzlib/DotZLib/ChecksumImpl.cs
diff --git a/contrib/dotzlib/DotZLib/CircularBuffer.cs b/src/contrib/dotzlib/DotZLib/CircularBuffer.cs similarity index 100% rename from contrib/dotzlib/DotZLib/CircularBuffer.cs rename to src/contrib/dotzlib/DotZLib/CircularBuffer.cs
diff --git a/contrib/dotzlib/DotZLib/CodecBase.cs b/src/contrib/dotzlib/DotZLib/CodecBase.cs similarity index 100% rename from contrib/dotzlib/DotZLib/CodecBase.cs rename to src/contrib/dotzlib/DotZLib/CodecBase.cs
diff --git a/contrib/dotzlib/DotZLib/Deflater.cs b/src/contrib/dotzlib/DotZLib/Deflater.cs similarity index 100% rename from contrib/dotzlib/DotZLib/Deflater.cs rename to src/contrib/dotzlib/DotZLib/Deflater.cs
diff --git a/contrib/dotzlib/DotZLib/DotZLib.cs b/src/contrib/dotzlib/DotZLib/DotZLib.cs similarity index 100% rename from contrib/dotzlib/DotZLib/DotZLib.cs rename to src/contrib/dotzlib/DotZLib/DotZLib.cs
diff --git a/contrib/dotzlib/DotZLib/DotZLib.csproj b/src/contrib/dotzlib/DotZLib/DotZLib.csproj similarity index 100% rename from contrib/dotzlib/DotZLib/DotZLib.csproj rename to src/contrib/dotzlib/DotZLib/DotZLib.csproj
diff --git a/contrib/dotzlib/DotZLib/GZipStream.cs b/src/contrib/dotzlib/DotZLib/GZipStream.cs similarity index 100% rename from contrib/dotzlib/DotZLib/GZipStream.cs rename to src/contrib/dotzlib/DotZLib/GZipStream.cs
diff --git a/contrib/dotzlib/DotZLib/Inflater.cs b/src/contrib/dotzlib/DotZLib/Inflater.cs similarity index 100% rename from contrib/dotzlib/DotZLib/Inflater.cs rename to src/contrib/dotzlib/DotZLib/Inflater.cs
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/src/contrib/dotzlib/DotZLib/UnitTests.cs similarity index 100% rename from contrib/dotzlib/DotZLib/UnitTests.cs rename to src/contrib/dotzlib/DotZLib/UnitTests.cs
diff --git a/contrib/dotzlib/LICENSE_1_0.txt b/src/contrib/dotzlib/LICENSE_1_0.txt similarity index 100% rename from contrib/dotzlib/LICENSE_1_0.txt rename to src/contrib/dotzlib/LICENSE_1_0.txt
diff --git a/contrib/dotzlib/readme.txt b/src/contrib/dotzlib/readme.txt similarity index 100% rename from contrib/dotzlib/readme.txt rename to src/contrib/dotzlib/readme.txt
diff --git a/contrib/gcc_gvmat64/gvmat64.S b/src/contrib/gcc_gvmat64/gvmat64.S similarity index 100% rename from contrib/gcc_gvmat64/gvmat64.S rename to src/contrib/gcc_gvmat64/gvmat64.S
diff --git a/contrib/infback9/README b/src/contrib/infback9/README similarity index 100% rename from contrib/infback9/README rename to src/contrib/infback9/README
diff --git a/contrib/infback9/infback9.c b/src/contrib/infback9/infback9.c similarity index 100% rename from contrib/infback9/infback9.c rename to src/contrib/infback9/infback9.c
diff --git a/contrib/infback9/infback9.h b/src/contrib/infback9/infback9.h similarity index 100% rename from contrib/infback9/infback9.h rename to src/contrib/infback9/infback9.h
diff --git a/contrib/infback9/inffix9.h b/src/contrib/infback9/inffix9.h similarity index 100% rename from contrib/infback9/inffix9.h rename to src/contrib/infback9/inffix9.h
diff --git a/contrib/infback9/inflate9.h b/src/contrib/infback9/inflate9.h similarity index 100% rename from contrib/infback9/inflate9.h rename to src/contrib/infback9/inflate9.h
diff --git a/contrib/infback9/inftree9.c b/src/contrib/infback9/inftree9.c similarity index 100% rename from contrib/infback9/inftree9.c rename to src/contrib/infback9/inftree9.c
diff --git a/contrib/infback9/inftree9.h b/src/contrib/infback9/inftree9.h similarity index 100% rename from contrib/infback9/inftree9.h rename to src/contrib/infback9/inftree9.h
diff --git a/contrib/inflate86/inffas86.c b/src/contrib/inflate86/inffas86.c similarity index 100% rename from contrib/inflate86/inffas86.c rename to src/contrib/inflate86/inffas86.c
diff --git a/contrib/inflate86/inffast.S b/src/contrib/inflate86/inffast.S similarity index 100% rename from contrib/inflate86/inffast.S rename to src/contrib/inflate86/inffast.S
diff --git a/contrib/iostream/test.cpp b/src/contrib/iostream/test.cpp similarity index 100% rename from contrib/iostream/test.cpp rename to src/contrib/iostream/test.cpp
diff --git a/contrib/iostream/zfstream.cpp b/src/contrib/iostream/zfstream.cpp similarity index 100% rename from contrib/iostream/zfstream.cpp rename to src/contrib/iostream/zfstream.cpp
diff --git a/contrib/iostream/zfstream.h b/src/contrib/iostream/zfstream.h similarity index 100% rename from contrib/iostream/zfstream.h rename to src/contrib/iostream/zfstream.h
diff --git a/contrib/iostream2/zstream.h b/src/contrib/iostream2/zstream.h similarity index 100% rename from contrib/iostream2/zstream.h rename to src/contrib/iostream2/zstream.h
diff --git a/contrib/iostream2/zstream_test.cpp b/src/contrib/iostream2/zstream_test.cpp similarity index 100% rename from contrib/iostream2/zstream_test.cpp rename to src/contrib/iostream2/zstream_test.cpp
diff --git a/contrib/iostream3/README b/src/contrib/iostream3/README similarity index 100% rename from contrib/iostream3/README rename to src/contrib/iostream3/README
diff --git a/contrib/iostream3/TODO b/src/contrib/iostream3/TODO similarity index 100% rename from contrib/iostream3/TODO rename to src/contrib/iostream3/TODO
diff --git a/contrib/iostream3/test.cc b/src/contrib/iostream3/test.cc similarity index 100% rename from contrib/iostream3/test.cc rename to src/contrib/iostream3/test.cc
diff --git a/contrib/iostream3/zfstream.cc b/src/contrib/iostream3/zfstream.cc similarity index 100% rename from contrib/iostream3/zfstream.cc rename to src/contrib/iostream3/zfstream.cc
diff --git a/contrib/iostream3/zfstream.h b/src/contrib/iostream3/zfstream.h similarity index 100% rename from contrib/iostream3/zfstream.h rename to src/contrib/iostream3/zfstream.h
diff --git a/contrib/masmx64/bld_ml64.bat b/src/contrib/masmx64/bld_ml64.bat similarity index 100% rename from contrib/masmx64/bld_ml64.bat rename to src/contrib/masmx64/bld_ml64.bat
diff --git a/contrib/masmx64/gvmat64.asm b/src/contrib/masmx64/gvmat64.asm similarity index 100% rename from contrib/masmx64/gvmat64.asm rename to src/contrib/masmx64/gvmat64.asm
diff --git a/contrib/masmx64/inffas8664.c b/src/contrib/masmx64/inffas8664.c similarity index 100% rename from contrib/masmx64/inffas8664.c rename to src/contrib/masmx64/inffas8664.c
diff --git a/contrib/masmx64/inffasx64.asm b/src/contrib/masmx64/inffasx64.asm similarity index 100% rename from contrib/masmx64/inffasx64.asm rename to src/contrib/masmx64/inffasx64.asm
diff --git a/contrib/masmx64/readme.txt b/src/contrib/masmx64/readme.txt similarity index 100% rename from contrib/masmx64/readme.txt rename to src/contrib/masmx64/readme.txt
diff --git a/contrib/masmx86/bld_ml32.bat b/src/contrib/masmx86/bld_ml32.bat similarity index 100% rename from contrib/masmx86/bld_ml32.bat rename to src/contrib/masmx86/bld_ml32.bat
diff --git a/contrib/masmx86/inffas32.asm b/src/contrib/masmx86/inffas32.asm similarity index 100% rename from contrib/masmx86/inffas32.asm rename to src/contrib/masmx86/inffas32.asm
diff --git a/contrib/masmx86/match686.asm b/src/contrib/masmx86/match686.asm similarity index 100% rename from contrib/masmx86/match686.asm rename to src/contrib/masmx86/match686.asm
diff --git a/contrib/masmx86/readme.txt b/src/contrib/masmx86/readme.txt similarity index 100% rename from contrib/masmx86/readme.txt rename to src/contrib/masmx86/readme.txt
diff --git a/contrib/minizip/Makefile b/src/contrib/minizip/Makefile similarity index 100% rename from contrib/minizip/Makefile rename to src/contrib/minizip/Makefile
diff --git a/contrib/minizip/Makefile.am b/src/contrib/minizip/Makefile.am similarity index 100% rename from contrib/minizip/Makefile.am rename to src/contrib/minizip/Makefile.am
diff --git a/contrib/minizip/MiniZip64_Changes.txt b/src/contrib/minizip/MiniZip64_Changes.txt similarity index 100% rename from contrib/minizip/MiniZip64_Changes.txt rename to src/contrib/minizip/MiniZip64_Changes.txt
diff --git a/contrib/minizip/MiniZip64_info.txt b/src/contrib/minizip/MiniZip64_info.txt similarity index 100% rename from contrib/minizip/MiniZip64_info.txt rename to src/contrib/minizip/MiniZip64_info.txt
diff --git a/contrib/minizip/configure.ac b/src/contrib/minizip/configure.ac similarity index 100% rename from contrib/minizip/configure.ac rename to src/contrib/minizip/configure.ac
diff --git a/contrib/minizip/crypt.h b/src/contrib/minizip/crypt.h similarity index 100% rename from contrib/minizip/crypt.h rename to src/contrib/minizip/crypt.h
diff --git a/contrib/minizip/ioapi.c b/src/contrib/minizip/ioapi.c similarity index 100% rename from contrib/minizip/ioapi.c rename to src/contrib/minizip/ioapi.c
diff --git a/contrib/minizip/ioapi.h b/src/contrib/minizip/ioapi.h similarity index 100% rename from contrib/minizip/ioapi.h rename to src/contrib/minizip/ioapi.h
diff --git a/contrib/minizip/iowin32.c b/src/contrib/minizip/iowin32.c similarity index 100% rename from contrib/minizip/iowin32.c rename to src/contrib/minizip/iowin32.c
diff --git a/contrib/minizip/iowin32.h b/src/contrib/minizip/iowin32.h similarity index 100% rename from contrib/minizip/iowin32.h rename to src/contrib/minizip/iowin32.h
diff --git a/contrib/minizip/make_vms.com b/src/contrib/minizip/make_vms.com similarity index 100% rename from contrib/minizip/make_vms.com rename to src/contrib/minizip/make_vms.com
diff --git a/contrib/minizip/miniunz.c b/src/contrib/minizip/miniunz.c similarity index 100% rename from contrib/minizip/miniunz.c rename to src/contrib/minizip/miniunz.c
diff --git a/contrib/minizip/minizip.c b/src/contrib/minizip/minizip.c similarity index 100% rename from contrib/minizip/minizip.c rename to src/contrib/minizip/minizip.c
diff --git a/contrib/minizip/minizip.pc.in b/src/contrib/minizip/minizip.pc.in similarity index 100% rename from contrib/minizip/minizip.pc.in rename to src/contrib/minizip/minizip.pc.in
diff --git a/contrib/minizip/mztools.c b/src/contrib/minizip/mztools.c similarity index 100% rename from contrib/minizip/mztools.c rename to src/contrib/minizip/mztools.c
diff --git a/contrib/minizip/mztools.h b/src/contrib/minizip/mztools.h similarity index 100% rename from contrib/minizip/mztools.h rename to src/contrib/minizip/mztools.h
diff --git a/contrib/minizip/unzip.c b/src/contrib/minizip/unzip.c similarity index 100% rename from contrib/minizip/unzip.c rename to src/contrib/minizip/unzip.c
diff --git a/contrib/minizip/unzip.h b/src/contrib/minizip/unzip.h similarity index 100% rename from contrib/minizip/unzip.h rename to src/contrib/minizip/unzip.h
diff --git a/contrib/minizip/zip.c b/src/contrib/minizip/zip.c similarity index 100% rename from contrib/minizip/zip.c rename to src/contrib/minizip/zip.c
diff --git a/contrib/minizip/zip.h b/src/contrib/minizip/zip.h similarity index 100% rename from contrib/minizip/zip.h rename to src/contrib/minizip/zip.h
diff --git a/contrib/pascal/example.pas b/src/contrib/pascal/example.pas similarity index 100% rename from contrib/pascal/example.pas rename to src/contrib/pascal/example.pas
diff --git a/contrib/pascal/readme.txt b/src/contrib/pascal/readme.txt similarity index 100% rename from contrib/pascal/readme.txt rename to src/contrib/pascal/readme.txt
diff --git a/contrib/pascal/zlibd32.mak b/src/contrib/pascal/zlibd32.mak similarity index 100% rename from contrib/pascal/zlibd32.mak rename to src/contrib/pascal/zlibd32.mak
diff --git a/contrib/pascal/zlibpas.pas b/src/contrib/pascal/zlibpas.pas similarity index 100% rename from contrib/pascal/zlibpas.pas rename to src/contrib/pascal/zlibpas.pas
diff --git a/contrib/puff/Makefile b/src/contrib/puff/Makefile similarity index 100% rename from contrib/puff/Makefile rename to src/contrib/puff/Makefile
diff --git a/contrib/puff/README b/src/contrib/puff/README similarity index 100% rename from contrib/puff/README rename to src/contrib/puff/README
diff --git a/contrib/puff/puff.c b/src/contrib/puff/puff.c similarity index 100% rename from contrib/puff/puff.c rename to src/contrib/puff/puff.c
diff --git a/contrib/puff/puff.h b/src/contrib/puff/puff.h similarity index 100% rename from contrib/puff/puff.h rename to src/contrib/puff/puff.h
diff --git a/contrib/puff/pufftest.c b/src/contrib/puff/pufftest.c similarity index 100% rename from contrib/puff/pufftest.c rename to src/contrib/puff/pufftest.c
diff --git a/contrib/puff/zeros.raw b/src/contrib/puff/zeros.raw similarity index 100% rename from contrib/puff/zeros.raw rename to src/contrib/puff/zeros.raw Binary files differ
diff --git a/contrib/testzlib/testzlib.c b/src/contrib/testzlib/testzlib.c similarity index 100% rename from contrib/testzlib/testzlib.c rename to src/contrib/testzlib/testzlib.c
diff --git a/contrib/testzlib/testzlib.txt b/src/contrib/testzlib/testzlib.txt similarity index 100% rename from contrib/testzlib/testzlib.txt rename to src/contrib/testzlib/testzlib.txt
diff --git a/contrib/untgz/Makefile b/src/contrib/untgz/Makefile similarity index 100% rename from contrib/untgz/Makefile rename to src/contrib/untgz/Makefile
diff --git a/contrib/untgz/Makefile.msc b/src/contrib/untgz/Makefile.msc similarity index 100% rename from contrib/untgz/Makefile.msc rename to src/contrib/untgz/Makefile.msc
diff --git a/contrib/untgz/untgz.c b/src/contrib/untgz/untgz.c similarity index 100% rename from contrib/untgz/untgz.c rename to src/contrib/untgz/untgz.c
diff --git a/contrib/vstudio/readme.txt b/src/contrib/vstudio/readme.txt similarity index 100% rename from contrib/vstudio/readme.txt rename to src/contrib/vstudio/readme.txt
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj b/src/contrib/vstudio/vc10/miniunz.vcxproj similarity index 100% rename from contrib/vstudio/vc10/miniunz.vcxproj rename to src/contrib/vstudio/vc10/miniunz.vcxproj
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.filters b/src/contrib/vstudio/vc10/miniunz.vcxproj.filters similarity index 100% rename from contrib/vstudio/vc10/miniunz.vcxproj.filters rename to src/contrib/vstudio/vc10/miniunz.vcxproj.filters
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.user b/src/contrib/vstudio/vc10/miniunz.vcxproj.user similarity index 100% rename from contrib/vstudio/vc10/miniunz.vcxproj.user rename to src/contrib/vstudio/vc10/miniunz.vcxproj.user
diff --git a/contrib/vstudio/vc10/minizip.vcxproj b/src/contrib/vstudio/vc10/minizip.vcxproj similarity index 100% rename from contrib/vstudio/vc10/minizip.vcxproj rename to src/contrib/vstudio/vc10/minizip.vcxproj
diff --git a/contrib/vstudio/vc10/minizip.vcxproj.filters b/src/contrib/vstudio/vc10/minizip.vcxproj.filters similarity index 100% rename from contrib/vstudio/vc10/minizip.vcxproj.filters rename to src/contrib/vstudio/vc10/minizip.vcxproj.filters
diff --git a/contrib/vstudio/vc10/minizip.vcxproj.user b/src/contrib/vstudio/vc10/minizip.vcxproj.user similarity index 100% rename from contrib/vstudio/vc10/minizip.vcxproj.user rename to src/contrib/vstudio/vc10/minizip.vcxproj.user
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj b/src/contrib/vstudio/vc10/testzlib.vcxproj similarity index 100% rename from contrib/vstudio/vc10/testzlib.vcxproj rename to src/contrib/vstudio/vc10/testzlib.vcxproj
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.filters b/src/contrib/vstudio/vc10/testzlib.vcxproj.filters similarity index 100% rename from contrib/vstudio/vc10/testzlib.vcxproj.filters rename to src/contrib/vstudio/vc10/testzlib.vcxproj.filters
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.user b/src/contrib/vstudio/vc10/testzlib.vcxproj.user similarity index 100% rename from contrib/vstudio/vc10/testzlib.vcxproj.user rename to src/contrib/vstudio/vc10/testzlib.vcxproj.user
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj b/src/contrib/vstudio/vc10/testzlibdll.vcxproj similarity index 100% rename from contrib/vstudio/vc10/testzlibdll.vcxproj rename to src/contrib/vstudio/vc10/testzlibdll.vcxproj
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/src/contrib/vstudio/vc10/testzlibdll.vcxproj.filters similarity index 100% rename from contrib/vstudio/vc10/testzlibdll.vcxproj.filters rename to src/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.user b/src/contrib/vstudio/vc10/testzlibdll.vcxproj.user similarity index 100% rename from contrib/vstudio/vc10/testzlibdll.vcxproj.user rename to src/contrib/vstudio/vc10/testzlibdll.vcxproj.user
diff --git a/contrib/vstudio/vc10/zlib.rc b/src/contrib/vstudio/vc10/zlib.rc similarity index 100% rename from contrib/vstudio/vc10/zlib.rc rename to src/contrib/vstudio/vc10/zlib.rc
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/src/contrib/vstudio/vc10/zlibstat.vcxproj similarity index 100% rename from contrib/vstudio/vc10/zlibstat.vcxproj rename to src/contrib/vstudio/vc10/zlibstat.vcxproj
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/src/contrib/vstudio/vc10/zlibstat.vcxproj.filters similarity index 100% rename from contrib/vstudio/vc10/zlibstat.vcxproj.filters rename to src/contrib/vstudio/vc10/zlibstat.vcxproj.filters
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.user b/src/contrib/vstudio/vc10/zlibstat.vcxproj.user similarity index 100% rename from contrib/vstudio/vc10/zlibstat.vcxproj.user rename to src/contrib/vstudio/vc10/zlibstat.vcxproj.user
diff --git a/contrib/vstudio/vc10/zlibvc.def b/src/contrib/vstudio/vc10/zlibvc.def similarity index 100% rename from contrib/vstudio/vc10/zlibvc.def rename to src/contrib/vstudio/vc10/zlibvc.def
diff --git a/contrib/vstudio/vc10/zlibvc.sln b/src/contrib/vstudio/vc10/zlibvc.sln similarity index 100% rename from contrib/vstudio/vc10/zlibvc.sln rename to src/contrib/vstudio/vc10/zlibvc.sln
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/src/contrib/vstudio/vc10/zlibvc.vcxproj similarity index 100% rename from contrib/vstudio/vc10/zlibvc.vcxproj rename to src/contrib/vstudio/vc10/zlibvc.vcxproj
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/src/contrib/vstudio/vc10/zlibvc.vcxproj.filters similarity index 100% rename from contrib/vstudio/vc10/zlibvc.vcxproj.filters rename to src/contrib/vstudio/vc10/zlibvc.vcxproj.filters
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.user b/src/contrib/vstudio/vc10/zlibvc.vcxproj.user similarity index 100% rename from contrib/vstudio/vc10/zlibvc.vcxproj.user rename to src/contrib/vstudio/vc10/zlibvc.vcxproj.user
diff --git a/contrib/vstudio/vc9/miniunz.vcproj b/src/contrib/vstudio/vc9/miniunz.vcproj similarity index 100% rename from contrib/vstudio/vc9/miniunz.vcproj rename to src/contrib/vstudio/vc9/miniunz.vcproj
diff --git a/contrib/vstudio/vc9/minizip.vcproj b/src/contrib/vstudio/vc9/minizip.vcproj similarity index 100% rename from contrib/vstudio/vc9/minizip.vcproj rename to src/contrib/vstudio/vc9/minizip.vcproj
diff --git a/contrib/vstudio/vc9/testzlib.vcproj b/src/contrib/vstudio/vc9/testzlib.vcproj similarity index 100% rename from contrib/vstudio/vc9/testzlib.vcproj rename to src/contrib/vstudio/vc9/testzlib.vcproj
diff --git a/contrib/vstudio/vc9/testzlibdll.vcproj b/src/contrib/vstudio/vc9/testzlibdll.vcproj similarity index 100% rename from contrib/vstudio/vc9/testzlibdll.vcproj rename to src/contrib/vstudio/vc9/testzlibdll.vcproj
diff --git a/contrib/vstudio/vc9/zlib.rc b/src/contrib/vstudio/vc9/zlib.rc similarity index 100% rename from contrib/vstudio/vc9/zlib.rc rename to src/contrib/vstudio/vc9/zlib.rc
diff --git a/contrib/vstudio/vc9/zlibstat.vcproj b/src/contrib/vstudio/vc9/zlibstat.vcproj similarity index 100% rename from contrib/vstudio/vc9/zlibstat.vcproj rename to src/contrib/vstudio/vc9/zlibstat.vcproj
diff --git a/contrib/vstudio/vc9/zlibvc.def b/src/contrib/vstudio/vc9/zlibvc.def similarity index 100% rename from contrib/vstudio/vc9/zlibvc.def rename to src/contrib/vstudio/vc9/zlibvc.def
diff --git a/contrib/vstudio/vc9/zlibvc.sln b/src/contrib/vstudio/vc9/zlibvc.sln similarity index 100% rename from contrib/vstudio/vc9/zlibvc.sln rename to src/contrib/vstudio/vc9/zlibvc.sln
diff --git a/contrib/vstudio/vc9/zlibvc.vcproj b/src/contrib/vstudio/vc9/zlibvc.vcproj similarity index 100% rename from contrib/vstudio/vc9/zlibvc.vcproj rename to src/contrib/vstudio/vc9/zlibvc.vcproj
diff --git a/crc32.c b/src/crc32.c similarity index 100% rename from crc32.c rename to src/crc32.c
diff --git a/crc32.h b/src/crc32.h similarity index 100% rename from crc32.h rename to src/crc32.h
diff --git a/deflate.c b/src/deflate.c similarity index 100% rename from deflate.c rename to src/deflate.c
diff --git a/deflate.h b/src/deflate.h similarity index 100% rename from deflate.h rename to src/deflate.h
diff --git a/doc/algorithm.txt b/src/doc/algorithm.txt similarity index 100% rename from doc/algorithm.txt rename to src/doc/algorithm.txt
diff --git a/doc/rfc1950.txt b/src/doc/rfc1950.txt similarity index 100% rename from doc/rfc1950.txt rename to src/doc/rfc1950.txt
diff --git a/doc/rfc1951.txt b/src/doc/rfc1951.txt similarity index 100% rename from doc/rfc1951.txt rename to src/doc/rfc1951.txt
diff --git a/doc/rfc1952.txt b/src/doc/rfc1952.txt similarity index 100% rename from doc/rfc1952.txt rename to src/doc/rfc1952.txt
diff --git a/doc/txtvsbin.txt b/src/doc/txtvsbin.txt similarity index 100% rename from doc/txtvsbin.txt rename to src/doc/txtvsbin.txt
diff --git a/examples/README.examples b/src/examples/README.examples similarity index 100% rename from examples/README.examples rename to src/examples/README.examples
diff --git a/examples/enough.c b/src/examples/enough.c similarity index 100% rename from examples/enough.c rename to src/examples/enough.c
diff --git a/examples/fitblk.c b/src/examples/fitblk.c similarity index 100% rename from examples/fitblk.c rename to src/examples/fitblk.c
diff --git a/examples/gun.c b/src/examples/gun.c similarity index 100% rename from examples/gun.c rename to src/examples/gun.c
diff --git a/examples/gzappend.c b/src/examples/gzappend.c similarity index 100% rename from examples/gzappend.c rename to src/examples/gzappend.c
diff --git a/examples/gzjoin.c b/src/examples/gzjoin.c similarity index 100% rename from examples/gzjoin.c rename to src/examples/gzjoin.c
diff --git a/examples/gzlog.c b/src/examples/gzlog.c similarity index 100% rename from examples/gzlog.c rename to src/examples/gzlog.c
diff --git a/examples/gzlog.h b/src/examples/gzlog.h similarity index 100% rename from examples/gzlog.h rename to src/examples/gzlog.h
diff --git a/examples/zlib_how.html b/src/examples/zlib_how.html similarity index 100% rename from examples/zlib_how.html rename to src/examples/zlib_how.html
diff --git a/examples/zpipe.c b/src/examples/zpipe.c similarity index 100% rename from examples/zpipe.c rename to src/examples/zpipe.c
diff --git a/examples/zran.c b/src/examples/zran.c similarity index 100% rename from examples/zran.c rename to src/examples/zran.c
diff --git a/gzclose.c b/src/gzclose.c similarity index 100% rename from gzclose.c rename to src/gzclose.c
diff --git a/gzguts.h b/src/gzguts.h similarity index 100% rename from gzguts.h rename to src/gzguts.h
diff --git a/gzlib.c b/src/gzlib.c similarity index 100% rename from gzlib.c rename to src/gzlib.c
diff --git a/gzread.c b/src/gzread.c similarity index 100% rename from gzread.c rename to src/gzread.c
diff --git a/gzwrite.c b/src/gzwrite.c similarity index 100% rename from gzwrite.c rename to src/gzwrite.c
diff --git a/infback.c b/src/infback.c similarity index 100% rename from infback.c rename to src/infback.c
diff --git a/inffast.c b/src/inffast.c similarity index 100% rename from inffast.c rename to src/inffast.c
diff --git a/inffast.h b/src/inffast.h similarity index 100% rename from inffast.h rename to src/inffast.h
diff --git a/inffixed.h b/src/inffixed.h similarity index 100% rename from inffixed.h rename to src/inffixed.h
diff --git a/inflate.c b/src/inflate.c similarity index 100% rename from inflate.c rename to src/inflate.c
diff --git a/inflate.h b/src/inflate.h similarity index 100% rename from inflate.h rename to src/inflate.h
diff --git a/inftrees.c b/src/inftrees.c similarity index 100% rename from inftrees.c rename to src/inftrees.c
diff --git a/inftrees.h b/src/inftrees.h similarity index 100% rename from inftrees.h rename to src/inftrees.h
diff --git a/make_vms.com b/src/make_vms.com similarity index 100% rename from make_vms.com rename to src/make_vms.com
diff --git a/msdos/Makefile.bor b/src/msdos/Makefile.bor similarity index 100% rename from msdos/Makefile.bor rename to src/msdos/Makefile.bor
diff --git a/msdos/Makefile.dj2 b/src/msdos/Makefile.dj2 similarity index 100% rename from msdos/Makefile.dj2 rename to src/msdos/Makefile.dj2
diff --git a/msdos/Makefile.emx b/src/msdos/Makefile.emx similarity index 100% rename from msdos/Makefile.emx rename to src/msdos/Makefile.emx
diff --git a/msdos/Makefile.msc b/src/msdos/Makefile.msc similarity index 100% rename from msdos/Makefile.msc rename to src/msdos/Makefile.msc
diff --git a/msdos/Makefile.tc b/src/msdos/Makefile.tc similarity index 100% rename from msdos/Makefile.tc rename to src/msdos/Makefile.tc
diff --git a/nintendods/Makefile b/src/nintendods/Makefile similarity index 100% rename from nintendods/Makefile rename to src/nintendods/Makefile
diff --git a/nintendods/README b/src/nintendods/README similarity index 100% rename from nintendods/README rename to src/nintendods/README
diff --git a/old/Makefile.riscos b/src/old/Makefile.riscos similarity index 100% rename from old/Makefile.riscos rename to src/old/Makefile.riscos
diff --git a/old/README b/src/old/README similarity index 100% rename from old/README rename to src/old/README
diff --git a/old/descrip.mms b/src/old/descrip.mms similarity index 100% rename from old/descrip.mms rename to src/old/descrip.mms
diff --git a/old/os2/Makefile.os2 b/src/old/os2/Makefile.os2 similarity index 100% rename from old/os2/Makefile.os2 rename to src/old/os2/Makefile.os2
diff --git a/old/os2/zlib.def b/src/old/os2/zlib.def similarity index 100% rename from old/os2/zlib.def rename to src/old/os2/zlib.def
diff --git a/old/visual-basic.txt b/src/old/visual-basic.txt similarity index 100% rename from old/visual-basic.txt rename to src/old/visual-basic.txt
diff --git a/qnx/package.qpg b/src/qnx/package.qpg similarity index 100% rename from qnx/package.qpg rename to src/qnx/package.qpg
diff --git a/test/example.c b/src/test/example.c similarity index 100% rename from test/example.c rename to src/test/example.c
diff --git a/test/infcover.c b/src/test/infcover.c similarity index 100% rename from test/infcover.c rename to src/test/infcover.c
diff --git a/test/minigzip.c b/src/test/minigzip.c similarity index 100% rename from test/minigzip.c rename to src/test/minigzip.c
diff --git a/treebuild.xml b/src/treebuild.xml similarity index 100% rename from treebuild.xml rename to src/treebuild.xml
diff --git a/trees.c b/src/trees.c similarity index 100% rename from trees.c rename to src/trees.c
diff --git a/trees.h b/src/trees.h similarity index 100% rename from trees.h rename to src/trees.h
diff --git a/uncompr.c b/src/uncompr.c similarity index 100% rename from uncompr.c rename to src/uncompr.c
diff --git a/watcom/watcom_f.mak b/src/watcom/watcom_f.mak similarity index 100% rename from watcom/watcom_f.mak rename to src/watcom/watcom_f.mak
diff --git a/watcom/watcom_l.mak b/src/watcom/watcom_l.mak similarity index 100% rename from watcom/watcom_l.mak rename to src/watcom/watcom_l.mak
diff --git a/win32/DLL_FAQ.txt b/src/win32/DLL_FAQ.txt similarity index 100% rename from win32/DLL_FAQ.txt rename to src/win32/DLL_FAQ.txt
diff --git a/win32/Makefile.bor b/src/win32/Makefile.bor similarity index 100% rename from win32/Makefile.bor rename to src/win32/Makefile.bor
diff --git a/win32/Makefile.emx b/src/win32/Makefile.emx similarity index 100% rename from win32/Makefile.emx rename to src/win32/Makefile.emx
diff --git a/win32/Makefile.gcc b/src/win32/Makefile.gcc similarity index 100% rename from win32/Makefile.gcc rename to src/win32/Makefile.gcc
diff --git a/win32/Makefile.msc b/src/win32/Makefile.msc similarity index 100% rename from win32/Makefile.msc rename to src/win32/Makefile.msc
diff --git a/win32/README-WIN32.txt b/src/win32/README-WIN32.txt similarity index 100% rename from win32/README-WIN32.txt rename to src/win32/README-WIN32.txt
diff --git a/win32/VisualC.txt b/src/win32/VisualC.txt similarity index 100% rename from win32/VisualC.txt rename to src/win32/VisualC.txt
diff --git a/win32/zlib.def b/src/win32/zlib.def similarity index 100% rename from win32/zlib.def rename to src/win32/zlib.def
diff --git a/win32/zlib1.rc b/src/win32/zlib1.rc similarity index 100% rename from win32/zlib1.rc rename to src/win32/zlib1.rc
diff --git a/zconf.h b/src/zconf.h similarity index 100% rename from zconf.h rename to src/zconf.h
diff --git a/zconf.h.cmakein b/src/zconf.h.cmakein similarity index 100% rename from zconf.h.cmakein rename to src/zconf.h.cmakein
diff --git a/zconf.h.in b/src/zconf.h.in similarity index 100% rename from zconf.h.in rename to src/zconf.h.in
diff --git a/zlib.3 b/src/zlib.3 similarity index 100% rename from zlib.3 rename to src/zlib.3
diff --git a/zlib.3.pdf b/src/zlib.3.pdf similarity index 100% rename from zlib.3.pdf rename to src/zlib.3.pdf Binary files differ
diff --git a/zlib.h b/src/zlib.h similarity index 100% rename from zlib.h rename to src/zlib.h
diff --git a/zlib.map b/src/zlib.map similarity index 100% rename from zlib.map rename to src/zlib.map
diff --git a/zlib.pc b/src/zlib.pc similarity index 100% rename from zlib.pc rename to src/zlib.pc
diff --git a/zlib.pc.in b/src/zlib.pc.in similarity index 100% rename from zlib.pc.in rename to src/zlib.pc.in
diff --git a/zlib2ansi b/src/zlib2ansi similarity index 100% rename from zlib2ansi rename to src/zlib2ansi
diff --git a/zutil.c b/src/zutil.c similarity index 100% rename from zutil.c rename to src/zutil.c
diff --git a/zutil.h b/src/zutil.h similarity index 100% rename from zutil.h rename to src/zutil.h
diff --git a/zconf.h b/zconf.h new file mode 120000 index 0000000..9e98185 --- /dev/null +++ b/zconf.h
@@ -0,0 +1 @@ +src/zconf.h \ No newline at end of file
diff --git a/zlib.h b/zlib.h new file mode 120000 index 0000000..d37be96 --- /dev/null +++ b/zlib.h
@@ -0,0 +1 @@ +src/zlib.h \ No newline at end of file
diff --git a/zutil.h b/zutil.h new file mode 120000 index 0000000..12e5986 --- /dev/null +++ b/zutil.h
@@ -0,0 +1 @@ +src/zutil.h \ No newline at end of file