From 9e835b11e489a889cdf619332d2bf505ca396230 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 16 Nov 2007 14:38:03 +0000
Subject: [PATCH] 2007-11-16 15:37 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)    * make_b32.mak    * make_vc.mak      ! Fixed BC/VC make files
 to generated pptable.c in the obj        dir instead of source/pp.      !
 Synced BC/VC pptable.c dependencies with make_gcc.mak      ; Suggested by
 Przemek.

   * make_gcc.mak
     ! Fixed to not delete source/pp/pptable.c on clean
       (since it's never generated there).
---
 harbour/ChangeLog    | 14 +++++++++++++-
 harbour/make_b32.mak |  9 ++++-----
 harbour/make_gcc.mak |  1 -
 harbour/make_vc.mak  |  9 ++++-----
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index aab3dffc86..00080ce2e4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-16 15:37 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * make_b32.mak
+   * make_vc.mak
+     ! Fixed BC/VC make files to generated pptable.c in the obj 
+       dir instead of source/pp.
+     ! Synced BC/VC pptable.c dependencies with make_gcc.mak
+     ; Suggested by Przemek.
+
+   * make_gcc.mak
+     ! Fixed to not delete source/pp/pptable.c on clean 
+       (since it's never generated there).
+
 2007-11-16 14:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * include/hbsetup.ch
      ! Minor fix in comments.
@@ -99,7 +111,7 @@
        files added.
      ; TOFIX: There is still a potentially dangerous 
               warning to be fixed in FBGETBLOB().
-     ; Borrowed frmo xhb.
+     ; Borrowed from xhb.
 
    * contrib/hbzlib/make_b32.bat
    * contrib/hbzlib/make_vc.bat
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index 4980a3c85a..f23731ffbe 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -611,10 +611,10 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
 #**********************************************************
 # Generated by an intermediate utility hbppgen.exe
 # built at the initial phase of build process
-$(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c
-$(PP_DIR)\pptable.c    : include\hbstdgen.ch
-    IF EXIST "$(PP_DIR)\pptable.c" $(DEL) "$(PP_DIR)\pptable.c" > nul
-    $(HBPPGEN) include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q
+$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
+$(OBJ_DIR)\pptable.c   : include\hbstdgen.ch include\std.ch $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
+    IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
+    $(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q
 #**********************************************************
 
 !if "$(HB_REBUILD_PARSER)" == "yes"
@@ -681,7 +681,6 @@ doClean:
     -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
     -if exist $(OBJ_DIR)\*.c   $(DEL) $(OBJ_DIR)\*.c   > nul
     -if exist $(OBJ_DIR)\*.h   $(DEL) $(OBJ_DIR)\*.h   > nul
-    -if exist $(PP_DIR)\pptable.c    $(DEL) $(PP_DIR)\pptable.c    > nul
     -if exist $(DLL_OBJ_DIR)\*.obj   $(DEL) $(DLL_OBJ_DIR)\*.obj   > nul
     -if exist $(DLL_OBJ_DIR)\*.c     $(DEL) $(DLL_OBJ_DIR)\*.c     > nul
     -if exist $(DLL_OBJ_DIR)\*.h     $(DEL) $(DLL_OBJ_DIR)\*.h     > nul
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index 2bdb2952f5..fd7d122d44 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -497,7 +497,6 @@ doClean:
 	-$(DEL) $(DLL_OBJ_DIR)/*$(OBJEXT)
 	-$(DEL) $(DLL_OBJ_DIR)/*.c
 	-$(DEL) $(DLL_OBJ_DIR)/*.h
-	-$(DEL) $(PP_DIR)/pptable.c
 	-$(DEL) inst_$(HB_CC_NAME).log
 	-$(DEL) common.cf
 
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 0bffdc8611..d6ed65f1a6 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -977,10 +977,10 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
 
 # Generated by an intermediate utility hbppgen.exe
 # built at the initial phase of build process
-$(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c
-$(PP_DIR)\pptable.c    : include\hbstdgen.ch
-    IF EXIST "$(PP_DIR)\pptable.c" $(DEL) "$(PP_DIR)\pptable.c" > nul
-    $(HBPPGEN) include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q
+$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
+$(OBJ_DIR)\pptable.c   : include\hbstdgen.ch include\std.ch $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
+    IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
+    $(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q
 
 #**********************************************************
 
@@ -1051,7 +1051,6 @@ doClean:
     -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul
     -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul
     -if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul
-    -if exist $(PP_DIR)\pptable.c    $(DEL) $(PP_DIR)\pptable.c    > nul
     -if exist $(DLL_OBJ_DIR)\*.obj   $(DEL) $(DLL_OBJ_DIR)\*.obj   > nul
     -if exist $(DLL_OBJ_DIR)\*.c     $(DEL) $(DLL_OBJ_DIR)\*.c     > nul
     -if exist $(DLL_OBJ_DIR)\*.h     $(DEL) $(DLL_OBJ_DIR)\*.h     > nul