akosut 97/07/18 16:54:29
Modified: src ApacheCore.mak Makefile.nt
src/nt modules.c
Added: src Apache.mak
Removed: src ApacheLaunch.mak apache.mak
src/nt ApacheModuleAccess.mak ApacheModuleActions.mak
ApacheModuleAlias.mak ApacheModuleAsis.mak
ApacheModuleAuth.mak ApacheModuleAutoIndex.mak
ApacheModuleBrowser.mak ApacheModuleCGI.mak
ApacheModuleDir.mak ApacheModuleEnv.mak
ApacheModuleIMap.mak ApacheModuleLogConfig.mak
ApacheModuleMIME.mak ApacheModuleNegotiation.mak
modules_dll.c
Log:
Update Windows stuff: move standard modules back into ApacheCore. Change
ApacheLaunch to Apache. Update nt/modules.c
Revision Changes Path
1.5 +10 -10 apache/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -C3 -r1.4 -r1.5
*** ApacheCore.mak 1997/07/18 19:49:27 1.4
--- ApacheCore.mak 1997/07/18 23:54:22 1.5
***************
*** 85,91 ****
[EMAIL PROTECTED] "$(INTDIR)\mod_mime.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_negotiation.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj"
! [EMAIL PROTECTED] "$(INTDIR)\modules_dll.obj"
[EMAIL PROTECTED] "$(INTDIR)\multithread.obj"
[EMAIL PROTECTED] "$(INTDIR)\readdir.obj"
[EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj"
--- 85,91 ----
[EMAIL PROTECTED] "$(INTDIR)\mod_mime.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_negotiation.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj"
! [EMAIL PROTECTED] "$(INTDIR)\modules.obj"
[EMAIL PROTECTED] "$(INTDIR)\multithread.obj"
[EMAIL PROTECTED] "$(INTDIR)\readdir.obj"
[EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj"
***************
*** 159,165 ****
"$(INTDIR)\mod_mime.obj" \
"$(INTDIR)\mod_negotiation.obj" \
"$(INTDIR)\mod_userdir.obj" \
! "$(INTDIR)\modules_dll.obj" \
"$(INTDIR)\multithread.obj" \
"$(INTDIR)\readdir.obj" \
"$(INTDIR)\rfc1413.obj" \
--- 159,165 ----
"$(INTDIR)\mod_mime.obj" \
"$(INTDIR)\mod_negotiation.obj" \
"$(INTDIR)\mod_userdir.obj" \
! "$(INTDIR)\modules.obj" \
"$(INTDIR)\multithread.obj" \
"$(INTDIR)\readdir.obj" \
"$(INTDIR)\rfc1413.obj" \
***************
*** 251,258 ****
[EMAIL PROTECTED] "$(INTDIR)\mod_negotiation.sbr"
[EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_userdir.sbr"
! [EMAIL PROTECTED] "$(INTDIR)\modules_dll.obj"
! [EMAIL PROTECTED] "$(INTDIR)\modules_dll.sbr"
[EMAIL PROTECTED] "$(INTDIR)\multithread.obj"
[EMAIL PROTECTED] "$(INTDIR)\multithread.sbr"
[EMAIL PROTECTED] "$(INTDIR)\readdir.obj"
--- 251,258 ----
[EMAIL PROTECTED] "$(INTDIR)\mod_negotiation.sbr"
[EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj"
[EMAIL PROTECTED] "$(INTDIR)\mod_userdir.sbr"
! [EMAIL PROTECTED] "$(INTDIR)\modules.obj"
! [EMAIL PROTECTED] "$(INTDIR)\modules.sbr"
[EMAIL PROTECTED] "$(INTDIR)\multithread.obj"
[EMAIL PROTECTED] "$(INTDIR)\multithread.sbr"
[EMAIL PROTECTED] "$(INTDIR)\readdir.obj"
***************
*** 329,335 ****
"$(INTDIR)\mod_mime.sbr" \
"$(INTDIR)\mod_negotiation.sbr" \
"$(INTDIR)\mod_userdir.sbr" \
! "$(INTDIR)\modules_dll.sbr" \
"$(INTDIR)\multithread.sbr" \
"$(INTDIR)\readdir.sbr" \
"$(INTDIR)\rfc1413.sbr" \
--- 329,335 ----
"$(INTDIR)\mod_mime.sbr" \
"$(INTDIR)\mod_negotiation.sbr" \
"$(INTDIR)\mod_userdir.sbr" \
! "$(INTDIR)\modules.sbr" \
"$(INTDIR)\multithread.sbr" \
"$(INTDIR)\readdir.sbr" \
"$(INTDIR)\rfc1413.sbr" \
***************
*** 386,392 ****
"$(INTDIR)\mod_mime.obj" \
"$(INTDIR)\mod_negotiation.obj" \
"$(INTDIR)\mod_userdir.obj" \
! "$(INTDIR)\modules_dll.obj" \
"$(INTDIR)\multithread.obj" \
"$(INTDIR)\readdir.obj" \
"$(INTDIR)\rfc1413.obj" \
--- 386,392 ----
"$(INTDIR)\mod_mime.obj" \
"$(INTDIR)\mod_negotiation.obj" \
"$(INTDIR)\mod_userdir.obj" \
! "$(INTDIR)\modules.obj" \
"$(INTDIR)\multithread.obj" \
"$(INTDIR)\readdir.obj" \
"$(INTDIR)\rfc1413.obj" \
***************
*** 1119,1125 ****
################################################################################
# Begin Source File
! SOURCE=.\nt\modules_dll.c
DEP_CPP_MODUL=\
".\alloc.h"\
".\buff.h"\
--- 1119,1125 ----
################################################################################
# Begin Source File
! SOURCE=.\nt\modules.c
DEP_CPP_MODUL=\
".\alloc.h"\
".\buff.h"\
***************
*** 1138,1144 ****
!IF "$(CFG)" == "ApacheCore - Win32 Release"
! "$(INTDIR)\modules_dll.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
--- 1138,1144 ----
!IF "$(CFG)" == "ApacheCore - Win32 Release"
! "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
***************
*** 1149,1158 ****
$(CPP) $(CPP_PROJ) $(SOURCE) \
! "$(INTDIR)\modules_dll.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(BuildCmds)
! "$(INTDIR)\modules_dll.sbr" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(BuildCmds)
!ENDIF
--- 1149,1158 ----
$(CPP) $(CPP_PROJ) $(SOURCE) \
! "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(BuildCmds)
! "$(INTDIR)\modules.sbr" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
$(BuildCmds)
!ENDIF
1.4 +11 -10 apache/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.nt,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -C3 -r1.3 -r1.4
*** Makefile.nt 1997/07/18 19:49:28 1.3
--- Makefile.nt 1997/07/18 23:54:23 1.4
***************
*** 10,16 ****
cd modules\proxy & set CFG=proxy - Win32 Debug& nmake -f proxy.mak
cd regex & set CFG=regex - Win32 Debug& nmake -f regex.mak
cd . & set CFG=ApacheCore - Win32 Debug& nmake -f ApacheCore.mak
! cd . & set CFG=ApacheLaunch - Win32 Debug& nmake -f ApacheLaunch.mak
cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake -f
ApacheModuleStatus.mak
# cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake -f
ApacheModuleInfo.mak
cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake -f
ApacheModuleAuthAnon.mak
--- 10,16 ----
cd modules\proxy & set CFG=proxy - Win32 Debug& nmake -f proxy.mak
cd regex & set CFG=regex - Win32 Debug& nmake -f regex.mak
cd . & set CFG=ApacheCore - Win32 Debug& nmake -f ApacheCore.mak
! cd . & set CFG=Apache - Win32 Debug& nmake -f Apache.mak
cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake -f
ApacheModuleStatus.mak
# cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake -f
ApacheModuleInfo.mak
cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake -f
ApacheModuleAuthAnon.mak
***************
*** 23,35 ****
installd: _debug
-mkdir \Apache
! copy LaunchD\ApacheLaunch.exe \Apache
copy CoreD\ApacheCore.dll \Apache
! copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache
! # copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache
! copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache
! copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache
! copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache
! copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache
! copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache
! copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache
--- 23,36 ----
installd: _debug
-mkdir \Apache
! -mkdir \Apache\modules
! copy ApacheD\Apache.exe \Apache
copy CoreD\ApacheCore.dll \Apache
! copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules
! # copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules
! copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules
! copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
! copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
! copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
! copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
! copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\moduleS
1.1 apache/src/Apache.mak
Index: Apache.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
!IF "$(CFG)" == ""
CFG=Apache - Win32 Debug
!MESSAGE No configuration specified. Defaulting to Apache - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "Apache - Win32 Release" && "$(CFG)" !=\
"Apache - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Apache.mak" CFG="Apache - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Apache - Win32 Release" (based on\
"Win32 (x86) Console Application")
!MESSAGE "Apache - Win32 Debug" (based on\
"Win32 (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "Apache - Win32 Debug"
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "Apache - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ApacheLa"
# PROP BASE Intermediate_Dir "ApacheLa"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "LaunchR"
# PROP Intermediate_Dir "LaunchR"
# PROP Target_Dir ""
OUTDIR=.\LaunchR
INTDIR=.\LaunchR
ALL : "$(OUTDIR)\Apache.exe"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\dummy.obj"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
/Fp"$(INTDIR)/Apache.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\LaunchR/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/Apache.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
LINK32_FLAGS=CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\
/pdb:"$(OUTDIR)/Apache.pdb" /machine:I386\
/out:"$(OUTDIR)/Apache.exe"
LINK32_OBJS= \
"$(INTDIR)\dummy.obj"
"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "ApacheL0"
# PROP BASE Intermediate_Dir "ApacheL0"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "ApacheD"
# PROP Intermediate_Dir "ApacheD"
# PROP Target_Dir ""
OUTDIR=.\ApacheD
INTDIR=.\ApacheD
ALL : "$(OUTDIR)\Apache.exe"
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\dummy.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /YX /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE"\
/Fp"$(INTDIR)/Apache.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\ApacheD/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/Apache.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:console /debug /machine:I386
# ADD LINK32 CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
/pdb:"$(OUTDIR)/Apache.pdb" /debug /machine:I386\
/out:"$(OUTDIR)/Apache.exe"
LINK32_OBJS= \
"$(INTDIR)\dummy.obj"
"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!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) $<
################################################################################
# Begin Target
# Name "Apache - Win32 Release"
# Name "Apache - Win32 Debug"
!IF "$(CFG)" == "Apache - Win32 Release"
!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=.\dummy.c
"$(INTDIR)\dummy.obj" : $(SOURCE) "$(INTDIR)"
# End Source File
# End Target
# End Project
################################################################################
1.3 +6 -6 apache/src/nt/modules.c
Index: modules.c
===================================================================
RCS file: /export/home/cvs/apache/src/nt/modules.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -C3 -r1.2 -r1.3
*** modules.c 1997/07/12 13:14:47 1.2
--- modules.c 1997/07/18 23:54:29 1.3
***************
*** 6,16 ****
--- 6,18 ----
#include "../http_config.h"
extern module core_module;
+ extern module dll_module;
extern module mime_module;
extern module access_module;
extern module auth_module;
extern module negotiation_module;
extern module includes_module;
+ extern module autoindex_module;
extern module dir_module;
extern module cgi_module;
extern module userdir_module;
***************
*** 21,36 ****
extern module imap_module;
extern module action_module;
extern module browser_module;
- extern module proxy_module;
- extern module autoindex_module;
module *prelinked_modules[] = {
&core_module,
&mime_module,
&access_module,
&auth_module,
&negotiation_module,
&includes_module,
&dir_module,
&cgi_module,
&userdir_module,
--- 23,38 ----
extern module imap_module;
extern module action_module;
extern module browser_module;
module *prelinked_modules[] = {
&core_module,
+ &dll_module,
&mime_module,
&access_module,
&auth_module,
&negotiation_module,
&includes_module,
+ &autoindex_module,
&dir_module,
&cgi_module,
&userdir_module,
***************
*** 41,57 ****
&imap_module,
&action_module,
&browser_module,
- &proxy_module,
- &autoindex_module,
NULL
};
module *preloaded_modules[] = {
&core_module,
&mime_module,
&access_module,
&auth_module,
&negotiation_module,
&includes_module,
&dir_module,
&cgi_module,
&userdir_module,
--- 43,59 ----
&imap_module,
&action_module,
&browser_module,
NULL
};
module *preloaded_modules[] = {
&core_module,
+ &dll_module,
&mime_module,
&access_module,
&auth_module,
&negotiation_module,
&includes_module,
+ &autoindex_module,
&dir_module,
&cgi_module,
&userdir_module,
***************
*** 62,68 ****
&imap_module,
&action_module,
&browser_module,
- &proxy_module,
- &autoindex_module,
NULL
};
--- 64,68 ----
