CMake build fixes

[zlib.git] / treebuild.xml

diff --git a/treebuild.xml b/treebuild.xml
index 387336e7b46778a464d66ff24ffea862934f8163..781b4c98cc23adb19cd8122bef993fcd68de70fc 100644 (file)
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.3">
-    <library name="zlib" dlversion="1.2.3" dlname="z">
+<package name="zlib" version="1.2.12">
+    <library name="zlib" dlversion="1.2.12" dlname="z">
        <property name="description"> zip compression library </property>
        <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
-       
+
        <!-- fixme: not implemented yet -->
        <property name="compiler/c/inline" value="yes" />
 
@@ -11,92 +11,87 @@
        <include-file name="zconf.h" scope="public" mode="644" />
 
        <source name="adler32.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
        </source>
        <source name="compress.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
        </source>
        <source name="crc32.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
            <depend name="crc32.h" />
        </source>
        <source name="gzclose.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="gzguts.h" /> 
-       </source>
-       <source name="gzio.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="gzguts.h" />
        </source>
        <source name="gzlib.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="gzguts.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="gzguts.h" />
        </source>
        <source name="gzread.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="gzguts.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="gzguts.h" />
        </source>
        <source name="gzwrite.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="gzguts.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="gzguts.h" />
        </source>
        <source name="uncompr.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
        </source>
        <source name="deflate.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
-           <depend name="deflate.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
+           <depend name="deflate.h" />
        </source>
        <source name="trees.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
-           <depend name="deflate.h" /> 
-           <depend name="trees.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
+           <depend name="deflate.h" />
+           <depend name="trees.h" />
        </source>
        <source name="zutil.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
        </source>
        <source name="inflate.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
-           <depend name="inftrees.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
+           <depend name="inftrees.h" />
            <depend name="inflate.h" />
            <depend name="inffast.h" />
        </source>
        <source name="infback.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
-           <depend name="inftrees.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
+           <depend name="inftrees.h" />
            <depend name="inflate.h" />
            <depend name="inffast.h" />
        </source>
        <source name="inftrees.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
-           <depend name="inftrees.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
+           <depend name="inftrees.h" />
        </source>
        <source name="inffast.c">
-           <depend name="zlib.h" /> 
-           <depend name="zconf.h" /> 
-           <depend name="zutil.h" /> 
-           <depend name="inftrees.h" /> 
+           <depend name="zlib.h" />
+           <depend name="zconf.h" />
+           <depend name="zutil.h" />
+           <depend name="inftrees.h" />
            <depend name="inflate.h" />
            <depend name="inffast.h" />
        </source>
@@ -106,13 +101,13 @@
 <!--
 CFLAGS=-O
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
+#CFLAGS=-g -DZLIB_DEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 #           -Wstrict-prototypes -Wmissing-prototypes
 
 # OBJA =
 # to use the asm code: make OBJA=match.o
-# 
+#
 match.o: match.S
        $(CPP) match.S > _match.s
        $(CC) -c _match.s