httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/support logresolve.dsp logresolve.mak rotatelogs.dsp rotatelogs.mak htdigest.dsp htdigest.mak htpasswd.dsp htpasswd.mak logresolve.c
Date Tue, 09 May 2000 17:58:37 GMT
wrowe       00/05/09 10:58:36

  Modified:    src/support htdigest.dsp htdigest.mak htpasswd.dsp
                        htpasswd.mak logresolve.c
  Added:       src/support logresolve.dsp logresolve.mak rotatelogs.dsp
                        rotatelogs.mak
  Log:
  
    Add rotatelogs and logresolve .dsp project and make files.
    Fix logresolve to function under Win32, and change the
    build settings of htdigest and htpasswd to consistently
    waste less space with precompiled headers, etc.
  
  
  Revision  Changes    Path
  1.2       +10 -10    apache-1.3/src/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htdigest.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htdigest.dsp	1999/06/05 19:10:05	1.1
  +++ htdigest.dsp	2000/05/09 17:58:34	1.2
  @@ -37,12 +37,12 @@
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 0
  -# PROP Output_Dir ""
  -# PROP Intermediate_Dir ""
  +# PROP Output_Dir "Release"
  +# PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   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 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 /out:"release/htdigest.exe"
  +# ADD 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 /map /machine:I386
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  @@ -62,12 +62,12 @@
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  -# PROP Output_Dir ""
  -# PROP Intermediate_Dir ""
  +# PROP Output_Dir "Debug"
  +# PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   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 /pdbtype:sept
  -# ADD 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 /out:"debug/htdigest.exe" /pdbtype:sept
  +# ADD 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 /map /debug /machine:I386 /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.2       +141 -88   apache-1.3/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htdigest.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htdigest.mak	1999/06/05 19:10:05	1.1
  +++ htdigest.mak	2000/05/09 17:58:34	1.2
  @@ -27,21 +27,24 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
  -OUTDIR=.
  -INTDIR=.
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
   
  -ALL : "$(OUTDIR)\release\htdigest.exe"
  +ALL : "$(OUTDIR)\htdigest.exe"
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\release\htdigest.exe"
  +ALL : "$(OUTDIR)\htdigest.exe"
   
   !ENDIF 
   
  @@ -51,45 +54,16 @@
   	-@erase "$(INTDIR)\ap_md5c.obj"
   	-@erase "$(INTDIR)\htdigest.obj"
   	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(OUTDIR)\release\htdigest.exe"
  -
  -CPP=cl.exe
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htdigest.pch" /YX /FD /c 
  -CPP_OBJS=.
  -CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  +	-@erase "$(OUTDIR)\htdigest.exe"
  +	-@erase "$(OUTDIR)\htdigest.map"
   
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  +"$(OUTDIR)" :
  +    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -RSC=rc.exe
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  + "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_OBJS=.\Release/
  +CPP_SBRS=.
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
   BSC32_SBRS= \
  @@ -98,34 +72,34 @@
   LINK32_FLAGS=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)\htdigest.pdb" /machine:I386\
  - /out:"$(OUTDIR)\release\htdigest.exe" 
  + /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /machine:I386\
  + /out:"$(OUTDIR)\htdigest.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\ap_cpystrn.obj" \
   	"$(INTDIR)\ap_getpass.obj" \
   	"$(INTDIR)\ap_md5c.obj" \
   	"$(INTDIR)\htdigest.obj"
   
  -"$(OUTDIR)\release\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +"$(OUTDIR)\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
     $(LINK32_FLAGS) $(LINK32_OBJS)
   <<
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
  -OUTDIR=.
  -INTDIR=.
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
   
  -ALL : "$(OUTDIR)\debug\htdigest.exe"
  +ALL : "$(OUTDIR)\htdigest.exe"
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\debug\htdigest.exe"
  +ALL : "$(OUTDIR)\htdigest.exe"
   
   !ENDIF 
   
  @@ -136,16 +110,41 @@
   	-@erase "$(INTDIR)\htdigest.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\vc50.pdb"
  -	-@erase "$(OUTDIR)\debug\htdigest.exe"
  -	-@erase "$(OUTDIR)\debug\htdigest.ilk"
  +	-@erase "$(OUTDIR)\htdigest.exe"
  +	-@erase "$(OUTDIR)\htdigest.ilk"
  +	-@erase "$(OUTDIR)\htdigest.map"
   	-@erase "$(OUTDIR)\htdigest.pdb"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htdigest.pch" /YX /FD /c 
  -CPP_OBJS=.
  +"$(OUTDIR)" :
  +    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  +
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\
  + "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=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)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /debug\
  + /machine:I386 /out:"$(OUTDIR)\htdigest.exe" /pdbtype:sept 
  +LINK32_OBJS= \
  +	"$(INTDIR)\ap_cpystrn.obj" \
  +	"$(INTDIR)\ap_getpass.obj" \
  +	"$(INTDIR)\ap_md5c.obj" \
  +	"$(INTDIR)\htdigest.obj"
   
  +"$(OUTDIR)\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -176,34 +175,13 @@
      $(CPP_PROJ) $< 
   <<
   
  -RSC=rc.exe
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=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)\htdigest.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\debug\htdigest.exe" /pdbtype:sept 
  -LINK32_OBJS= \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_getpass.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\htdigest.obj"
  -
  -"$(OUTDIR)\debug\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
   
  -
   !IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" ==\
    "htdigest - Win32 Debug"
   SOURCE=..\ap\ap_cpystrn.c
  +
  +!IF  "$(CFG)" == "htdigest - Win32 Release"
  +
   DEP_CPP_AP_CP=\
   	"..\include\alloc.h"\
   	"..\include\ap.h"\
  @@ -216,8 +194,6 @@
   	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_CP=\
   	"..\include\ap_config_auto.h"\
  @@ -230,7 +206,32 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  +
  +DEP_CPP_AP_CP=\
  +	"..\include\alloc.h"\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=..\ap\ap_getpass.c
  +
  +!IF  "$(CFG)" == "htdigest - Win32 Release"
  +
   DEP_CPP_AP_GE=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -238,8 +239,6 @@
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_GE=\
   	"..\include\ap_config_auto.h"\
  @@ -250,7 +249,27 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  +
  +DEP_CPP_AP_GE=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +
  +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=..\ap\ap_md5c.c
  +
  +!IF  "$(CFG)" == "htdigest - Win32 Release"
  +
   DEP_CPP_AP_MD=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -259,8 +278,6 @@
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_MD=\
   	"..\ap\ebcdic.h"\
  @@ -272,7 +289,28 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  +
  +DEP_CPP_AP_MD=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_md5.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +
  +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\htdigest.c
  +
  +!IF  "$(CFG)" == "htdigest - Win32 Release"
  +
   DEP_CPP_HTDIG=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -281,8 +319,6 @@
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTDIG=\
   	"..\include\ap_config_auto.h"\
  @@ -291,6 +327,23 @@
   
   "$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
   
  +
  +!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  +
  +DEP_CPP_HTDIG=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_md5.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +
  +"$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.10      +13 -13    apache-1.3/src/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- htpasswd.dsp	1999/08/08 18:20:10	1.9
  +++ htpasswd.dsp	2000/05/09 17:58:34	1.10
  @@ -41,8 +41,8 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
  +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
  +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  @@ -65,8 +65,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
  +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   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 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept
   # SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
  @@ -85,31 +85,31 @@
   # Name "htpasswd - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\ap\ap_cpystrn.c
  +SOURCE=..\ap\ap_base64.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_getpass.c
  +SOURCE=..\ap\ap_checkpass.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_md5c.c
  +SOURCE=..\ap\ap_cpystrn.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_snprintf.c
  +SOURCE=..\ap\ap_getpass.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_sha1.c
  +SOURCE=..\ap\ap_md5c.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_checkpass.c
  +SOURCE=..\ap\ap_sha1.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_base64.c
  +SOURCE=..\ap\ap_snprintf.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.10      +128 -136  apache-1.3/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- htpasswd.mak	1999/08/08 18:20:10	1.9
  +++ htpasswd.mak	2000/05/09 17:58:34	1.10
  @@ -49,41 +49,43 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ap_base64.obj"
  +	-@erase "$(INTDIR)\ap_checkpass.obj"
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
   	-@erase "$(INTDIR)\ap_getpass.obj"
   	-@erase "$(INTDIR)\ap_md5c.obj"
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
   	-@erase "$(INTDIR)\ap_sha1.obj"
  -	-@erase "$(INTDIR)\ap_checkpass.obj"
  -	-@erase "$(INTDIR)\ap_base64.obj"
  +	-@erase "$(INTDIR)\ap_snprintf.obj"
   	-@erase "$(INTDIR)\htpasswd.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\htpasswd.exe"
  +	-@erase "$(OUTDIR)\htpasswd.map"
   
   "$(OUTDIR)" :
  -	if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  +    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\htpasswd.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
   BSC32_SBRS= \
  -
  +	
   LINK32=link.exe
   LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:no\
  - /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" 
  + /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /machine:I386\
  + /out:"$(OUTDIR)\htpasswd.exe" 
   LINK32_OBJS= \
  +	"$(INTDIR)\ap_base64.obj" \
  +	"$(INTDIR)\ap_checkpass.obj" \
   	"$(INTDIR)\ap_cpystrn.obj" \
   	"$(INTDIR)\ap_getpass.obj" \
   	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_snprintf.obj" \
   	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_base64.obj" \
  +	"$(INTDIR)\ap_snprintf.obj" \
   	"$(INTDIR)\htpasswd.obj"
   
   "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -110,45 +112,46 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ap_base64.obj"
  +	-@erase "$(INTDIR)\ap_checkpass.obj"
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
   	-@erase "$(INTDIR)\ap_getpass.obj"
   	-@erase "$(INTDIR)\ap_md5c.obj"
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
   	-@erase "$(INTDIR)\ap_sha1.obj"
  -	-@erase "$(INTDIR)\ap_checkpass.obj"
  -	-@erase "$(INTDIR)\ap_base64.obj"
  +	-@erase "$(INTDIR)\ap_snprintf.obj"
   	-@erase "$(INTDIR)\htpasswd.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\htpasswd.exe"
   	-@erase "$(OUTDIR)\htpasswd.ilk"
  +	-@erase "$(OUTDIR)\htpasswd.map"
   	-@erase "$(OUTDIR)\htpasswd.pdb"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
  - /Fp"$(INTDIR)\htpasswd.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
   BSC32_SBRS= \
  -
  +	
   LINK32=link.exe
   LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:yes\
  - /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept 
  + /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /debug\
  + /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept 
   LINK32_OBJS= \
  +	"$(INTDIR)\ap_base64.obj" \
  +	"$(INTDIR)\ap_checkpass.obj" \
   	"$(INTDIR)\ap_cpystrn.obj" \
   	"$(INTDIR)\ap_getpass.obj" \
   	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_snprintf.obj" \
   	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_base64.obj" \
  +	"$(INTDIR)\ap_snprintf.obj" \
   	"$(INTDIR)\htpasswd.obj"
   
   "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -191,313 +194,302 @@
   
   !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\
    "htpasswd - Win32 Debug"
  -SOURCE=..\ap\ap_cpystrn.c
  +SOURCE=..\ap\ap_base64.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +DEP_CPP_AP_BA=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_CP=\
  +	
  +NODEP_CPP_AP_BA=\
  +	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\os.h"\
  -	"..\include\sfio.h"\
  -
  +	
   
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  +"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +DEP_CPP_AP_BA=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  +	
   
  -
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  +"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=..\ap\ap_getpass.c
  +SOURCE=..\ap\ap_checkpass.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_GE=\
  +DEP_CPP_AP_CH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_GE=\
  +	
  +NODEP_CPP_AP_CH=\
   	"..\include\ap_config_auto.h"\
   	"..\include\os.h"\
  -
  +	
   
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_GE=\
  +DEP_CPP_AP_CH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -
  +	
   
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=..\ap\ap_md5c.c
  +SOURCE=..\ap\ap_cpystrn.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_MD=\
  +DEP_CPP_AP_CP=\
  +	"..\include\alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_MD=\
  -	"..\ap\ebcdic.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_CP=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
   	"..\include\os.h"\
  -
  +	"..\include\sfio.h"\
  +	
   
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_MD=\
  +DEP_CPP_AP_CP=\
  +	"..\include\alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -
  +	"..\os\win32\readdir.h"\
  +	
   
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=..\ap\ap_snprintf.c
  +SOURCE=..\ap\ap_getpass.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  +DEP_CPP_AP_GE=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_SN=\
  +	
  +NODEP_CPP_AP_GE=\
   	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
   	"..\include\os.h"\
  -	"..\include\sfio.h"\
  -
  +	
   
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  +DEP_CPP_AP_GE=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -
  +	
   
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=..\ap\ap_sha1.c
  +SOURCE=..\ap\ap_md5c.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_SH=\
  +DEP_CPP_AP_MD=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  -	"..\include\ap_sha1.h"\
  +	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_SH=\
  +	
  +NODEP_CPP_AP_MD=\
   	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
   	"..\include\os.h"\
  -
  +	
   
  -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_SH=\
  +DEP_CPP_AP_MD=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  -	"..\include\ap_sha1.h"\
  +	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  +	
   
  -
  -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=..\ap\ap_checkpass.c
  +SOURCE=..\ap\ap_sha1.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_CH=\
  +DEP_CPP_AP_SH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_CH=\
  +	
  +NODEP_CPP_AP_SH=\
   	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
   	"..\include\os.h"\
  -
  +	
   
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_CH=\
  +DEP_CPP_AP_SH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  -
  +	
   
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ENDIF 
   
  -SOURCE=..\ap\ap_base64.c
  +SOURCE=..\ap\ap_snprintf.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
  -DEP_CPP_AP_BA=\
  +DEP_CPP_AP_SN=\
  +	"..\include\alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  -NODEP_CPP_AP_BA=\
  -	"..\ap\ebcdic.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_SN=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
   	"..\include\os.h"\
  -
  +	"..\include\sfio.h"\
  +	
   
  -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  -DEP_CPP_AP_BA=\
  +DEP_CPP_AP_SN=\
  +	"..\include\alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
  -
  +	"..\os\win32\readdir.h"\
  +	
   
  -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -513,17 +505,16 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\getopt.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -
  +	
   NODEP_CPP_HTPAS=\
   	"..\include\ap_config_auto.h"\
   	"..\include\os.h"\
  +	
   
  -
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
   
   
  @@ -535,10 +526,11 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\getopt.h"\
   	"..\os\win32\os.h"\
  -
  +	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
   
  
  
  
  1.19      +12 -3     apache-1.3/src/support/logresolve.c
  
  Index: logresolve.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/logresolve.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- logresolve.c	2000/01/26 04:36:00	1.18
  +++ logresolve.c	2000/05/09 17:58:34	1.19
  @@ -44,7 +44,7 @@
   
   #include <ctype.h>
   
  -#ifndef MPE
  +#if !defined(MPE) && !defined(WIN32)
   #ifndef BEOS
   #include <arpa/inet.h>
   #else
  @@ -52,7 +52,7 @@
   #include <netinet/in.h>
   #define NO_ADDRESS 4
   #endif /* BEOS */
  -#endif /* MPE */
  +#endif /* !MPE && !WIN32*/
   
   static void cgethost(struct in_addr ipnum, char *string, int check);
   static int getline(char *s, int n);
  @@ -105,7 +105,7 @@
   extern int h_errno; /* some machines don't have this in their headers */
   #endif
   
  -/* largeste value for h_errno */
  +/* largest value for h_errno */
   #define MAX_ERR (NO_ADDRESS)
   #define UNKNOWN_ERR (MAX_ERR+1)
   #define NO_REVERSE  (MAX_ERR+2)
  @@ -280,6 +280,11 @@
       char *bar, hoststring[MAXDNAME + 1], line[MAXLINE], *statfile;
       int i, check;
   
  +#ifdef WIN32
  +    WSADATA wsaData;
  +    WSAStartup(0x101, &wsaData);
  +#endif
  +
       check = 0;
       statfile = NULL;
       for (i = 1; i < argc; i++) {
  @@ -334,6 +339,10 @@
   	else
   	    puts(hoststring);
       }
  +
  +#ifdef WIN32
  +     WSACleanup();
  +#endif
   
       if (statfile != NULL) {
   	FILE *fp;
  
  
  
  1.1                  apache-1.3/src/support/logresolve.dsp
  
  Index: logresolve.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="logresolve" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Console Application" 0x0103
  
  CFG=logresolve - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "logresolve.mak".
  !MESSAGE 
  !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 "logresolve.mak" CFG="logresolve - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "logresolve - Win32 Release" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE "logresolve - Win32 Debug" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "logresolve - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  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 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
  # SUBTRACT LINK32 /pdb:none /nodefaultlib
  
  !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  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 /pdbtype:sept
  # ADD LINK32 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386
  # SUBTRACT LINK32 /pdb:none /nodefaultlib
  
  !ENDIF 
  
  # Begin Target
  
  # Name "logresolve - Win32 Release"
  # Name "logresolve - Win32 Debug"
  # Begin Source File
  
  SOURCE=.\logresolve.c
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  apache-1.3/src/support/logresolve.mak
  
  Index: logresolve.mak
  ===================================================================
  # Microsoft Developer Studio Generated NMAKE File, Based on logresolve.dsp
  !IF "$(CFG)" == ""
  CFG=logresolve - Win32 Debug
  !MESSAGE No configuration specified. Defaulting to logresolve - Win32 Debug.
  !ENDIF 
  
  !IF "$(CFG)" != "logresolve - Win32 Release" && "$(CFG)" !=\
   "logresolve - 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 "logresolve.mak" CFG="logresolve - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "logresolve - Win32 Release" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE "logresolve - 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 
  
  CPP=cl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "logresolve - Win32 Release"
  
  OUTDIR=.\Release
  INTDIR=.\Release
  # Begin Custom Macros
  OutDir=.\Release
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\logresolve.exe"
  
  !ELSE 
  
  ALL : "$(OUTDIR)\logresolve.exe"
  
  !ENDIF 
  
  CLEAN :
  	-@erase "$(INTDIR)\logresolve.obj"
  	-@erase "$(INTDIR)\vc50.idb"
  	-@erase "$(OUTDIR)\logresolve.exe"
  	-@erase "$(OUTDIR)\logresolve.map"
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
   "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
   /Fd"$(INTDIR)\\" /FD /c 
  CPP_OBJS=.\Release/
  CPP_SBRS=.
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\logresolve.bsc" 
  BSC32_SBRS= \
  	
  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console\
   /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map"\
   /machine:I386 /out:"$(OUTDIR)\logresolve.exe" 
  LINK32_OBJS= \
  	"$(INTDIR)\logresolve.obj"
  
  "$(OUTDIR)\logresolve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
      $(LINK32) @<<
    $(LINK32_FLAGS) $(LINK32_OBJS)
  <<
  
  !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
  
  OUTDIR=.\Debug
  INTDIR=.\Debug
  # Begin Custom Macros
  OutDir=.\Debug
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\logresolve.exe"
  
  !ELSE 
  
  ALL : "$(OUTDIR)\logresolve.exe"
  
  !ENDIF 
  
  CLEAN :
  	-@erase "$(INTDIR)\logresolve.obj"
  	-@erase "$(INTDIR)\vc50.idb"
  	-@erase "$(INTDIR)\vc50.pdb"
  	-@erase "$(OUTDIR)\logresolve.exe"
  	-@erase "$(OUTDIR)\logresolve.ilk"
  	-@erase "$(OUTDIR)\logresolve.map"
  	-@erase "$(OUTDIR)\logresolve.pdb"
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I\
   "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
   "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  CPP_OBJS=.\Debug/
  CPP_SBRS=.
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\logresolve.bsc" 
  BSC32_SBRS= \
  	
  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console\
   /incremental:yes /pdb:"$(OUTDIR)\logresolve.pdb"\
   /map:"$(INTDIR)\logresolve.map" /debug /machine:I386\
   /out:"$(OUTDIR)\logresolve.exe" 
  LINK32_OBJS= \
  	"$(INTDIR)\logresolve.obj"
  
  "$(OUTDIR)\logresolve.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) $< 
  <<
  
  
  !IF "$(CFG)" == "logresolve - Win32 Release" || "$(CFG)" ==\
   "logresolve - Win32 Debug"
  SOURCE=.\logresolve.c
  
  !IF  "$(CFG)" == "logresolve - Win32 Release"
  
  DEP_CPP_LOGRE=\
  	"..\include\ap_config.h"\
  	"..\include\ap_ctype.h"\
  	"..\include\ap_mmn.h"\
  	"..\include\hsregex.h"\
  	"..\os\win32\os.h"\
  	
  NODEP_CPP_LOGRE=\
  	"..\include\ap_config_auto.h"\
  	"..\include\os.h"\
  	
  
  "$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)"
  
  
  !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
  
  DEP_CPP_LOGRE=\
  	"..\include\ap_config.h"\
  	"..\include\ap_ctype.h"\
  	"..\include\ap_mmn.h"\
  	"..\include\hsregex.h"\
  	"..\os\win32\os.h"\
  	
  
  "$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)"
  
  
  !ENDIF 
  
  
  !ENDIF 
  
  
  
  
  1.1                  apache-1.3/src/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="rotatelogs" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Console Application" 0x0103
  
  CFG=rotatelogs - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "rotatelogs.mak".
  !MESSAGE 
  !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 "rotatelogs.mak" CFG="rotatelogs - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "rotatelogs - Win32 Release" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE "rotatelogs - Win32 Debug" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "rotatelogs - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  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 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 /map /machine:I386
  
  !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  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 /pdbtype:sept
  # ADD 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 /map /debug /machine:I386 /pdbtype:sept
  
  !ENDIF 
  
  # Begin Target
  
  # Name "rotatelogs - Win32 Release"
  # Name "rotatelogs - Win32 Debug"
  # Begin Source File
  
  SOURCE=.\rotatelogs.c
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  apache-1.3/src/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  # Microsoft Developer Studio Generated NMAKE File, Based on rotatelogs.dsp
  !IF "$(CFG)" == ""
  CFG=rotatelogs - Win32 Debug
  !MESSAGE No configuration specified. Defaulting to rotatelogs - Win32 Debug.
  !ENDIF 
  
  !IF "$(CFG)" != "rotatelogs - Win32 Release" && "$(CFG)" !=\
   "rotatelogs - 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 "rotatelogs.mak" CFG="rotatelogs - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "rotatelogs - Win32 Release" (based on\
   "Win32 (x86) Console Application")
  !MESSAGE "rotatelogs - 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 
  
  CPP=cl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "rotatelogs - Win32 Release"
  
  OUTDIR=.\Release
  INTDIR=.\Release
  # Begin Custom Macros
  OutDir=.\Release
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\rotatelogs.exe"
  
  !ELSE 
  
  ALL : "$(OUTDIR)\rotatelogs.exe"
  
  !ENDIF 
  
  CLEAN :
  	-@erase "$(INTDIR)\rotatelogs.obj"
  	-@erase "$(INTDIR)\vc50.idb"
  	-@erase "$(OUTDIR)\rotatelogs.exe"
  	-@erase "$(OUTDIR)\rotatelogs.map"
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
   "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
   /FD /c 
  CPP_OBJS=.\Release/
  CPP_SBRS=.
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" 
  BSC32_SBRS= \
  	
  LINK32=link.exe
  LINK32_FLAGS=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)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /machine:I386\
   /out:"$(OUTDIR)\rotatelogs.exe" 
  LINK32_OBJS= \
  	"$(INTDIR)\rotatelogs.obj"
  
  "$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
      $(LINK32) @<<
    $(LINK32_FLAGS) $(LINK32_OBJS)
  <<
  
  !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
  
  OUTDIR=.\Debug
  INTDIR=.\Debug
  # Begin Custom Macros
  OutDir=.\Debug
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\rotatelogs.exe"
  
  !ELSE 
  
  ALL : "$(OUTDIR)\rotatelogs.exe"
  
  !ENDIF 
  
  CLEAN :
  	-@erase "$(INTDIR)\rotatelogs.obj"
  	-@erase "$(INTDIR)\vc50.idb"
  	-@erase "$(INTDIR)\vc50.pdb"
  	-@erase "$(OUTDIR)\rotatelogs.exe"
  	-@erase "$(OUTDIR)\rotatelogs.ilk"
  	-@erase "$(OUTDIR)\rotatelogs.map"
  	-@erase "$(OUTDIR)\rotatelogs.pdb"
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I\
   "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  CPP_OBJS=.\Debug/
  CPP_SBRS=.
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" 
  BSC32_SBRS= \
  	
  LINK32=link.exe
  LINK32_FLAGS=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)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /debug\
   /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept 
  LINK32_OBJS= \
  	"$(INTDIR)\rotatelogs.obj"
  
  "$(OUTDIR)\rotatelogs.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) $< 
  <<
  
  
  !IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\
   "rotatelogs - Win32 Debug"
  SOURCE=.\rotatelogs.c
  
  !IF  "$(CFG)" == "rotatelogs - Win32 Release"
  
  DEP_CPP_ROTAT=\
  	"..\include\ap_config.h"\
  	"..\include\ap_ctype.h"\
  	"..\include\ap_mmn.h"\
  	"..\include\hsregex.h"\
  	"..\os\win32\os.h"\
  	
  NODEP_CPP_ROTAT=\
  	"..\include\ap_config_auto.h"\
  	"..\include\os.h"\
  	
  
  "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  
  
  !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
  
  DEP_CPP_ROTAT=\
  	"..\include\ap_config.h"\
  	"..\include\ap_ctype.h"\
  	"..\include\ap_mmn.h"\
  	"..\include\hsregex.h"\
  	"..\os\win32\os.h"\
  	
  
  "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  
  
  !ENDIF 
  
  
  !ENDIF 
  
  
  
  

Mime
View raw message