diff options
| author | André Malo <nd@apache.org> | 2004-01-18 18:01:46 +0100 |
|---|---|---|
| committer | André Malo <nd@apache.org> | 2004-01-18 18:01:46 +0100 |
| commit | 5daffde29542eab2f3710e0b3a514eb16225f1e1 (patch) | |
| tree | 4418430ce4031d5da0df4d762af5172177713c98 /Makefile.win | |
| parent | add commented LoadModule directive for mod_deflate (diff) | |
| download | apache2-5daffde29542eab2f3710e0b3a514eb16225f1e1.tar.xz apache2-5daffde29542eab2f3710e0b3a514eb16225f1e1.zip | |
Don't include zlib files directly. That's very nasty!
zlib is now ivoked in a more common way (we link against it :-).
The build process inclusion is probably not the final one, but it works
for me for zlib 1.1.4 and 1.2.1 in command line builds.
PR: 25578
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102370 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/Makefile.win b/Makefile.win index 5cd348df8d..ec76d9ce40 100644 --- a/Makefile.win +++ b/Makefile.win @@ -81,6 +81,14 @@ _tryssl: !IF EXIST("srclib\zlib") _tryzlib: + cd srclib\zlib +!IF EXIST("srclib\zlib\Win32\Makefile.msc") + $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib +!ELSE + $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib +!ENDIF + cd ..\.. + !IF EXIST("modules\filters\mod_deflate.mak") cd modules\filters $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 .\$(LONG)\mod_deflate.so @@ -242,8 +250,17 @@ _build: $(MAKE) $(MAKEOPT) -f util_ldap.mak CFG="util_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_auth_ldap.mak CFG="mod_auth_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. - cd modules\filters + !IF EXIST("srclib\zlib") + cd srclib\zlib +!IF EXIST("srclib\zlib\Win32\Makefile.msc") + $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib +!ELSE + $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib +!ENDIF + cd ..\.. + + cd modules\filters $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET) !ENDIF $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -328,6 +345,13 @@ _build: devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs !ENDIF !IF EXIST("srclib\zlib") + cd srclib\zlib +!IF EXIST("srclib\zlib\Win32\Makefile.msc") + $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib +!ELSE + $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib +!ENDIF + cd ..\.. devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate !ENDIF @@ -355,6 +379,13 @@ _build: "abs - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF !IF EXIST("srclib\zlib") + cd srclib\zlib +!IF EXIST("srclib\zlib\Win32\Makefile.msc") + $(MAKE) $(MAKEOPT) -f Win32\Makefile.msc zlib.lib +!ELSE + $(MAKE) $(MAKEOPT) -f msdos\Makefile.w32 zlib.lib +!ENDIF + cd ..\.. @msdev Apache.dsw /USEENV /MAKE \ "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF |