stoddard 99/10/14 07:01:17
Modified: src ApacheCore.mak
src/os/win32 modules.c
Log:
Add mod_cgi back into the Win32 build
Revision Changes Path
1.6 +159 -34 apache-2.0/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheCore.mak 1999/10/05 04:51:10 1.5
+++ ApacheCore.mak 1999/10/14 14:01:11 1.6
@@ -28,10 +28,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF "$(CFG)" == "ApacheCore - Win32 Release"
OUTDIR=.\CoreR
@@ -71,6 +67,7 @@
[EMAIL PROTECTED] "$(INTDIR)\mod_asis.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_auth.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_autoindex.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\mod_cgi.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_dir.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_env.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_imap.obj"
@@ -98,12 +95,46 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /D\
"NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"\
/Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreR/
CPP_SBRS=.
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -138,6 +169,7 @@
"$(INTDIR)\mod_asis.obj" \
"$(INTDIR)\mod_auth.obj" \
"$(INTDIR)\mod_autoindex.obj" \
+ "$(INTDIR)\mod_cgi.obj" \
"$(INTDIR)\mod_dir.obj" \
"$(INTDIR)\mod_env.obj" \
"$(INTDIR)\mod_imap.obj" \
@@ -222,6 +254,8 @@
[EMAIL PROTECTED] "$(INTDIR)\mod_auth.sbr"
[EMAIL PROTECTED] "$(INTDIR)\mod_autoindex.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_autoindex.sbr"
+ [EMAIL PROTECTED] "$(INTDIR)\mod_cgi.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\mod_cgi.sbr"
[EMAIL PROTECTED] "$(INTDIR)\mod_dir.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_dir.sbr"
[EMAIL PROTECTED] "$(INTDIR)\mod_env.obj"
@@ -272,12 +306,46 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I
".\lib\apr\include"\
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"
/FR"$(INTDIR)\\"\
/Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreD/
CPP_SBRS=.\CoreD/
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -301,6 +369,7 @@
"$(INTDIR)\mod_asis.sbr" \
"$(INTDIR)\mod_auth.sbr" \
"$(INTDIR)\mod_autoindex.sbr" \
+ "$(INTDIR)\mod_cgi.sbr" \
"$(INTDIR)\mod_dir.sbr" \
"$(INTDIR)\mod_env.sbr" \
"$(INTDIR)\mod_imap.sbr" \
@@ -356,6 +425,7 @@
"$(INTDIR)\mod_asis.obj" \
"$(INTDIR)\mod_auth.obj" \
"$(INTDIR)\mod_autoindex.obj" \
+ "$(INTDIR)\mod_cgi.obj" \
"$(INTDIR)\mod_dir.obj" \
"$(INTDIR)\mod_env.obj" \
"$(INTDIR)\mod_imap.obj" \
@@ -383,36 +453,6 @@
!ENDIF
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
!IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
@@ -1834,6 +1874,91 @@
"$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" :
$(SOURCE)\
$(DEP_CPP_MOD_AUT) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=.\modules\standard\mod_cgi.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_MOD_C=\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_conf_globals.h"\
+ ".\include\http_config.h"\
+ ".\include\http_core.h"\
+ ".\include\http_log.h"\
+ ".\include\http_main.h"\
+ ".\include\http_protocol.h"\
+ ".\include\http_request.h"\
+ ".\include\httpd.h"\
+ ".\include\util_script.h"\
+ ".\include\util_uri.h"\
+ ".\lib\apr\file_io\win32\readdir.h"\
+ ".\lib\apr\include\apr_errno.h"\
+ ".\lib\apr\include\apr_file_io.h"\
+ ".\lib\apr\include\apr_general.h"\
+ ".\lib\apr\include\apr_lib.h"\
+ ".\lib\apr\include\apr_lock.h"\
+ ".\lib\apr\include\apr_network_io.h"\
+ ".\lib\apr\include\apr_portable.h"\
+ ".\lib\apr\include\apr_thread_proc.h"\
+ ".\lib\apr\include\apr_time.h"\
+ ".\lib\apr\include\apr_win.h"\
+ ".\os\win32\os.h"\
+
+
+"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+DEP_CPP_MOD_C=\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_conf_globals.h"\
+ ".\include\http_config.h"\
+ ".\include\http_core.h"\
+ ".\include\http_log.h"\
+ ".\include\http_main.h"\
+ ".\include\http_protocol.h"\
+ ".\include\http_request.h"\
+ ".\include\httpd.h"\
+ ".\include\util_script.h"\
+ ".\include\util_uri.h"\
+ ".\lib\apr\file_io\win32\readdir.h"\
+ ".\lib\apr\include\apr_errno.h"\
+ ".\lib\apr\include\apr_file_io.h"\
+ ".\lib\apr\include\apr_general.h"\
+ ".\lib\apr\include\apr_lib.h"\
+ ".\lib\apr\include\apr_lock.h"\
+ ".\lib\apr\include\apr_network_io.h"\
+ ".\lib\apr\include\apr_portable.h"\
+ ".\lib\apr\include\apr_thread_proc.h"\
+ ".\lib\apr\include\apr_time.h"\
+ ".\lib\apr\include\apr_win.h"\
+ ".\os\win32\os.h"\
+
+
+"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE)
$(DEP_CPP_MOD_C)\
+ "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.4 +3 -3 apache-2.0/src/os/win32/modules.c
Index: modules.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/modules.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modules.c 1999/08/30 20:37:16 1.3
+++ modules.c 1999/10/14 14:01:16 1.4
@@ -16,7 +16,7 @@
//extern module includes_module;
extern module autoindex_module;
extern module dir_module;
-//extern module cgi_module;
+extern module cgi_module;
extern module userdir_module;
extern module alias_module;
extern module env_module;
@@ -38,7 +38,7 @@
// &includes_module,
&autoindex_module,
&dir_module,
-// &cgi_module,
+ &cgi_module,
&userdir_module,
&alias_module,
&env_module,
@@ -61,7 +61,7 @@
// &includes_module,
&autoindex_module,
&dir_module,
-// &cgi_module,
+ &cgi_module,
&userdir_module,
&alias_module,
&env_module,
