diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-11-20 19:52:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-11-20 19:52:20 +0000 |
| commit | d43bee8ee939992404d59ae0fec248ce46abecb0 (patch) | |
| tree | 6eb79a6902f147bedb8c85350cbdc68543115907 /auto/lib/zlib/make | |
| parent | 13376e1538e2b29e436805c626f6837b34a482c5 (diff) | |
| download | nginx-release-0.1.8.tar.gz nginx-release-0.1.8.tar.bz2 | |
nginx-0.1.8-RELEASE importrelease-0.1.8
*) Bugfix: in the ngx_http_autoindex_module if the long file names were
in the listing.
*) Feature: the "^~" modifier in the location directive.
*) Feature: the proxy_max_temp_file_size directive.
Diffstat (limited to 'auto/lib/zlib/make')
| -rw-r--r-- | auto/lib/zlib/make | 101 |
1 files changed, 54 insertions, 47 deletions
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 582276248..2e5ea8420 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -2,36 +2,22 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT" - ;; - -esac - - -case $PLATFORM in - - win32) - line=`echo $ZLIB/zlib.lib: | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - ;; - - *) - echo "$ZLIB/libz.a:" >> $MAKEFILE + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -43,12 +29,16 @@ done=NO case $PLATFORM in win32) - zlib=`echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` + cp auto/lib/zlib/$ngx_makefile $ZLIB + + cat << END >> $NGX_MAKEFILE - cp auto/lib/zlib/$makefile $ZLIB - echo " cd $zlib" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE +`echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. + +END done=YES ;; @@ -59,23 +49,35 @@ case $PLATFORM in *:i386 | *:i686) case $ZLIB_ASM in pentium) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm586/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && cp contrib/asm586/match.S . \\ + && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) OBJA=match.o libz.a + +END done=YES ;; pentiumpro) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && cp contrib/asm686/match.S . \\ + && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) OBJA=match.o libz.a + +END done=YES ;; @@ -97,11 +99,16 @@ esac if [ $done = NO ]; then - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT\" CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) libz.a" >> $MAKEFILE -fi + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) libz.a -echo >> $MAKEFILE +END + +fi |