Mercurial > hg > nginx-ranges

comparison auto/lib/zlib/make @ 635:e67b227c8dbb default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents be4f34123024
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
51 51
52 cat << END >> $NGX_MAKEFILE 52 cat << END >> $NGX_MAKEFILE
53 53
54 $ZLIB/libz.a: $NGX_MAKEFILE 54 $ZLIB/libz.a: $NGX_MAKEFILE
55 cd $ZLIB \\ 55 cd $ZLIB \\
56 && \$(MAKE) clean \\ 56 && \$(MAKE) distclean \\
57 && cp contrib/asm586/match.S . \\ 57 && cp contrib/asm586/match.S . \\
58 && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ 58 && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
59 ./configure \\ 59 ./configure \\
60 && \$(MAKE) OBJA=match.o libz.a 60 && \$(MAKE) OBJA=match.o libz.a
61 61
68 68
69 cat << END >> $NGX_MAKEFILE 69 cat << END >> $NGX_MAKEFILE
70 70
71 $ZLIB/libz.a: $NGX_MAKEFILE 71 $ZLIB/libz.a: $NGX_MAKEFILE
72 cd $ZLIB \\ 72 cd $ZLIB \\
73 && \$(MAKE) clean \\ 73 && \$(MAKE) distclean \\
74 && cp contrib/asm686/match.S . \\ 74 && cp contrib/asm686/match.S . \\
75 && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ 75 && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
76 ./configure \\ 76 ./configure \\
77 && \$(MAKE) OBJA=match.o libz.a 77 && \$(MAKE) OBJA=match.o libz.a
78 78
101 101
102 cat << END >> $NGX_MAKEFILE 102 cat << END >> $NGX_MAKEFILE
103 103
104 $ZLIB/libz.a: $NGX_MAKEFILE 104 $ZLIB/libz.a: $NGX_MAKEFILE
105 cd $ZLIB \\ 105 cd $ZLIB \\
106 && \$(MAKE) clean \\ 106 && \$(MAKE) distclean \\
107 && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ 107 && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
108 ./configure \\ 108 ./configure \\
109 && \$(MAKE) libz.a 109 && \$(MAKE) libz.a
110 110
111 END 111 END