uri_delims.h and test_char.h are now invoked as part of assembling

  the apachecore, because post_build steps are ocassionaly quite flakey.
  Brings these three .mak's in line with the .dsp's.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@103374 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ApacheCore.mak b/src/ApacheCore.mak
index ffe0091c07e42d6dfbbc72426d9c736ef944e1b8..05c6348ea30591e11aae41a617c8ca3a1b432ef2 100644 (file)
--- a/src/ApacheCore.mak
+++ b/src/ApacheCore.mak
@@ -206,11 +206,11 @@ OutDir=.\Debug
 
 !IF "$(RECURSE)" == "0" 
 
-ALL : "$(OUTDIR)\ApacheCore.dll"
+ALL : ".\main\uri_delims.h" ".\main\test_char.h" "$(OUTDIR)\ApacheCore.dll"
 
 !ELSE 
 
-ALL : "Win9xConHook - Win32 Debug" "regex - Win32 Debug" "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug" "ApacheOS - Win32 Debug" "ap - Win32 Debug" "$(OUTDIR)\ApacheCore.dll"
+ALL : "Win9xConHook - Win32 Debug" "regex - Win32 Debug" "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug" "ApacheOS - Win32 Debug" "ap - Win32 Debug" ".\main\uri_delims.h" ".\main\test_char.h" "$(OUTDIR)\ApacheCore.dll"
 
 !ENDIF 
 
@@ -265,6 +265,8 @@ CLEAN :
        -@erase "$(OUTDIR)\ApacheCore.exp"
        -@erase "$(OUTDIR)\ApacheCore.lib"
        -@erase "$(OUTDIR)\ApacheCore.pdb"
+       -@erase ".\main\test_char.h"
+       -@erase ".\main\uri_delims.h"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -586,7 +588,7 @@ SOURCE=.\os\win32\service.c
 
 SOURCE=.\main\util.c
 
-"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" ".\main\test_char.h"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -610,7 +612,7 @@ SOURCE=.\main\util_script.c
 
 SOURCE=.\main\util_uri.c
 
-"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)" ".\main\uri_delims.h"
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -620,6 +622,58 @@ SOURCE=.\os\win32\util_win32.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\main\gen_test_char.exe
+
+!IF  "$(CFG)" == "ApacheCore - Win32 Release"
+
+InputPath=.\main\gen_test_char.exe
+
+".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       <<tempfile.bat 
+       @echo off 
+       .\main\gen_test_char.exe >.\main\test_char.h
+<< 
+       
+
+!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
+
+InputPath=.\main\gen_test_char.exe
+
+".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       <<tempfile.bat 
+       @echo off 
+       .\main\gen_test_char.exe >.\main\test_char.h
+<< 
+       
+
+!ENDIF 
+
+SOURCE=.\main\gen_uri_delims.exe
+
+!IF  "$(CFG)" == "ApacheCore - Win32 Release"
+
+InputPath=.\main\gen_uri_delims.exe
+
+".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       <<tempfile.bat 
+       @echo off 
+       .\main\gen_uri_delims.exe >.\main\uri_delims.h
+<< 
+       
+
+!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
+
+InputPath=.\main\gen_uri_delims.exe
+
+".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       <<tempfile.bat 
+       @echo off 
+       .\main\gen_uri_delims.exe >.\main\uri_delims.h
+<< 
+       
+
+!ENDIF 
+
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
 
 "ap - Win32 Release" : 

diff --git a/src/main/gen_test_char.mak b/src/main/gen_test_char.mak
index 7a1fcd2dfeb4b2902ecfbfe1cb732a1e9ea93ca8..bf3598ada92900d4837f2a2c151c7e5569d1f59f 100644 (file)
--- a/src/main/gen_test_char.mak
+++ b/src/main/gen_test_char.mak
@@ -92,20 +92,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create test_char.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_test_char.exe"
-   .\gen_test_char > test_char.h
-       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
 !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
 
 OUTDIR=.
@@ -174,20 +160,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create test_char.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_test_char.exe"
-   .\gen_test_char > test_char.h
-       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
 !ENDIF 
 
 

diff --git a/src/main/gen_uri_delims.mak b/src/main/gen_uri_delims.mak
index e0f9f60cea0723e8872f35c17819400eb04a1f5d..cd1a97887c7130fa537478347a8c302590332560 100644 (file)
--- a/src/main/gen_uri_delims.mak
+++ b/src/main/gen_uri_delims.mak
@@ -92,20 +92,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create uri_delims.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_uri_delims.exe"
-   .\gen_uri_delims > uri_delims.h
-       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
 !ELSEIF  "$(CFG)" == "gen_uri_delims - Win32 Debug"
 
 OUTDIR=.
@@ -174,20 +160,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-SOURCE="$(InputPath)"
-PostBuild_Desc=Create uri_delims.h
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_uri_delims.exe"
-   .\gen_uri_delims > uri_delims.h
-       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
 !ENDIF