You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jw...@apache.org on 2001/08/07 21:58:35 UTC
cvs commit: httpd-2.0/support/win32 ApacheMonitor.mak
jwoolley 01/08/07 12:58:35
Modified: support/win32 ApacheMonitor.mak
Log:
Oops, missed the .mak file update. [Again, I'm flying blind... somebody
please check this.]
Revision Changes Path
1.2 +83 -77 httpd-2.0/support/win32/ApacheMonitor.mak
Index: ApacheMonitor.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/support/win32/ApacheMonitor.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- ApacheMonitor.mak 2001/08/07 17:19:04 1.1
+++ ApacheMonitor.mak 2001/08/07 19:58:35 1.2
@@ -4,8 +4,7 @@
!MESSAGE No configuration specified. Defaulting to ApacheMonitor - Win32 Debug.
!ENDIF
-!IF "$(CFG)" != "ApacheMonitor - Win32 Release" && "$(CFG)" !=\
- "ApacheMonitor - Win32 Debug"
+!IF "$(CFG)" != "ApacheMonitor - Win32 Release" && "$(CFG)" != "ApacheMonitor - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
@@ -26,10 +25,6 @@
NULL=nul
!ENDIF
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
!IF "$(CFG)" == "ApacheMonitor - Win32 Release"
OUTDIR=.\Release
@@ -38,41 +33,61 @@
OutDir=.\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\ApacheMonitor.exe"
-
-!ELSE
-
ALL : "$(OUTDIR)\ApacheMonitor.exe"
-!ENDIF
CLEAN :
- -@erase "$(INTDIR)\ApacheMonitor.idb"
-@erase "$(INTDIR)\ApacheMonitor.obj"
-@erase "$(INTDIR)\ApacheMonitor.res"
+ -@erase "$(INTDIR)\vc60.idb"
-@erase "$(OUTDIR)\ApacheMonitor.exe"
- -@erase "$(OUTDIR)\ApacheMonitor.map"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheMonitor" /FD /c
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ApacheMonitor.res" /d "NDEBUG"
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+RSC_PROJ=/l 0x41a /fo"$(INTDIR)\ApacheMonitor.res" /d "NDEBUG"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheMonitor.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib\
- shell32.lib version.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)\ApacheMonitor.pdb" /map:"$(INTDIR)\ApacheMonitor.map"\
- /machine:I386 /out:"$(OUTDIR)\ApacheMonitor.exe"
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib comctl32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\ApacheMonitor.pdb" /machine:I386 /out:"$(OUTDIR)\ApacheMonitor.exe"
LINK32_OBJS= \
"$(INTDIR)\ApacheMonitor.obj" \
"$(INTDIR)\ApacheMonitor.res"
@@ -90,98 +105,89 @@
OutDir=.\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\ApacheMonitor.exe"
-
-!ELSE
-
ALL : "$(OUTDIR)\ApacheMonitor.exe"
-!ENDIF
CLEAN :
- -@erase "$(INTDIR)\ApacheMonitor.idb"
-@erase "$(INTDIR)\ApacheMonitor.obj"
-@erase "$(INTDIR)\ApacheMonitor.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
-@erase "$(OUTDIR)\ApacheMonitor.exe"
+ -@erase "$(OUTDIR)\ApacheMonitor.ilk"
-@erase "$(OUTDIR)\ApacheMonitor.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheMonitor" /FD /c
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ApacheMonitor.res" /d "_DEBUG"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheMonitor.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib\
- shell32.lib version.lib /nologo /subsystem:windows /incremental:no\
- /pdb:"$(OUTDIR)\ApacheMonitor.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheMonitor.exe"
-LINK32_OBJS= \
- "$(INTDIR)\ApacheMonitor.obj" \
- "$(INTDIR)\ApacheMonitor.res"
-
-"$(OUTDIR)\ApacheMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-!ENDIF
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-.c{$(CPP_OBJS)}.obj::
+.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(CPP_OBJS)}.obj::
+.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cxx{$(CPP_OBJS)}.obj::
+.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.c{$(CPP_SBRS)}.sbr::
+.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(CPP_SBRS)}.sbr::
+.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cxx{$(CPP_SBRS)}.sbr::
+.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+RSC_PROJ=/l 0x41a /fo"$(INTDIR)\ApacheMonitor.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheMonitor.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib version.lib comctl32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\ApacheMonitor.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ApacheMonitor.exe" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\ApacheMonitor.obj" \
+ "$(INTDIR)\ApacheMonitor.res"
+
+"$(OUTDIR)\ApacheMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
-!IF "$(CFG)" == "ApacheMonitor - Win32 Release" || "$(CFG)" ==\
- "ApacheMonitor - Win32 Debug"
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("ApacheMonitor.dep")
+!INCLUDE "ApacheMonitor.dep"
+!ELSE
+!MESSAGE Warning: cannot find "ApacheMonitor.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "ApacheMonitor - Win32 Release" || "$(CFG)" == "ApacheMonitor - Win32 Debug"
SOURCE=.\ApacheMonitor.rc
-DEP_RSC_APACH=\
- ".\apache_header.bmp"\
- ".\ApacheMonitor.ico"\
- ".\aprun.ico"\
- ".\apsmall.ico"\
- ".\apsrvmon.ico"\
- ".\apstop.ico"\
- ".\srun.bmp"\
- ".\sstop.bmp"\
-
-"$(INTDIR)\ApacheMonitor.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)"
+"$(INTDIR)\ApacheMonitor.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)