From 29b79449fd1acb239254c1a24c2f11fa0686038a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 18 Nov 2008 13:05:21 +0000
Subject: [PATCH] 2008-11-18 13:55 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * make_gcc.sh   * common.mak     ! Fixed previous and even older
 workaround for cyclic       reference in common.mak when used with GNU-make. 
    ; Please review/test.

---
 harbour/ChangeLog   |  8 +++++++-
 harbour/common.mak  | 24 +++++++++++++-----------
 harbour/make_gcc.sh |  2 --
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f441947b1b..addebb3af0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,4 +1,4 @@
-/*
+/*
  * $Id$
  */
 
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-18 13:55 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_gcc.sh
+  * common.mak
+    ! Fixed previous and even older workaround for cyclic 
+      reference in common.mak when used with GNU-make.
+    ; Please review/test.
 
 2008-11-18 00:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtwvg/wvggui.c
diff --git a/harbour/common.mak b/harbour/common.mak
index 58880e9cfb..17fa85d0b9 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------
 
 #**********************************************************
-# Common makefile.bc and makefile.vc definitions
+# Common make_*.mak definitions
 #**********************************************************
 
 #
@@ -91,16 +91,16 @@ INCLUDE_DIR = include
 
 HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l
 !if "$(HB_BUILD_DEBUG)" == "yes"
-HBFLAGSCMN     = $(HBFLAGSCMN) -l-
+HBFLAGSDBG     = -l-
 !endif
 !if "$(HB_BUILD_WINCE)" == "yes"
-HBFLAGSCMN     = $(HBFLAGSCMN) -D__PLATFORM__WINCE
+HBFLAGSPLT     = -D__PLATFORM__WINCE
 !else
-HBFLAGSCMN     = $(HBFLAGSCMN) -gc3
+HBFLAGSPLT     = -gc3
 !endif
-HARBOURFLAGS   = -n $(HBFLAGSCMN) $(PRG_USR)
-HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(PRG_USR)
-HARBOURFLAGSEXE= -n $(HBFLAGSCMN) -gc0 $(PRG_USR)
+HARBOURFLAGS   = -n  $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR)
+HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR)
+HARBOURFLAGSEXE= -n  $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) -gc0 $(PRG_USR)
 
 #**********************************************************
 # Directory macros. These should never have to change.
@@ -1231,7 +1231,7 @@ DISABLED_SHARED_MODULES=    \
 # Our default Targets
 #
 
-HB_BUILD_TARGETS = \
+HB_BUILD_TARGETS_MAIN = \
     $(HBMAINSTD_LIB)        \
     $(HBMAINWIN_LIB)        \
     $(COMMON_LIB)           \
@@ -1271,18 +1271,20 @@ HB_BUILD_TARGETS = \
 # variable HB_BUILD_DLL to yes
 
 !if "$(HB_BUILD_DLL)" != "no"
-HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(HARBOUR_DLL) $(HARBOURMT_DLL) $(HBTESTDLL_EXE) $(HBRUNDLL_EXE)
+HB_BUILD_TARGETS = $(HB_BUILD_TARGETS_MAIN) $(HARBOUR_DLL) $(HARBOURMT_DLL) $(HBTESTDLL_EXE) $(HBRUNDLL_EXE)
+!else
+HB_BUILD_TARGETS = $(HB_BUILD_TARGETS_MAIN)
 !endif
 
 #**********************************************************
-# Allows to do cross-compiling if neccesary.
+# Allows to do cross-compiling if necessary.
 #**********************************************************
 
 !ifndef HB
 HB = $(HARBOUR_EXE)
 !endif
 
-# allows to do cross-compiling if neccesary.
+# allows to do cross-compiling if necessary.
 !ifndef HBPP
 HBPP = $(HBPP_EXE)
 !endif
diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh
index 5dd1fba54e..0c934a9584 100755
--- a/harbour/make_gcc.sh
+++ b/harbour/make_gcc.sh
@@ -185,8 +185,6 @@ sed -e 's/;/ /g'             \
     -e 's/^!else/else/g'                                                \
     -e 's/^!endif/endif/g'                                              \
     -e 's/^!include/include/g'                                          \
-    -e 's/^HB_BUILD_TARGETS \=/HB_BUILD_TARGETS \:\=/g'                 \
-    -e 's/^HBFLAGSCMN     \=/HBFLAGSCMN     \:\=/g'                     \
     common.mak > common.cf
 
 $MAKE -r -f make_gcc.mak $MK_USR $*