From 18e01074d104f0ad52f012f9f24020c83b74dc2b Mon Sep 17 00:00:00 2001
From: Marek Paliwoda <paliwoda@inetia.pl>
Date: Mon, 26 Nov 2007 19:49:38 +0000
Subject: [PATCH] 2007-11-26 20:50 UTC+0100 Marek Paliwoda (mpaliwoda at
 interia pl)   * harbour/contrib/make_b32.bat   * harbour/contrib/make_vc.bat 
    * Removed TABS unintentionaly introduced in my last commit

---
 harbour/ChangeLog            |  7 ++-
 harbour/contrib/mtpl_b32.mak | 82 ++++++++++++++++++------------------
 harbour/contrib/mtpl_vc.mak  | 76 ++++++++++++++++-----------------
 3 files changed, 85 insertions(+), 80 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b90a334199..53267c8b7c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-26 20:50 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/contrib/make_b32.bat
+  * harbour/contrib/make_vc.bat
+    * Removed TABS unintentionaly introduced in my last commit
+
 2007-11-26 19:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * contrib/freeimage/make_b32.bat
    * contrib/freeimage/make_vc.bat
@@ -27,7 +32,7 @@
    * contrib/rdd_ads/make_vc.bat
    * contrib/mysql/make_b32.bat
    * contrib/mysql/make_vc.bat
-     ! Fixed CFLAGS assignments to not include %C_USR%, as this is 
+     ! Fixed CFLAGS assignments to not include %C_USR%, as this is
        done in the .mak files anyway.
 
    * contrib/what32/make_b32.bat
diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak
index 8f536f1e5c..204b0736a8 100644
--- a/harbour/contrib/mtpl_b32.mak
+++ b/harbour/contrib/mtpl_b32.mak
@@ -14,8 +14,8 @@
 
 # NOTE: You can use these optional envvars to configure the make process:
 #
-#   	C_USR   	 - Extra C compiler options for libraries
-#   	PRG_USR 	 - Extra Harbour compiler options
+#       C_USR        - Extra C compiler options for libraries
+#       PRG_USR      - Extra Harbour compiler options
 #
 
 .AUTODEPEND
@@ -99,11 +99,11 @@ MKLIB  = tlib.exe
 CFLAGS = -O2 $(CFLAGS)
 !endif
 
-CFLAGS  	   = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
+CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
-LDFLAGS 	   = $(LDFLAGS)
+LDFLAGS        = $(LDFLAGS)
 
 # This is needed, otherwise the libs may overflow when
 # debug info is requested with -v -y
@@ -120,16 +120,16 @@ $(OBJ_DIR);\
 #**********************************************************
 # General *.c --> *.obj COMPILE rule for STATIC Libraries
 {$(ALL_LIB_SRC_DIRS)}.c{$(OBJ_DIR)}$(OBJEXT):
-	$(CC) $(CLIBFLAGS) -o$@ $<
+    $(CC) $(CLIBFLAGS) -o$@ $<
 #**********************************************************
 # General *.cpp --> *.obj COMPILE rule for STATIC Libraries
 {$(ALL_LIB_SRC_DIRS)}.cpp{$(OBJ_DIR)}$(OBJEXT):
-	$(CC) $(CLIBFLAGS) -o$@ $<
+    $(CC) $(CLIBFLAGS) -o$@ $<
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC Libraries
 {$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT):
-	$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
-	$(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
+    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
+    $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
 #**********************************************************
 # General Library BUILD rule - does not work
 #{$(OBJ_DIR)}.obj{$(LIB_DIR)}.lib:
@@ -146,8 +146,8 @@ ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS)
 
 #**********************************************************
 $(LIB_PATH) : $(LIB_OBJS)
-	if exist "$(LIB_PATH)" $(DEL) "$(LIB_PATH)" > NUL
-	$(MKLIB) "$(LIB_PATH)" $(ARFLAGS) @&&!
+    if exist "$(LIB_PATH)" $(DEL) "$(LIB_PATH)" > NUL
+    $(MKLIB) "$(LIB_PATH)" $(ARFLAGS) @&&!
 +$(**: = &^
 +)
 !
@@ -160,33 +160,33 @@ Clean: doClean
 CLEAN: doClean
 
 doClean:
-	@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
-	@$(ECHO) @echo off  					> _hbdeloo.bat
-	@$(ECHO) if %1x == x goto SKIP  	   >> _hbdeloo.bat
-	@$(ECHO) if exist %1.c   $(DEL) %1.c   >> _hbdeloo.bat
-	@$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat
-	@$(ECHO) :SKIP  					   >> _hbdeloo.bat
-	@type &&!
+    @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
+    @$(ECHO) @echo off                      > _hbdeloo.bat
+    @$(ECHO) if %1x == x goto SKIP         >> _hbdeloo.bat
+    @$(ECHO) if exist %1.c   $(DEL) %1.c   >> _hbdeloo.bat
+    @$(ECHO) if exist %1.obj $(DEL) %1.obj >> _hbdeloo.bat
+    @$(ECHO) :SKIP                         >> _hbdeloo.bat
+    @type &&!
 @call _hbdeloo.bat $(LIB_OBJS:.obj=^
 @call _hbdeloo.bat )
 ! > _hbdeloa.bat
-	@_hbdeloa.bat
-	@if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
-	@if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
+    @_hbdeloa.bat
+    @if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
+    @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
 
 !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)"
-	@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
-	@$(ECHO) @echo off  												> _hbdelho.bat
-	@$(ECHO) if %1x == x goto SKIP  								   >> _hbdelho.bat
-	@$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat
-	@$(ECHO) :SKIP  												   >> _hbdelho.bat
-	@type &&!
+    @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
+    @$(ECHO) @echo off                                                  > _hbdelho.bat
+    @$(ECHO) if %1x == x goto SKIP                                     >> _hbdelho.bat
+    @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat
+    @$(ECHO) :SKIP                                                     >> _hbdelho.bat
+    @type &&!
 @call _hbdelho.bat $(ALL_HEADERS: =^
 @call _hbdelho.bat )
 ! > _hbdelha.bat
-	@_hbdelha.bat
-	@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
-	@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
+    @_hbdelha.bat
+    @if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
+    @if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
 !endif
 
 #**********************************************************
@@ -198,26 +198,26 @@ Install: doInstall
 INSTALL: doInstall
 
 doInstall:
-	@type &&!
+    @type &&!
 @echo off
 if not exist $(LIB_PATH) goto SKIP
 if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
 copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
 :SKIP
 ! > _hbcpyla.bat
-	@_hbcpyla.bat
-	@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
-	@$(ECHO) @echo off  												> _hbcpyho.bat
-	@$(ECHO) if %1x == x goto SKIP  								   >> _hbcpyho.bat
-	@$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat
-	@$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL)  				   >> _hbcpyho.bat
-	@$(ECHO) :SKIP  												   >> _hbcpyho.bat
-	@type &&!
+    @_hbcpyla.bat
+    @if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
+    @$(ECHO) @echo off                                                  > _hbcpyho.bat
+    @$(ECHO) if %1x == x goto SKIP                                     >> _hbcpyho.bat
+    @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbcpyho.bat
+    @$(ECHO) if exist %1 copy %1 $(HB_INC_INSTALL)                     >> _hbcpyho.bat
+    @$(ECHO) :SKIP                                                     >> _hbcpyho.bat
+    @type &&!
 @call _hbcpyho.bat $(ALL_HEADERS: =^
 @call _hbcpyho.bat )
 ! > _hbcpyha.bat
-	@_hbcpyha.bat
-	@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
-	@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
+    @_hbcpyha.bat
+    @if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
+    @if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
 
 #**********************************************************
diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak
index 2f474d171f..cd95e677ac 100644
--- a/harbour/contrib/mtpl_vc.mak
+++ b/harbour/contrib/mtpl_vc.mak
@@ -14,8 +14,8 @@
 
 # NOTE: You can use these optional envvars to configure the make process:
 #
-#   	C_USR   	 - Extra C compiler options for libraries
-#   	PRG_USR 	 - Extra Harbour compiler options
+#       C_USR        - Extra C compiler options for libraries
+#       PRG_USR      - Extra Harbour compiler options
 #
 
 #**********************************************************
@@ -92,11 +92,11 @@ MKLIB  = lib.exe
 
 #**********************************************************
 
-CFLAGS  	   = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS)
+CFLAGS         = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
-LDFLAGS 	   = $(LDFLAGS)
+LDFLAGS        = $(LDFLAGS)
 
 #**********************************************************
 # COMPILE Rules
@@ -105,16 +105,16 @@ LDFLAGS 	   = $(LDFLAGS)
 #**********************************************************
 # General *.c --> *.obj COMPILE rule for STATIC Libraries
 {.}.c{$(OBJ_DIR)}$(OBJEXT)::
-	$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
+    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 #**********************************************************
 # General *.cpp --> *.obj COMPILE rule for STATIC Libraries
 {.}.cpp{$(OBJ_DIR)}$(OBJEXT)::
-	$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
+    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 #**********************************************************
 # General *.prg --> *.obj COMPILE rule for STATIC Libraries
 {.}.prg{$(OBJ_DIR)}$(OBJEXT):
-	$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
-	$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
+    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+    $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #**********************************************************
 # General Library BUILD rule - does not work
 #{$(OBJ_DIR)}$(OBJEXT){$(LIB_PATH)}.lib:
@@ -130,8 +130,8 @@ ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS)
 
 #**********************************************************
 $(LIB_PATH) : $(LIB_OBJS)
-	if exist "$@" $(DEL) "$@" > nul
-	$(MKLIB) /out:$@ @<<
+    if exist "$@" $(DEL) "$@" > nul
+    $(MKLIB) /out:$@ @<<
 $**
 <<$(KEEPSTATE)
 #**********************************************************
@@ -143,31 +143,31 @@ Clean: doClean
 CLEAN: doClean
 
 doClean:
-	@if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
-	@$(ECHO) @echo off  					  > _hbdeloo.bat
-	@$(ECHO) if %%1x == x goto SKIP 		 >> _hbdeloo.bat
-	@$(ECHO) if exist %%1.c   $(DEL) %%1.c   >> _hbdeloo.bat
-	@$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat
-	@$(ECHO) :SKIP  						 >> _hbdeloo.bat
-	<<_hbdeloa.bat
+    @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul
+    @$(ECHO) @echo off                        > _hbdeloo.bat
+    @$(ECHO) if %%1x == x goto SKIP          >> _hbdeloo.bat
+    @$(ECHO) if exist %%1.c   $(DEL) %%1.c   >> _hbdeloo.bat
+    @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> _hbdeloo.bat
+    @$(ECHO) :SKIP                           >> _hbdeloo.bat
+    <<_hbdeloa.bat
 @call _hbdeloo.bat $(LIB_OBJS:.obj=^
 @call _hbdeloo.bat )
 <<KEEP
-	@if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
-	@if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
+    @if exist _hbdeloa.bat $(DEL) _hbdeloa.bat > nul
+    @if exist _hbdeloo.bat $(DEL) _hbdeloo.bat > nul
 
 !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)"
-	@if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
-	@$(ECHO) @echo off  					  > _hbdelho.bat
-	@$(ECHO) if %%1x == x goto SKIP 		 >> _hbdelho.bat
-	@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat
-	@$(ECHO) :SKIP  						 >> _hbdelho.bat
-	<<_hbdelha.bat
+    @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
+    @$(ECHO) @echo off                        > _hbdelho.bat
+    @$(ECHO) if %%1x == x goto SKIP          >> _hbdelho.bat
+    @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbdelho.bat
+    @$(ECHO) :SKIP                           >> _hbdelho.bat
+    <<_hbdelha.bat
 @call _hbdelho.bat $(ALL_HEADERS: =^
 @call _hbdelho.bat )
 <<KEEP
-	@if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
-	@if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
+    @if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul
+    @if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul
 !endif
 
 #**********************************************************
@@ -179,25 +179,25 @@ Install: doInstall
 INSTALL: doInstall
 
 doInstall:
-	<<_hbcpyla.bat
+    <<_hbcpyla.bat
 @echo off
 if not exist $(LIB_PATH) goto SKIP
 if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul
 copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul
 :SKIP
 <<KEEP
-	@_hbcpyla.bat
-	@if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
-	@$(ECHO) @echo off  							  > _hbcpyho.bat
-	@$(ECHO) if %%1x == x goto SKIP 				 >> _hbcpyho.bat
-	@$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat
-	@$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat
-	@$(ECHO) :SKIP  								 >> _hbcpyho.bat
-	<<_hbcpyha.bat
+    @_hbcpyla.bat
+    @if exist _hbcpyla.bat $(DEL) _hbcpyla.bat > nul
+    @$(ECHO) @echo off                                > _hbcpyho.bat
+    @$(ECHO) if %%1x == x goto SKIP                  >> _hbcpyho.bat
+    @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> _hbcpyho.bat
+    @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> _hbcpyho.bat
+    @$(ECHO) :SKIP                                   >> _hbcpyho.bat
+    <<_hbcpyha.bat
 @call _hbcpyho.bat $(ALL_HEADERS: =^
 @call _hbcpyho.bat )
 <<KEEP
-	@if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
-	@if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
+    @if exist _hbcpyha.bat $(DEL) _hbcpyha.bat > nul
+    @if exist _hbcpyho.bat $(DEL) _hbcpyho.bat > nul
 
 #**********************************************************