From: William A. Rowe Jr Date: Thu, 4 Oct 2001 03:55:23 +0000 (+0000) Subject: Refresh the make files for 1.3.21's pending release. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80c0211c2c1424b61fe919f6e3ba9846c30759d8;p=thirdparty%2Fapache%2Fhttpd.git Refresh the make files for 1.3.21's pending release. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91271 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/Apache.mak b/src/Apache.mak index a70138f38ff..0324c5f60b3 100644 --- a/src/Apache.mak +++ b/src/Apache.mak @@ -25,9 +25,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "Apache - Win32 Release" OUTDIR=.\Release @@ -60,10 +57,43 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /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 RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" @@ -116,30 +146,11 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /debug /machine:I386\ - /out:"$(OUTDIR)\Apache.exe" -LINK32_OBJS= \ - "$(INTDIR)\apache.res" \ - "$(INTDIR)\main_win32.obj" \ - "$(OUTDIR)\ApacheCore.lib" - -"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -171,6 +182,28 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +RSC=rc.exe +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\apache.res" /d "_DEBUG" +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ + /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /debug /machine:I386\ + /out:"$(OUTDIR)\Apache.exe" +LINK32_OBJS= \ + "$(INTDIR)\apache.res" \ + "$(INTDIR)\main_win32.obj" \ + "$(OUTDIR)\ApacheCore.lib" + +"$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 Debug" SOURCE=.\os\win32\apache.rc diff --git a/src/ApacheCore.mak b/src/ApacheCore.mak index 10deb13172f..fd7759d4005 100644 --- a/src/ApacheCore.mak +++ b/src/ApacheCore.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheCore - Win32 Release" OUTDIR=.\Release @@ -109,12 +105,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I ".\include" /I ".\os\win32" /I\ ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ @@ -257,12 +287,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\os\win32" /I\ ".\os\win32\win9xconhook" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ @@ -329,36 +393,6 @@ 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)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\ "ApacheCore - Win32 Debug" @@ -1258,6 +1292,7 @@ DEP_CPP_REGIS=\ ".\include\util_uri.h"\ ".\os\win32\os.h"\ ".\os\win32\readdir.h"\ + ".\os\win32\service.h"\ NODEP_CPP_REGIS=\ ".\include\ap_config_auto.h"\ diff --git a/src/ap/ap.mak b/src/ap/ap.mak index e0c5cb777f9..593f3e18186 100644 --- a/src/ap/ap.mak +++ b/src/ap/ap.mak @@ -25,8 +25,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe - !IF "$(CFG)" == "ap - Win32 Release" OUTDIR=.\LibR @@ -62,10 +60,42 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c CPP_OBJS=.\LibR/ 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) $< +<< + BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" BSC32_SBRS= \ @@ -124,33 +154,11 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c CPP_OBJS=.\LibD/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib" -LIB32_OBJS= \ - "$(INTDIR)\ap_base64.obj" \ - "$(INTDIR)\ap_checkpass.obj" \ - "$(INTDIR)\ap_cpystrn.obj" \ - "$(INTDIR)\ap_fnmatch.obj" \ - "$(INTDIR)\ap_md5c.obj" \ - "$(INTDIR)\ap_sha1.obj" \ - "$(INTDIR)\ap_signal.obj" \ - "$(INTDIR)\ap_slack.obj" \ - "$(INTDIR)\ap_snprintf.obj" - -"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -182,6 +190,30 @@ LIB32_OBJS= \ $(CPP_PROJ) $< << +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib" +LIB32_OBJS= \ + "$(INTDIR)\ap_base64.obj" \ + "$(INTDIR)\ap_checkpass.obj" \ + "$(INTDIR)\ap_cpystrn.obj" \ + "$(INTDIR)\ap_fnmatch.obj" \ + "$(INTDIR)\ap_md5c.obj" \ + "$(INTDIR)\ap_sha1.obj" \ + "$(INTDIR)\ap_signal.obj" \ + "$(INTDIR)\ap_slack.obj" \ + "$(INTDIR)\ap_snprintf.obj" + +"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug" SOURCE=.\ap_base64.c diff --git a/src/lib/expat-lite/xmlparse.mak b/src/lib/expat-lite/xmlparse.mak index 85833a9096f..5c38ea4b245 100644 --- a/src/lib/expat-lite/xmlparse.mak +++ b/src/lib/expat-lite/xmlparse.mak @@ -27,10 +27,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "xmlparse - Win32 Release" OUTDIR=.\Release @@ -65,13 +61,47 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\xmltok" /I "..\xmlwf" /D "NDEBUG" /D\ "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D\ XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmlparse.bsc" BSC32_SBRS= \ @@ -128,35 +158,13 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\xmltok" /I "..\xmlwf" /D "_DEBUG"\ /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D\ XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse" /FD\ /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmlparse.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\xmlparse.pdb" /map:"$(INTDIR)\xmlparse.map" /debug\ - /machine:I386 /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll"\ - /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse -DEF_FILE= \ - ".\xmlparse.def" -LINK32_OBJS= \ - "$(INTDIR)\hashtable.obj" \ - "$(INTDIR)\xmlparse.obj" \ - "$(OUTDIR)\xmltok.lib" - -"$(OUTDIR)\xmlparse.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -188,6 +196,32 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmlparse.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\xmlparse.pdb" /map:"$(INTDIR)\xmlparse.map" /debug\ + /machine:I386 /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll"\ + /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse +DEF_FILE= \ + ".\xmlparse.def" +LINK32_OBJS= \ + "$(INTDIR)\hashtable.obj" \ + "$(INTDIR)\xmlparse.obj" \ + "$(OUTDIR)\xmltok.lib" + +"$(OUTDIR)\xmlparse.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "xmlparse - Win32 Release" || "$(CFG)" ==\ "xmlparse - Win32 Debug" diff --git a/src/lib/expat-lite/xmltok.mak b/src/lib/expat-lite/xmltok.mak index d75b9abc9c5..608459f6968 100644 --- a/src/lib/expat-lite/xmltok.mak +++ b/src/lib/expat-lite/xmltok.mak @@ -25,10 +25,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "xmltok - Win32 Release" OUTDIR=.\Release @@ -60,11 +56,45 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmltok.bsc" BSC32_SBRS= \ @@ -118,33 +148,11 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmltok.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\xmltok.pdb" /map:"$(INTDIR)\xmltok.map" /debug /machine:I386\ - /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\ - /base:@"..\..\os\win32\BaseAddr.ref",xmltok -DEF_FILE= \ - ".\xmltok.def" -LINK32_OBJS= \ - "$(INTDIR)\dllmain.obj" \ - "$(INTDIR)\xmlrole.obj" \ - "$(INTDIR)\xmltok.obj" - -"$(OUTDIR)\xmltok.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -176,6 +184,32 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmltok.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\xmltok.pdb" /map:"$(INTDIR)\xmltok.map" /debug /machine:I386\ + /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\ + /base:@"..\..\os\win32\BaseAddr.ref",xmltok +DEF_FILE= \ + ".\xmltok.def" +LINK32_OBJS= \ + "$(INTDIR)\dllmain.obj" \ + "$(INTDIR)\xmlrole.obj" \ + "$(INTDIR)\xmltok.obj" + +"$(OUTDIR)\xmltok.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "xmltok - Win32 Release" || "$(CFG)" == "xmltok - Win32 Debug" SOURCE=.\dllmain.c diff --git a/src/lib/sdbm/sdbm.mak b/src/lib/sdbm/sdbm.mak index cd0f231f0bb..c4037e892c7 100644 --- a/src/lib/sdbm/sdbm.mak +++ b/src/lib/sdbm/sdbm.mak @@ -25,8 +25,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe - !IF "$(CFG)" == "sdbm - Win32 Release" OUTDIR=.\LibR @@ -57,10 +55,42 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "WIN32"\ /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\sdbm" /FD /c CPP_OBJS=.\LibR/ 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) $< +<< + BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdbm.bsc" BSC32_SBRS= \ @@ -109,29 +139,12 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\sdbm" /FD /c CPP_OBJS=.\LibD/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdbm.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\sdbm.lib" -LIB32_OBJS= \ - "$(INTDIR)\sdbm.obj" \ - "$(INTDIR)\sdbm_hash.obj" \ - "$(INTDIR)\sdbm_lock.obj" \ - "$(INTDIR)\sdbm_pair.obj" - -"$(OUTDIR)\sdbm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -163,6 +176,25 @@ LIB32_OBJS= \ $(CPP_PROJ) $< << +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdbm.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\sdbm.lib" +LIB32_OBJS= \ + "$(INTDIR)\sdbm.obj" \ + "$(INTDIR)\sdbm_hash.obj" \ + "$(INTDIR)\sdbm_lock.obj" \ + "$(INTDIR)\sdbm_pair.obj" + +"$(OUTDIR)\sdbm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "sdbm - Win32 Release" || "$(CFG)" == "sdbm - Win32 Debug" SOURCE=.\sdbm.c diff --git a/src/main/gen_test_char.mak b/src/main/gen_test_char.mak index 8a3fdfd4e4d..32d8f7761f0 100644 --- a/src/main/gen_test_char.mak +++ b/src/main/gen_test_char.mak @@ -28,9 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "gen_test_char - Win32 Release" OUTDIR=. @@ -57,11 +54,44 @@ CLEAN : "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char"\ /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)\gen_test_char.bsc" BSC32_SBRS= \ @@ -119,11 +149,44 @@ CLEAN : "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\gen_test_char" /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)\gen_test_char.bsc" BSC32_SBRS= \ @@ -156,36 +219,6 @@ $(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_test_char.exe" !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)" == "gen_test_char - Win32 Release" || "$(CFG)" ==\ "gen_test_char - Win32 Debug" diff --git a/src/main/gen_uri_delims.mak b/src/main/gen_uri_delims.mak index 495c31836bf..81db6376098 100644 --- a/src/main/gen_uri_delims.mak +++ b/src/main/gen_uri_delims.mak @@ -29,9 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "gen_uri_delims - Win32 Release" OUTDIR=. @@ -58,10 +55,43 @@ CLEAN : "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /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)\gen_uri_delims.bsc" BSC32_SBRS= \ @@ -119,10 +149,43 @@ CLEAN : "$(INTDIR)" : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\ "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /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)\gen_uri_delims.bsc" BSC32_SBRS= \ @@ -155,36 +218,6 @@ $(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_uri_delims.exe" !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)" == "gen_uri_delims - Win32 Release" || "$(CFG)" ==\ "gen_uri_delims - Win32 Debug" diff --git a/src/os/win32/ApacheOS.mak b/src/os/win32/ApacheOS.mak index cdae43136ec..5118ba61f0e 100755 --- a/src/os/win32/ApacheOS.mak +++ b/src/os/win32/ApacheOS.mak @@ -26,8 +26,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe - !IF "$(CFG)" == "ApacheOS - Win32 Release" OUTDIR=.\LibR @@ -55,10 +53,42 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c CPP_OBJS=.\LibR/ 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) $< +<< + BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" BSC32_SBRS= \ @@ -101,25 +131,11 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c CPP_OBJS=.\LibD/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" -LIB32_OBJS= \ - "$(INTDIR)\os.obj" - -"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -151,6 +167,22 @@ LIB32_OBJS= \ $(CPP_PROJ) $< << +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" +LIB32_OBJS= \ + "$(INTDIR)\os.obj" + +"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" ==\ "ApacheOS - Win32 Debug" diff --git a/src/os/win32/Win9xConHook.mak b/src/os/win32/Win9xConHook.mak index fe05281fbd3..28f5632522c 100644 --- a/src/os/win32/Win9xConHook.mak +++ b/src/os/win32/Win9xConHook.mak @@ -29,10 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "Win9xConHook - Win32 Release" OUTDIR=.\Release @@ -62,11 +58,45 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" BSC32_SBRS= \ @@ -116,32 +146,11 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /debug /machine:I386\ - /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll"\ - /implib:"$(OUTDIR)\Win9xConHook.lib" -DEF_FILE= \ - ".\Win9xConHook.def" -LINK32_OBJS= \ - "$(INTDIR)\Win9xConHook.obj" - -"$(OUTDIR)\Win9xConHook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,6 +182,31 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ + /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ + /map:"$(INTDIR)\Win9xConHook.map" /debug /machine:I386\ + /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll"\ + /implib:"$(OUTDIR)\Win9xConHook.lib" +DEF_FILE= \ + ".\Win9xConHook.def" +LINK32_OBJS= \ + "$(INTDIR)\Win9xConHook.obj" + +"$(OUTDIR)\Win9xConHook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "Win9xConHook - Win32 Release" || "$(CFG)" ==\ "Win9xConHook - Win32 Debug" diff --git a/src/os/win32/mod_auth_anon.mak b/src/os/win32/mod_auth_anon.mak index 3166a11958f..d0866171bea 100644 --- a/src/os/win32/mod_auth_anon.mak +++ b/src/os/win32/mod_auth_anon.mak @@ -29,10 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_auth_anon - Win32 Release" OUTDIR=.\Release @@ -66,12 +62,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_auth_anon" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" BSC32_SBRS= \ @@ -124,31 +154,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_auth_anon" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_anon.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_anon.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -180,6 +191,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ + /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon +LINK32_OBJS= \ + "$(INTDIR)\mod_auth_anon.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_auth_anon.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_auth_anon - Win32 Release" || "$(CFG)" ==\ "mod_auth_anon - Win32 Debug" @@ -187,13 +221,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_anon - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -201,12 +235,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_auth_dbm.mak b/src/os/win32/mod_auth_dbm.mak index a27281b0783..ec4acf40a5b 100644 --- a/src/os/win32/mod_auth_dbm.mak +++ b/src/os/win32/mod_auth_dbm.mak @@ -29,10 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" OUTDIR=.\Release @@ -67,12 +63,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" BSC32_SBRS= \ @@ -127,32 +157,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_dbm.obj" \ - "..\..\Debug\ApacheCore.lib" \ - "..\..\lib\sdbm\LibD\sdbm.lib" - -"$(OUTDIR)\mod_auth_dbm.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -184,6 +194,30 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ + /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm +LINK32_OBJS= \ + "$(INTDIR)\mod_auth_dbm.obj" \ + "..\..\Debug\ApacheCore.lib" \ + "..\..\lib\sdbm\LibD\sdbm.lib" + +"$(OUTDIR)\mod_auth_dbm.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" || "$(CFG)" ==\ "mod_auth_dbm - Win32 Debug" @@ -191,13 +225,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -205,12 +239,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" @@ -220,12 +254,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" "sdbm - Win32 Release" : - cd "..\..\lib\sdbm" + cd "\clean\apache-1.3\src\lib\sdbm" $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" cd "..\..\os\win32" "sdbm - Win32 ReleaseCLEAN" : - cd "..\..\lib\sdbm" + cd "\clean\apache-1.3\src\lib\sdbm" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Release"\ RECURSE=1 cd "..\..\os\win32" @@ -233,12 +267,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" "sdbm - Win32 Debug" : - cd "..\..\lib\sdbm" + cd "\clean\apache-1.3\src\lib\sdbm" $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" cd "..\..\os\win32" "sdbm - Win32 DebugCLEAN" : - cd "..\..\lib\sdbm" + cd "\clean\apache-1.3\src\lib\sdbm" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Debug"\ RECURSE=1 cd "..\..\os\win32" diff --git a/src/os/win32/mod_auth_digest.mak b/src/os/win32/mod_auth_digest.mak index 197a2a91fc0..715e6e0dfdf 100644 --- a/src/os/win32/mod_auth_digest.mak +++ b/src/os/win32/mod_auth_digest.mak @@ -29,10 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_auth_digest - Win32 Release" OUTDIR=.\Release @@ -66,12 +62,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_auth_digest" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" BSC32_SBRS= \ @@ -125,32 +155,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_auth_digest" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /debug /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_digest.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -182,6 +192,30 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ + /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ + /map:"$(INTDIR)\mod_auth_digest.map" /debug /machine:I386\ + /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ + /base:@"BaseAddr.ref",mod_auth_digest +LINK32_OBJS= \ + "$(INTDIR)\mod_auth_digest.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_auth_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_auth_digest - Win32 Release" || "$(CFG)" ==\ "mod_auth_digest - Win32 Debug" @@ -189,13 +223,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_digest - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -203,12 +237,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_cern_meta.mak b/src/os/win32/mod_cern_meta.mak index 0bd858ceaa1..12c51ccb8d8 100644 --- a/src/os/win32/mod_cern_meta.mak +++ b/src/os/win32/mod_cern_meta.mak @@ -29,10 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_cern_meta - Win32 Release" OUTDIR=.\Release @@ -66,12 +62,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_cern_meta" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" BSC32_SBRS= \ @@ -124,31 +154,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_cern_meta" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta -LINK32_OBJS= \ - "$(INTDIR)\mod_cern_meta.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_cern_meta.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -180,6 +191,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ + /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta +LINK32_OBJS= \ + "$(INTDIR)\mod_cern_meta.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_cern_meta.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_cern_meta - Win32 Release" || "$(CFG)" ==\ "mod_cern_meta - Win32 Debug" @@ -187,13 +221,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_cern_meta - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -201,12 +235,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_digest.mak b/src/os/win32/mod_digest.mak index 833732228fc..7bf8274fa05 100644 --- a/src/os/win32/mod_digest.mak +++ b/src/os/win32/mod_digest.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_digest - Win32 Release" OUTDIR=.\Release @@ -65,12 +61,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_digest" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" BSC32_SBRS= \ @@ -123,31 +153,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_digest" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest -LINK32_OBJS= \ - "$(INTDIR)\mod_digest.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -179,6 +190,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ + /base:@"BaseAddr.ref",mod_digest +LINK32_OBJS= \ + "$(INTDIR)\mod_digest.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_digest - Win32 Release" || "$(CFG)" ==\ "mod_digest - Win32 Debug" @@ -186,13 +220,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_digest - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -200,12 +234,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_expires.mak b/src/os/win32/mod_expires.mak index 79010391e3e..0420f89b70f 100644 --- a/src/os/win32/mod_expires.mak +++ b/src/os/win32/mod_expires.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_expires - Win32 Release" OUTDIR=.\Release @@ -65,12 +61,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_expires" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" BSC32_SBRS= \ @@ -123,31 +153,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_expires" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_expires.so"\ - /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires -LINK32_OBJS= \ - "$(INTDIR)\mod_expires.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_expires.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -179,6 +190,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_expires.so"\ + /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires +LINK32_OBJS= \ + "$(INTDIR)\mod_expires.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_expires.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_expires - Win32 Release" || "$(CFG)" ==\ "mod_expires - Win32 Debug" @@ -186,13 +220,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_expires - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -200,12 +234,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_headers.mak b/src/os/win32/mod_headers.mak index ff38c7a17df..786f90637ec 100644 --- a/src/os/win32/mod_headers.mak +++ b/src/os/win32/mod_headers.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_headers - Win32 Release" OUTDIR=.\Release @@ -65,12 +61,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_headers" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" BSC32_SBRS= \ @@ -123,31 +153,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_headers" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_headers.so"\ - /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers -LINK32_OBJS= \ - "$(INTDIR)\mod_headers.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_headers.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -179,6 +190,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_headers.so"\ + /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers +LINK32_OBJS= \ + "$(INTDIR)\mod_headers.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_headers.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_headers - Win32 Release" || "$(CFG)" ==\ "mod_headers - Win32 Debug" @@ -186,13 +220,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_headers - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -200,12 +234,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_info.mak b/src/os/win32/mod_info.mak index bb48938677a..e809dd57924 100644 --- a/src/os/win32/mod_info.mak +++ b/src/os/win32/mod_info.mak @@ -27,10 +27,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_info - Win32 Release" OUTDIR=.\Release @@ -64,12 +60,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_info" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" BSC32_SBRS= \ @@ -122,31 +152,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_info" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info -LINK32_OBJS= \ - "$(INTDIR)\mod_info.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_info.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -178,6 +189,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ + /base:@"BaseAddr.ref",mod_info +LINK32_OBJS= \ + "$(INTDIR)\mod_info.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_info.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_info - Win32 Release" || "$(CFG)" ==\ "mod_info - Win32 Debug" @@ -185,13 +219,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_info - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -199,12 +233,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_proxy.mak b/src/os/win32/mod_proxy.mak index a37661e1f4b..b7670f82a0d 100644 --- a/src/os/win32/mod_proxy.mak +++ b/src/os/win32/mod_proxy.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_proxy - Win32 Release" OUTDIR=.\Release @@ -70,12 +66,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" BSC32_SBRS= \ @@ -138,36 +168,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\ - /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy -LINK32_OBJS= \ - "$(INTDIR)\mod_proxy.obj" \ - "$(INTDIR)\proxy_cache.obj" \ - "$(INTDIR)\proxy_connect.obj" \ - "$(INTDIR)\proxy_ftp.obj" \ - "$(INTDIR)\proxy_http.obj" \ - "$(INTDIR)\proxy_util.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -199,6 +205,34 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ + /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ + /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\ + /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy +LINK32_OBJS= \ + "$(INTDIR)\mod_proxy.obj" \ + "$(INTDIR)\proxy_cache.obj" \ + "$(INTDIR)\proxy_connect.obj" \ + "$(INTDIR)\proxy_ftp.obj" \ + "$(INTDIR)\proxy_http.obj" \ + "$(INTDIR)\proxy_util.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\ "mod_proxy - Win32 Debug" @@ -396,13 +430,13 @@ NODEP_CPP_PROXY_U=\ !IF "$(CFG)" == "mod_proxy - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -410,12 +444,12 @@ NODEP_CPP_PROXY_U=\ !ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_rewrite.mak b/src/os/win32/mod_rewrite.mak index e2134cdd0fa..32cc19b05bc 100644 --- a/src/os/win32/mod_rewrite.mak +++ b/src/os/win32/mod_rewrite.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_rewrite - Win32 Release" OUTDIR=.\Release @@ -66,12 +62,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" BSC32_SBRS= \ @@ -126,32 +156,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so"\ - /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite -LINK32_OBJS= \ - "$(INTDIR)\mod_rewrite.obj" \ - "$(INTDIR)\passwd.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_rewrite.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -183,6 +193,30 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so"\ + /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite +LINK32_OBJS= \ + "$(INTDIR)\mod_rewrite.obj" \ + "$(INTDIR)\passwd.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_rewrite.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_rewrite - Win32 Release" || "$(CFG)" ==\ "mod_rewrite - Win32 Debug" @@ -190,13 +224,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_rewrite - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -204,12 +238,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_speling.mak b/src/os/win32/mod_speling.mak index cec439e4e76..06dae977118 100644 --- a/src/os/win32/mod_speling.mak +++ b/src/os/win32/mod_speling.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_speling - Win32 Release" OUTDIR=.\Release @@ -65,12 +61,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_speling" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" BSC32_SBRS= \ @@ -123,31 +153,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_speling" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_speling.so"\ - /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling -LINK32_OBJS= \ - "$(INTDIR)\mod_speling.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_speling.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -179,6 +190,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_speling.so"\ + /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling +LINK32_OBJS= \ + "$(INTDIR)\mod_speling.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_speling.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_speling - Win32 Release" || "$(CFG)" ==\ "mod_speling - Win32 Debug" @@ -186,13 +220,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_speling - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -200,12 +234,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_status.mak b/src/os/win32/mod_status.mak index de5ff110503..925722f26c0 100644 --- a/src/os/win32/mod_status.mak +++ b/src/os/win32/mod_status.mak @@ -28,10 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_status - Win32 Release" OUTDIR=.\Release @@ -65,12 +61,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_status" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" BSC32_SBRS= \ @@ -123,31 +153,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_status" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status -LINK32_OBJS= \ - "$(INTDIR)\mod_status.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_status.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -179,6 +190,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ + /base:@"BaseAddr.ref",mod_status +LINK32_OBJS= \ + "$(INTDIR)\mod_status.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_status.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_status - Win32 Release" || "$(CFG)" ==\ "mod_status - Win32 Debug" @@ -186,13 +220,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_status - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -200,12 +234,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/os/win32/mod_usertrack.mak b/src/os/win32/mod_usertrack.mak index 761e7d22e09..f21ab36696b 100644 --- a/src/os/win32/mod_usertrack.mak +++ b/src/os/win32/mod_usertrack.mak @@ -29,10 +29,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "mod_usertrack - Win32 Release" OUTDIR=.\Release @@ -66,12 +62,46 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_usertrack" /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) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" BSC32_SBRS= \ @@ -124,31 +154,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\mod_usertrack" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack -LINK32_OBJS= \ - "$(INTDIR)\mod_usertrack.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_usertrack.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -180,6 +191,29 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ + /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack +LINK32_OBJS= \ + "$(INTDIR)\mod_usertrack.obj" \ + "..\..\Debug\ApacheCore.lib" + +"$(OUTDIR)\mod_usertrack.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "mod_usertrack - Win32 Release" || "$(CFG)" ==\ "mod_usertrack - Win32 Debug" @@ -187,13 +221,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_usertrack - Win32 Release" "ApacheCore - Win32 Release" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Release" RECURSE=1 cd ".\os\win32" @@ -201,12 +235,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" "ApacheCore - Win32 Debug" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" cd ".\os\win32" "ApacheCore - Win32 DebugCLEAN" : - cd "..\.." + cd "\clean\apache-1.3\src" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ CFG="ApacheCore - Win32 Debug" RECURSE=1 cd ".\os\win32" diff --git a/src/regex/regex.mak b/src/regex/regex.mak index 2cbe0367e67..a74e3e175f9 100644 --- a/src/regex/regex.mak +++ b/src/regex/regex.mak @@ -25,8 +25,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe - !IF "$(CFG)" == "regex - Win32 Release" OUTDIR=.\LibR @@ -57,10 +55,42 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\ "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c CPP_OBJS=.\LibR/ 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) $< +<< + BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc" BSC32_SBRS= \ @@ -109,28 +139,11 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" RSC=rc.exe +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D\ "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c CPP_OBJS=.\LibD/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\regex.lib" -LIB32_OBJS= \ - "$(INTDIR)\regcomp.obj" \ - "$(INTDIR)\regerror.obj" \ - "$(INTDIR)\regexec.obj" \ - "$(INTDIR)\regfree.obj" - -"$(OUTDIR)\regex.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -162,6 +175,25 @@ LIB32_OBJS= \ $(CPP_PROJ) $< << +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\regex.lib" +LIB32_OBJS= \ + "$(INTDIR)\regcomp.obj" \ + "$(INTDIR)\regerror.obj" \ + "$(INTDIR)\regexec.obj" \ + "$(INTDIR)\regfree.obj" + +"$(OUTDIR)\regex.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "regex - Win32 Release" || "$(CFG)" == "regex - Win32 Debug" SOURCE=.\regcomp.c diff --git a/src/support/htdigest.mak b/src/support/htdigest.mak index e2a53ad44d8..1742062da1e 100644 --- a/src/support/htdigest.mak +++ b/src/support/htdigest.mak @@ -27,9 +27,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "htdigest - Win32 Release" OUTDIR=.\Release @@ -60,11 +57,44 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest" /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)\htdigest.bsc" BSC32_SBRS= \ @@ -115,31 +145,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\htdigest" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\htdigest.exe" -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) @<< @@ -171,6 +182,28 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ + /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /debug\ + /machine:I386 /out:"$(OUTDIR)\htdigest.exe" +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 + !IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" ==\ "htdigest - Win32 Debug" diff --git a/src/support/htpasswd.mak b/src/support/htpasswd.mak index 796d819ff41..bd63e86a521 100644 --- a/src/support/htpasswd.mak +++ b/src/support/htpasswd.mak @@ -27,9 +27,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "htpasswd - Win32 Release" OUTDIR=.\Release @@ -64,11 +61,44 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D\ "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\htpasswd" /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= \ @@ -127,35 +157,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /debug\ - /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_sha1.obj" \ - "$(INTDIR)\ap_snprintf.obj" \ - "$(INTDIR)\htpasswd.obj" - -"$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -187,6 +194,32 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no\ + /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /debug\ + /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_sha1.obj" \ + "$(INTDIR)\ap_snprintf.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" diff --git a/src/support/logresolve.mak b/src/support/logresolve.mak index f12484cebf8..a427fa9877c 100644 --- a/src/support/logresolve.mak +++ b/src/support/logresolve.mak @@ -28,9 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "logresolve - Win32 Release" OUTDIR=.\Release @@ -58,11 +55,44 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D\ "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\logresolve" /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)\logresolve.bsc" BSC32_SBRS= \ @@ -107,28 +137,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\logresolve" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\logresolve.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no\ - /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) @<< @@ -160,6 +174,25 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\logresolve.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no\ + /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 + !IF "$(CFG)" == "logresolve - Win32 Release" || "$(CFG)" ==\ "logresolve - Win32 Debug" diff --git a/src/support/rotatelogs.mak b/src/support/rotatelogs.mak index dfcd590176b..723b04b0d15 100644 --- a/src/support/rotatelogs.mak +++ b/src/support/rotatelogs.mak @@ -28,9 +28,6 @@ NULL= NULL=nul !ENDIF -CPP=cl.exe -RSC=rc.exe - !IF "$(CFG)" == "rotatelogs - Win32 Release" OUTDIR=.\Release @@ -61,11 +58,44 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs"\ /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)\rotatelogs.bsc" BSC32_SBRS= \ @@ -116,31 +146,12 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\rotatelogs" /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 wsock32.lib /nologo /subsystem:console\ - /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" -LINK32_OBJS= \ - "$(INTDIR)\ap_cpystrn.obj" \ - "$(INTDIR)\ap_snprintf.obj" \ - "$(INTDIR)\os.obj" \ - "$(INTDIR)\rotatelogs.obj" - -"$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -172,6 +183,28 @@ LINK32_OBJS= \ $(CPP_PROJ) $< << +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\ + /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\ + /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" +LINK32_OBJS= \ + "$(INTDIR)\ap_cpystrn.obj" \ + "$(INTDIR)\ap_snprintf.obj" \ + "$(INTDIR)\os.obj" \ + "$(INTDIR)\rotatelogs.obj" + +"$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\ "rotatelogs - Win32 Debug"