stoddard 99/06/08 10:05:46
Modified: src/support htpasswd.dsp htpasswd.mak Log: Fix Win32 compile break. Revision Changes Path 1.6 +7 -3 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htpasswd.dsp 1999/06/05 19:10:05 1.5 +++ htpasswd.dsp 1999/06/08 17:05:43 1.6 @@ -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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" @@ -74,8 +74,8 @@ # 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -94,6 +94,10 @@ # Begin Source File SOURCE=..\ap\ap_md5c.c +# End Source File +# Begin Source File + +SOURCE=..\ap\ap_snprintf.c # End Source File # Begin Source File 1.6 +40 -21 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- htpasswd.mak 1999/06/05 19:10:06 1.5 +++ htpasswd.mak 1999/06/08 17:05:44 1.6 @@ -52,6 +52,7 @@ [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_getpass.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\htpasswd.exe" @@ -70,12 +71,13 @@ LINK32=link.exe LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no\ + advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:console /incremental:no\ /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\ap_cpystrn.obj" \ "$(INTDIR)\ap_getpass.obj" \ "$(INTDIR)\ap_md5c.obj" \ + "$(INTDIR)\ap_snprintf.obj" \ "$(INTDIR)\htpasswd.obj" "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -105,6 +107,7 @@ [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_getpass.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb" @@ -125,14 +128,15 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib /nologo /subsystem:console /incremental:yes\ - /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\ +LINK32_FLAGS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ + comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\ + /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\ /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept LINK32_OBJS= \ "$(INTDIR)\ap_cpystrn.obj" \ "$(INTDIR)\ap_getpass.obj" \ "$(INTDIR)\ap_md5c.obj" \ + "$(INTDIR)\ap_snprintf.obj" \ "$(INTDIR)\htpasswd.obj" "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -176,9 +180,6 @@ !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\ "htpasswd - Win32 Debug" SOURCE=..\ap\ap_cpystrn.c - -!IF "$(CFG)" == "htpasswd - Win32 Release" - DEP_CPP_AP_CP=\ "..\include\alloc.h"\ "..\include\ap.h"\ @@ -196,44 +197,41 @@ "$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) - -!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" -DEP_CPP_AP_CP=\ - "..\include\alloc.h"\ +SOURCE=..\ap\ap_getpass.c +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_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)" +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +SOURCE=..\ap\ap_md5c.c -SOURCE=..\ap\ap_getpass.c -DEP_CPP_AP_GE=\ +!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"\ -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)" +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\ap\ap_md5c.c +!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" + DEP_CPP_AP_MD=\ "..\include\ap.h"\ "..\include\ap_config.h"\ @@ -245,6 +243,27 @@ "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=..\ap\ap_snprintf.c +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_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE)