You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/01/18 18:01:46 UTC
cvs commit: httpd-2.0/modules/filters mod_deflate.dsp
nd 2004/01/18 09:01:46
Modified: . Makefile.win
modules/filters mod_deflate.dsp
Log:
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
Revision Changes Path
1.134 +32 -1 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -u -r1.133 -r1.134
--- Makefile.win 8 Sep 2003 21:08:33 -0000 1.133
+++ Makefile.win 18 Jan 2004 17:01:46 -0000 1.134
@@ -81,6 +81,14 @@
!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 @@
$(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 @@
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 @@
"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
1.9 +2 -50 httpd-2.0/modules/filters/mod_deflate.dsp
Index: mod_deflate.dsp
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- mod_deflate.dsp 11 Mar 2003 00:58:49 -0000 1.8
+++ mod_deflate.dsp 18 Jan 2004 17:01:46 -0000 1.9
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref
+# ADD LINK32 kernel32.lib zlib.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Release/mod_deflate.so" /libpath:"..\..\srclib\zlib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref
!ELSEIF "$(CFG)" == "mod_deflate - Win32 Debug"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
+# ADD LINK32 kernel32.lib zlib.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_deflate.so" /libpath:"..\..\srclib\zlib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so
!ENDIF
@@ -87,54 +87,6 @@
# Name "mod_deflate - Win32 Release"
# Name "mod_deflate - Win32 Debug"
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\adler32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\crc32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\infblock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\infcodes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\infutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\srclib\zlib\zutil.c
-# End Source File
-# End Group
# Begin Source File
SOURCE=.\mod_deflate.c