Final tweak and CREDITs ... switch the order to simplify things, and

  pull out the old dependency on ApacheMonitorVersion.rc

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

diff --git a/CHANGES b/CHANGES
index bec58dbb0e9dcbb186cb827fde0375cd911f2ada..765bac06a4dd4228684db5097179378ace2c34b0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.40
 
+  *) Fix a dependency error when building ApacheMonitor, so that Win32
+     and MSVC now trust that the project is current (when it is).
+     [James Cox <imajes@php.net>]
+
   *) mod_ext_filter: don't segfault if content-type is not set.  PR 10617.
      [Arthur P. Smith <apsmith@aps.org>, Jeff Trawick]
 

diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp
index 0f9d37a787928a9c63c913464a6d5363eeb65dca..78ccade3be3ff9137007b3fd0b4d73ca133c3081 100644 (file)
--- a/support/win32/ApacheMonitor.dsp
+++ b/support/win32/ApacheMonitor.dsp
@@ -133,8 +133,8 @@ SOURCE=..\..\build\win32\win32ver.awk
 InputPath=..\..\build\win32\win32ver.awk
 
 ".\ApacheMonitor.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h > .\ApacheMonitor.rc
-       copy ApacheMonitor.rc + ApacheMonitor.rc.in
+       type ApacheMonitor.rc.in > ApacheMonitor.rc
+       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h >> .\ApacheMonitor.rc
 
 # End Custom Build
 
@@ -144,8 +144,8 @@ InputPath=..\..\build\win32\win32ver.awk
 InputPath=..\..\build\win32\win32ver.awk
 
 ".\ApacheMonitor.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h > .\ApacheMonitor.rc
-       copy ApacheMonitor.rc + ApacheMonitor.rc.in
+       type ApacheMonitor.rc.in > ApacheMonitor.rc
+       awk -f ../../build/win32/win32ver.awk ApacheMonitor  "Apache HTTP Server Monitor" ../../include/ap_release.h >> .\ApacheMonitor.rc
 
 # End Custom Build
 

diff --git a/support/win32/ApacheMonitor.rc.in b/support/win32/ApacheMonitor.rc.in
index af51cc3b3f87bf03ba375a25bc4c9a08919d2dc9..2028623bc1b9284f0bbf5dc56e8059f55112bd3f 100644 (file)
--- a/support/win32/ApacheMonitor.rc.in
+++ b/support/win32/ApacheMonitor.rc.in
@@ -58,14 +58,10 @@
 
 #include <windows.h>
 
-#include "ApacheMonitor.h"
-
 IDI_APSRVMON            ICON    DISCARDABLE     "ApacheMonitor.ico"
 IDI_ICOSTOP             ICON    DISCARDABLE     "apstop.ico"
 IDI_ICORUN              ICON    DISCARDABLE     "aprun.ico"
 
-#include "ApacheMonitorVersion.rc"
-
 IDD_DLGSERVICES DIALOGEX 0, 0, 350, 188
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_MINIMIZEBOX | WS_VISIBLE | 
     WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU