2008-11-19 13:51 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* common.mak * make_b32.mak * make_gcc.mak * make_vc.mak * Smoothened the difference between HARBOURFLAGS and HARBOURFLAGSDLL under the name HARBOURFLAGSLIB. Now all core .prg modules will be compiled with -n1 Harbour switch. This also means double compilation of .prg modules for static/dynamic libs could be optimized out as the object files are the same in both modes. TODO: Make -n1 switch unnecessary. * contrib/mtpl_gcc.mak + Added -n1 to HARBOURFLAGS. This way Harbour functions in libs will never be considered as entry points in executables or when any such module is built as dynamic lib in the future. * contrib/make_gcc_all.sh * Minor formatting.
2008-11-19 13:10:13 +00:00
parent 230eeecfc5
commit a883092600
7 changed files with 95 additions and 73 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,29 @@
   2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2008-11-19 13:51 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * common.mak
+  * make_b32.mak
+  * make_gcc.mak
+  * make_vc.mak
+    * Smoothened the difference between HARBOURFLAGS and 
+      HARBOURFLAGSDLL under the name HARBOURFLAGSLIB.
+      Now all core .prg modules will be compiled with -n1 
+      Harbour switch. This also means double compilation 
+      of .prg modules for static/dynamic libs could be 
+      optimized out as the object files are the same in 
+      both modes.
+      TODO: Make -n1 switch unnecessary.
+
+  * contrib/mtpl_gcc.mak
+    + Added -n1 to HARBOURFLAGS. This way Harbour functions 
+      in libs will never be considered as entry points in 
+      executables or when any such module is built as dynamic 
+      lib in the future.
+
+  * contrib/make_gcc_all.sh
+    * Minor formatting.
+
 2008-11-19 09:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
  * bin/hb-func.sh
  * mpkg_tgz.sh
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -98,8 +98,7 @@ HBFLAGSPLT     = -D__PLATFORM__WINCE
 !else
 HBFLAGSPLT     = -gc3
 !endif
-HARBOURFLAGS   = -n  $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR)
-HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR)
+HARBOURFLAGSLIB= -n1 $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) $(PRG_USR)
 HARBOURFLAGSEXE= -n  $(HBFLAGSCMN) $(HBFLAGSDBG) $(HBFLAGSPLT) -gc0 $(PRG_USR)

 #**********************************************************
--- a/harbour/contrib/make_gcc_all.sh
+++ b/harbour/contrib/make_gcc_all.sh
@@ -75,12 +75,12 @@ _HB_DIRS="${_HB_DIRS} ${HB_CONTRIB_ADDONS}"
 #**************************************************************

 for n in ${_HB_DIRS}; do
-  if [ -d $n ]; then
-    echo Entering $n ... \( $1 $2 $3 $4 $5\)
-    cd $n
-    [ -f ./make_gcc.sh ] && ${SHELL} -c "./make_gcc.sh $1 $2 $3 $4 $5"
-    cd ..
-  fi
+   if [ -d $n ]; then
+      echo Entering $n ... \( $1 $2 $3 $4 $5\)
+      cd $n
+      [ -f ./make_gcc.sh ] && ${SHELL} -c "./make_gcc.sh $1 $2 $3 $4 $5"
+      cd ..
+   fi
 done

 #**************************************************************
--- a/harbour/contrib/mtpl_gcc.mak
+++ b/harbour/contrib/mtpl_gcc.mak
@@ -123,7 +123,7 @@ endif

 CFLAGS         := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
 CLIBFLAGS      := -c $(CFLAGS) $(CLIBFLAGS)
-HARBOURFLAGS   := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   := -i$(INCLUDE_DIR) -n1 -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
 ifeq ($(HB_BUILD_DEBUG),yes)
 HARBOURFLAGS   := $(HARBOURFLAGS) -l-
 endif
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -138,7 +138,7 @@ ARFLAGS = /P64 $(A_USR)
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC Libraries
 {$(ALL_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $**
    $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC exe
@@ -154,7 +154,7 @@ ARFLAGS = /P64 $(A_USR)
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC MT Libraries
 {$(ALL_SRC_DIRS)}.prg{$(MT_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(MT_OBJ_DIR)\ $**
+    $(HB) $(HARBOURFLAGSLIB) -o$(MT_OBJ_DIR)\ $**
    $(CC) $(CLIBFLAGS) $(CFLAGSMT) -o$@ $(MT_OBJ_DIR)\$&.c
 #**********************************************************

@@ -165,7 +165,7 @@ ARFLAGS = /P64 $(A_USR)
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for SHARED MT Libraries
 {$(ALL_SRC_DIRS)}.prg{$(MTDLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(MTDLL_OBJ_DIR)\ $**
+    $(HB) $(HARBOURFLAGSLIB) -o$(MTDLL_OBJ_DIR)\ $**
    $(CC) $(CLIBFLAGSDLL) $(CFLAGSMT) -o$@ $(MTDLL_OBJ_DIR)\$&.c
 #**********************************************************

@@ -176,7 +176,7 @@ ARFLAGS = /P64 $(A_USR)
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for SHARED Libraries
 {$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $**
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $**
    $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
 #**********************************************************

--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -226,12 +226,12 @@ ARFLAGS = rc $(A_USR)
 #**********************************************************
 # General *.prg --> *.o COMPILE rule for STATIC Libraries
 $(OBJ_DIR)/%$(OBJEXT) : %.prg $(HARBOUR_EXE)
-	$(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)/ $<
+	$(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)/ $<
 	$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)/$(<F:.prg=.c)
 #----------------------------------------------------------
 # General *.prg --> *.o COMPILE rule for STATIC MT Libraries
 $(MT_OBJ_DIR)/%$(OBJEXT) : %.prg $(HARBOUR_EXE)
-	$(HB) $(HARBOURFLAGS) -o$(MT_OBJ_DIR)/ $<
+	$(HB) $(HARBOURFLAGSLIB) -o$(MT_OBJ_DIR)/ $<
 	$(CC) $(CLIBFLAGS) $(CFLAGSMT) -o$@ $(MT_OBJ_DIR)/$(<F:.prg=.c)
 #----------------------------------------------------------
 # General *.c --> *.o COMPILE rule for STATIC Libraries
@@ -244,12 +244,12 @@ $(MT_OBJ_DIR)/%$(OBJEXT) : %.c
 #*******************************************************
 # General *.prg --> *.o COMPILE rule for SHARED Libraries
 $(DLL_OBJ_DIR)/%$(OBJEXT) : %.prg $(HARBOUR_EXE)
-	$(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)/ $<
+	$(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)/ $<
 	$(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)/$(<F:.prg=.c)
 #----------------------------------------------------------
 # General *.prg --> *.o COMPILE rule for SHARED MT Libraries
 $(MTDLL_OBJ_DIR)/%$(OBJEXT) : %.prg $(HARBOUR_EXE)
-	$(HB) $(HARBOURFLAGSDLL) -o$(MTDLL_OBJ_DIR)/ $<
+	$(HB) $(HARBOURFLAGSLIB) -o$(MTDLL_OBJ_DIR)/ $<
 	$(CC) $(CLIBFLAGSDLL) $(CFLAGSMT) -o$@ $(MTDLL_OBJ_DIR)/$(<F:.prg=.c)
 #----------------------------------------------------------
 # General *.c --> *.o COMPILE rule for SHARED Libraries
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -311,111 +311,111 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 # General *.prg --> *.obj COMPILE rules for STATIC Libraries
 #*******************************************************
 {$(OBJ_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(COMMON_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PP_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(VM_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RTL_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(MACRO_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DEBUG_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(LANG_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(CODEPAGE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PCRE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBZLIB_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBEXTERN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RDD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(NULSYS_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFNTX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFCDX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFFPT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBSIX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HSX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(USRRDD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTCGI_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTPCA_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTSTD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWIN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWVT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTGUI_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(COMPILER_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBRUN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT):
@@ -446,7 +446,7 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 # General *.prg --> *.obj COMPILE rules for STATIC MT Libraries
 #*******************************************************
 {$(VM_DIR)}.prg{$(MT_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGS) -o$(MT_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(MT_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGS) $(CFLAGSMT) -Fo$(MT_OBJ_DIR)\ $(MT_OBJ_DIR)\$(*B).c
 #*******************************************************

@@ -461,7 +461,7 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 # General *.prg --> *.obj COMPILE rules for SHARED MT Libraries
 #*******************************************************
 {$(VM_DIR)}.prg{$(MTDLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(MTDLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(MTDLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) $(CFLAGSMT) -Fo$(MTDLL_OBJ_DIR)\ $(MTDLL_OBJ_DIR)\$(*B).c
 #*******************************************************

@@ -577,107 +577,107 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 # General *.prg --> *.obj COMPILE rules for SHARED Libraries
 #*******************************************************
 {$(DLL_OBJ_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(COMMON_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PP_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(VM_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RTL_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(MACRO_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DEBUG_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(LANG_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PCRE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBZLIB_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBEXTERN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(CODEPAGE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RDD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(NULSYS_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFNTX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFCDX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFFPT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBSIX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HSX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(USRRDD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTCGI_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTPCA_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTSTD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWIN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWVT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTGUI_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-    $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
    $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************

@@ -686,7 +686,7 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 # which use Harbour SHARED Library compiled as DLL
 #*******************************************************
 #{$(COMPILER_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-#    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+#    $(HB) $(HARBOURFLAGSLIB) -o$(DLL_OBJ_DIR)\ $<
 #    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBRUN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):