Back to a slightly modified flavor of imajes' (James Cox'es) original

  design, only stay with .rc file extensions so the original resources
  can be reviewed in the resource editor, rather than using .in files.

  Also significantly improve the explicit dependencies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96043 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 61 insertions, 43 deletions

diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp
index a11ceefa15..735741251a 100644
--- a/support/win32/ApacheMonitor.dsp
+++ b/support/win32/ApacheMonitor.dsp
@@ -87,45 +87,6 @@ LINK32=link.exe
 
 # Name "ApacheMonitor - Win32 Release"
 # Name "ApacheMonitor - Win32 Debug"
-# Begin Group "Generated Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ApacheMonitorVer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="..\..\include\ap_release.h"	
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\ApacheMonitorVer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h > ApacheMonitorVer.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="..\..\include\ap_release.h"	
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\ApacheMonitorVer.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h > ApacheMonitorVer.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
 # Begin Group "Resource Files"
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
@@ -144,6 +105,15 @@ SOURCE=.\ApacheMonitor.ico
 # Begin Source File
 
 SOURCE=.\ApacheMonitor.rc
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -166,5 +136,57 @@ SOURCE=.\sstop.bmp
 
 SOURCE=.\ApacheMonitor.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\ApacheMonitorVer.rc
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__WIN32="..\..\include\ap_release.h"	".\ApacheMonitor.rc"	
+# Begin Custom Build - Creating versioned resources
+InputPath=..\..\build\win32\win32ver.awk
+
+".\ApacheMonitorVer.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* This file is autogenerated from ApacheMonitor.rc > ApacheMonitorVer.rc 
+	echo  * DO NOT EDIT! >> ApacheMonitorVer.rc 
+	echo  */ >> ApacheMonitorVer.rc 
+	type ApacheMonitor.rc >> ApacheMonitorVer.rc 
+	awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h >> ApacheMonitorVer.rc 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__WIN32="..\..\include\ap_release.h"	".\ApacheMonitor.rc"	
+# Begin Custom Build - Creating versioned resources
+InputPath=..\..\build\win32\win32ver.awk
+
+".\ApacheMonitorVer.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* This file is autogenerated from ApacheMonitor.rc > ApacheMonitorVer.rc 
+	echo  * DO NOT EDIT! >> ApacheMonitorVer.rc 
+	echo  */ >> ApacheMonitorVer.rc 
+	type ApacheMonitor.rc >> ApacheMonitorVer.rc 
+	awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h >> ApacheMonitorVer.rc 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Target
 # End Project
diff --git a/support/win32/ApacheMonitor.rc b/support/win32/ApacheMonitor.rc
index abbb7ae407..e54f006f0d 100644
--- a/support/win32/ApacheMonitor.rc
+++ b/support/win32/ApacheMonitor.rc
@@ -60,10 +60,6 @@
 
 #include "ApacheMonitor.h"
 
-/* Bring in our version resource generated from win32ver.awk
- */
-#include "ApacheMonitorVer.h"
-
 IDI_APSRVMON            ICON    DISCARDABLE     "ApacheMonitor.ico"
 IDI_ICOSTOP             ICON    DISCARDABLE     "apstop.ico"
 IDI_ICORUN              ICON    DISCARDABLE     "aprun.ico"