ben 97/07/20 08:05:12
Modified: src Apache.mak
src/nt .cvsignore
Log:
Cleanup.
Revision Changes Path
1.2 +73 -99 apache/src/Apache.mak
Index: Apache.mak
===================================================================
RCS file: /export/home/cvs/apache/src/Apache.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** Apache.mak 1997/07/18 23:54:22 1.1
--- Apache.mak 1997/07/20 15:05:10 1.2
***************
*** 1,27 ****
! # 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
--- 1,20 ----
! # Microsoft Developer Studio Generated NMAKE File, Based on Apache.dsp
!IF "$(CFG)" == ""
! CFG=Apache - Win32 Release
! !MESSAGE No configuration specified. Defaulting to Apache - Win32 Release.
!ENDIF
! !IF "$(CFG)" != "Apache - Win32 Release" && "$(CFG)" != "Apache - Win32
Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "Apache.mak" CFG="Apache - Win32 Release"
!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
***************
*** 31,88 ****
!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"
--- 24,72 ----
!ELSE
NULL=nul
!ENDIF
!
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "Apache - Win32 Release"
OUTDIR=.\LaunchR
INTDIR=.\LaunchR
+ # Begin Custom Macros
+ OutDir=.\.\LaunchR
+ # End Custom Macros
+
+ !IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\Apache.exe"
! !ELSE
!
! ALL : "$(OUTDIR)\Apache.exe"
!
! !ENDIF
!
! CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\dummy.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
! /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\LaunchR/
! CPP_SBRS=.
BSC32=bscmake.exe
! BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc"
BSC32_SBRS= \
LINK32=link.exe
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"
***************
*** 93,117 ****
!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"
--- 77,102 ----
!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
OUTDIR=.\ApacheD
INTDIR=.\ApacheD
+ # Begin Custom Macros
+ OutDir=.\.\ApacheD
+ # End Custom Macros
+
+ !IF "$(RECURSE)" == "0"
+
+ ALL : "$(OUTDIR)\Apache.exe"
+
+ !ELSE
ALL : "$(OUTDIR)\Apache.exe"
! !ENDIF
!
! CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\dummy.obj"
! [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
! [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.exe"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.ilk"
[EMAIL PROTECTED] "$(OUTDIR)\Apache.pdb"
***************
*** 119,146 ****
"$(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"
--- 104,122 ----
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE"\
! /Fp"$(INTDIR)\Apache.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheD/
! CPP_SBRS=.
BSC32=bscmake.exe
! BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc"
BSC32_SBRS= \
LINK32=link.exe
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"
***************
*** 151,195 ****
!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
!
################################################################################
--- 127,169 ----
!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)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32
Debug"
SOURCE=.\dummy.c
"$(INTDIR)\dummy.obj" : $(SOURCE) "$(INTDIR)"
!
! !ENDIF
!
1.3 +4 -12 apache/src/nt/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache/src/nt/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C3 -r1.2 -r1.3
*** .cvsignore 1997/07/17 20:01:34 1.2
--- .cvsignore 1997/07/20 15:05:11 1.3
***************
*** 1,22 ****
*.mdp
*.ncb
! ModAccessD
! ModActionsD
! ModAliasD
! ModCGID
! ModMIMED
! ApacheModuleUserTrackD
ApacheModuleAuthAnonD
- ApacheModuleBrowserD
ApacheModuleCERNMetaD
ApacheModuleDigestD
- ApacheModuleDirD
- ApacheModuleEnvD
ApacheModuleExpiresD
ApacheModuleHeadersD
- ApacheModuleIMapD
ApacheModuleInfoD
- ApacheModuleLogConfigD
- ApacheModuleNegotiationD
ApacheModuleRewriteD
ApacheModuleStatusD
--- 1,14 ----
*.mdp
*.ncb
! *.opt
! *.plg
! *.dsw
ApacheModuleAuthAnonD
ApacheModuleCERNMetaD
ApacheModuleDigestD
ApacheModuleExpiresD
ApacheModuleHeadersD
ApacheModuleInfoD
ApacheModuleRewriteD
ApacheModuleStatusD
+ ApacheModuleUserTrackD
