coar 99/01/26 08:46:29
Modified: src Makefile.nt Added: src/support htpasswd.dsp htpasswd.mak Log: The last bit of the MD5/DES password encryption work: make it compile on Win32. Submitted by: Ken Parzygnat <[EMAIL PROTECTED]>, Ryan Bloom <[EMAIL PROTECTED]> Reviewed by: Ken Coar Revision Changes Path 1.30 +3 -0 apache-1.3/src/Makefile.nt Index: Makefile.nt =================================================================== RCS file: /home/cvs/apache-1.3/src/Makefile.nt,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.nt 1998/11/01 08:56:34 1.29 +++ Makefile.nt 1999/01/26 16:46:25 1.30 @@ -55,6 +55,9 @@ cd ap nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak cd .. + cd support + nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak + cd .. cd main nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f gen_uri_delims.mak nmake /nologo CFG="gen_test_char - Win32 %LONG%" -f gen_test_char.mak 1.1 apache-1.3/src/support/htpasswd.dsp Index: htpasswd.dsp =================================================================== # Microsoft Developer Studio Project File - Name="htpasswd" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=htpasswd - 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 "htpasswd.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 "htpasswd.mak" CFG="htpasswd - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "htpasswd - Win32 Release" (based on\ "Win32 (x86) Console Application") !MESSAGE "htpasswd - 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)" == "htpasswd - 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" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /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 /machine:I386 !ELSEIF "$(CFG)" == "htpasswd - 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" /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 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 /debug /machine:I386 /pdbtype:sept !ENDIF # Begin Target # Name "htpasswd - Win32 Release" # Name "htpasswd - Win32 Debug" # Begin Source File SOURCE=..\ap\ap_md5c.c # End Source File # Begin Source File SOURCE=.\htpasswd.c # End Source File # End Target # End Project 1.1 apache-1.3/src/support/htpasswd.mak Index: htpasswd.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Based on htpasswd.dsp !IF "$(CFG)" == "" CFG=htpasswd - Win32 Debug !MESSAGE No configuration specified. Defaulting to htpasswd - Win32 Debug. !ENDIF !IF "$(CFG)" != "htpasswd - Win32 Release" && "$(CFG)" !=\ "htpasswd - 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 "htpasswd.mak" CFG="htpasswd - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "htpasswd - Win32 Release" (based on\ "Win32 (x86) Console Application") !MESSAGE "htpasswd - 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 !IF "$(CFG)" == "htpasswd - Win32 Release" OUTDIR=.\Release INTDIR=.\Release # Begin Custom Macros OutDir=.\Release # End Custom Macros !IF "$(RECURSE)" == "0" ALL : "$(OUTDIR)\htpasswd.exe" !ELSE ALL : "$(OUTDIR)\htpasswd.exe" !ENDIF CLEAN : [EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj" [EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\htpasswd.exe" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\ "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htpasswd.pch" /YX /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\Release/ 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) $< << RSC=rc.exe 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 ole32.lib oleaut32.lib uuid.lib odbc32.lib\ odbccp32.lib /nologo /subsystem:console /incremental:no\ /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\ap_md5c.obj" \ "$(INTDIR)\htpasswd.obj" "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" OUTDIR=.\Debug INTDIR=.\Debug # Begin Custom Macros OutDir=.\Debug # End Custom Macros !IF "$(RECURSE)" == "0" ALL : "$(OUTDIR)\htpasswd.exe" !ELSE ALL : "$(OUTDIR)\htpasswd.exe" !ENDIF CLEAN : [EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj" [EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb" [EMAIL PROTECTED] "$(OUTDIR)\htpasswd.exe" [EMAIL PROTECTED] "$(OUTDIR)\htpasswd.ilk" [EMAIL PROTECTED] "$(OUTDIR)\htpasswd.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\ "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htpasswd.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\Debug/ 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) $< << RSC=rc.exe 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 ole32.lib oleaut32.lib uuid.lib odbc32.lib\ odbccp32.lib /nologo /subsystem:console /incremental:yes\ /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\ /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept LINK32_OBJS= \ "$(INTDIR)\ap_md5c.obj" \ "$(INTDIR)\htpasswd.obj" "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ENDIF !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\ "htpasswd - Win32 Debug" SOURCE=..\ap\ap_md5c.c !IF "$(CFG)" == "htpasswd - Win32 Release" 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"\ {$(INCLUDE)}"sys\stat.h"\ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_AP_MD=\ "..\ap\ebcdic.h"\ "..\include\ap_config_auto.h"\ "..\include\os.h"\ "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "htpasswd - 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=.\htpasswd.c !IF "$(CFG)" == "htpasswd - Win32 Release" DEP_CPP_HTPAS=\ "..\include\ap_config.h"\ "..\include\ap_ctype.h"\ "..\include\ap_md5.h"\ "..\include\ap_mmn.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)" !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" DEP_CPP_HTPAS=\ "..\include\ap_config.h"\ "..\include\ap_ctype.h"\ "..\include\ap_md5.h"\ "..\include\ap_mmn.h"\ "..\include\hsregex.h"\ "..\os\win32\getopt.h"\ "..\os\win32\os.h"\ "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)" !ENDIF !ENDIF