2009-07-11 18:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/dos/global.cf * config/win/global.cf * config/win/mingw.cf * config/os2/gcc.cf * config/os2/global.cf * config/wce/global.cf * config/wce/mingwarm.cf * Synced variables as follows: LIB_ARCH_DOS -> DOS_LIB_ARCH OS2_LIB_ARCH -> DOS_LIB_ARCH ARCH_DOS -> DOS_ARCH_DIR OS2_ARCH_DIR -> DOS_ARCH_DIR LIB_DIR_DOS -> DOS_LIB_DIR OS2_LIB_DIR -> DOS_LIB_DIR OS2_LIB_PATH -> DOS_LIB_PATH
2009-07-11 17:03:15 +00:00
parent 6aa07de413
commit fc13c8b7c0
8 changed files with 65 additions and 48 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-07-11 18:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/dos/global.cf
+  * config/win/global.cf
+  * config/win/mingw.cf
+  * config/os2/gcc.cf
+  * config/os2/global.cf
+  * config/wce/global.cf
+  * config/wce/mingwarm.cf
+    * Synced variables as follows:
+      LIB_ARCH_DOS -> DOS_LIB_ARCH
+      OS2_LIB_ARCH -> DOS_LIB_ARCH
+      ARCH_DOS     -> DOS_ARCH_DIR
+      OS2_ARCH_DIR -> DOS_ARCH_DIR
+      LIB_DIR_DOS  -> DOS_LIB_DIR
+      OS2_LIB_DIR  -> DOS_LIB_DIR
+      OS2_LIB_PATH -> DOS_LIB_PATH
+
 2009-07-11 18:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * config/os2/global.cf
    ! Fix to prev.
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -23,12 +23,12 @@ ifeq ($(SHLVL),) # non-bash

 # There is a conflict with the use of '\' and '/' characters
 # The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
-# and some DOS commands require '\' (ARCH_DOS)
+# and some DOS commands require '\' (DOS_ARCH_DIR)
 ARCH_DIR = $(subst \,/,$(HB_ARCH))
-ARCH_DOS = $(subst /,\,$(HB_ARCH))
-LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
+DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
+DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
 LIB_PATH_DOS = $(subst /,\,$(LIB_PATH))
-LIB_ARCH_DOS = $(subst /,\,$(LIB_ARCH))
+DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
 DIRSEP = $(subst /,\,\)

 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -57,13 +57,13 @@ MD = md
 RANLIB = ranlib

 dirbase::
-	-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %d\nul $(MD) %d
-	$(if $(LIB_PATH_DOS),-@$(COMSPEC) /Cfor %d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %d\nul $(MD) %d,)
+	-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR)) do if not exist %d\nul $(MD) %d
+	$(if $(LIB_PATH_DOS),-@$(COMSPEC) /Cfor %d in ($(LIB_PATH_DOS) $(DOS_LIB_DIR)) do if not exist %d\nul $(MD) %d,)

 clean::
-	-@$(COMSPEC) /Cfor %f in ($(ARCH_DOS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
-	-@$(COMSPEC) /Cfor %d in ($(ARCH_DOS) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
-	$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /Cif exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
+	-@$(COMSPEC) /Cfor %f in ($(DOS_ARCH_DIR)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
+	-@$(COMSPEC) /Cfor %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
+	$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /Cif exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)

 else  # bash

--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -100,7 +100,7 @@ endif
 # We have to use a script to overcome the AR limit of max 850 characters
 # in commmand line
 define create_library
-IF EXIST $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH)
+IF EXIST $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH)
 echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
 for %i in ( *$(OBJ_EXT) ) do @echo ADDMOD %i >> __lib__.tmp
 echo SAVE >> __lib__.tmp
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -18,10 +18,10 @@ HB_GT_LIBS := $(HB_GT_LIST)
 ifeq ($(SHLVL),) # non-bash

 ARCH_DIR = $(HB_ARCH)
-OS2_ARCH_DIR = $(subst /,\,$(HB_ARCH))
-OS2_LIB_DIR  = $(subst /,\,$(LIB_DIR))
-OS2_LIB_PATH = $(subst /,\,$(LIB_PATH))
-OS2_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
+DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
+DOS_LIB_DIR  = $(subst /,\,$(LIB_DIR))
+DOS_LIB_PATH = $(subst /,\,$(LIB_PATH))
+DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
 DIRSEP = $(subst /,\,\)

 MK = $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -41,12 +41,12 @@ ifeq ($(OS2_SHELL),) # non-OS/2
   MV = move

 dirbase::
-	-@$(COMSPEC) /c if not exist $(OS2_ARCH_DIR)\. $(MD) $(OS2_ARCH_DIR)
-	$(if $(OS2_LIB_DIR),-@$(COMSPEC) /c if not exist $(OS2_LIB_DIR)\. $(MD) $(OS2_LIB_DIR),)
+	-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
+	$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)

 clean::
-	-@$(COMSPEC) /c if exist $(OS2_ARCH_DIR) $(RD) $(OS2_ARCH_DIR)
-	$(if $(OS2_LIB_ARCH),-@$(COMSPEC) /c if exist $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH),)
+	-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
+	$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)

 else # OS/2
   RM = del /n
@@ -58,21 +58,21 @@ else # OS/2
 ifeq ($(LIB_PATH),)

 dirbase::
-	-for %d in ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR)) do if not exist %d $(MD) %d
+	-for %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR)) do if not exist %d $(MD) %d

 clean::
-	-if exist $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-	-for %d in ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
+	-if exist $(DOS_ARCH_DIR)\*.* $(RM) $(DOS_ARCH_DIR)\*.*
+	-for %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d

 else

 dirbase::
-	-for %d in ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR) $(OS2_LIB_PATH) $(OS2_LIB_DIR)) do if not exist %d $(MD) %d
+	-for %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR) $(DOS_LIB_PATH) $(DOS_LIB_DIR)) do if not exist %d $(MD) %d

 clean::
-	-if exist $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-	-for %d in ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-	-if exist $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH)
+	-if exist $(DOS_ARCH_DIR)\*.* $(RM) $(DOS_ARCH_DIR)\*.*
+	-for %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
+	-if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH)

 endif

@@ -90,7 +90,7 @@ MV = mv -f
 MD = mkdir
 MDP = mkdir -p

-OS2_LIB_ARCH = $(LIB_ARCH)
+DOS_LIB_ARCH = $(LIB_ARCH)

 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -30,11 +30,11 @@ ifeq ($(SHLVL),) # non-bash

 # There is a conflict with the use of '\' and '/' characters
 # The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
-# and some DOS commands require '\' (ARCH_DOS)
+# and some DOS commands require '\' (DOS_ARCH_DIR)
 ARCH_DIR = $(subst \,/,$(HB_ARCH))
-ARCH_DOS = $(subst /,\,$(HB_ARCH))
-LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
-LIB_ARCH_DOS = $(subst /,\,$(LIB_ARCH))
+DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
+DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
+DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
 DIRSEP = $(subst /,\,\)

 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -54,12 +54,12 @@ CP = $(COMSPEC) /c copy
 MV = move

 dirbase::
-	-@$(COMSPEC) /c if not exist $(ARCH_DOS)\. $(MD) $(ARCH_DOS)
-	$(if $(LIB_DIR_DOS),-@$(COMSPEC) /c if not exist $(LIB_DIR_DOS)\. $(MD) $(LIB_DIR_DOS),)
+	-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
+	$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)

 clean::
-	-@$(COMSPEC) /c if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)
-	$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /c if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
+	-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
+	$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)

 else  # bash

--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -91,11 +91,11 @@ RANLIB = $(HB_CCPREFIX)ranlib

 ifeq ($(AR_RULE),)
 ifeq ($(SHLVL),) # non-bash
-LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@
+DOS_LIB_DIR_ = $(subst /,\,$(LIB_DIR))\$@
 else
-LIB_DIR_DOS_ = $(LIB_DIR)/$@
+DOS_LIB_DIR_ = $(LIB_DIR)/$@
 endif
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_DOS_)
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(DOS_LIB_DIR_)
 # our libs have a lot of cross referenced now and we have to group them
 # until we won't have cleaned them
 LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)
--- a/harbour/config/win/global.cf
+++ b/harbour/config/win/global.cf
@@ -26,11 +26,11 @@ ifeq ($(SHLVL),) # non-bash

 # There is a conflict with the use of '\' and '/' characters
 # The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
-# and some DOS commands require '\' (ARCH_DOS)
+# and some DOS commands require '\' (DOS_ARCH_DIR)
 ARCH_DIR = $(subst \,/,$(HB_ARCH))
-ARCH_DOS = $(subst /,\,$(HB_ARCH))
-LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
-LIB_ARCH_DOS = $(subst /,\,$(LIB_ARCH))
+DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
+DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
+DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
 DIRSEP = $(subst /,\,\)

 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -50,12 +50,12 @@ CP = $(COMSPEC) /c copy
 MV = move

 dirbase::
-	-@$(COMSPEC) /c if not exist $(ARCH_DOS)\. $(MD) $(ARCH_DOS)
-	$(if $(LIB_DIR_DOS),-@$(COMSPEC) /c if not exist $(LIB_DIR_DOS)\. $(MD) $(LIB_DIR_DOS),)
+	-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
+	$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)

 clean::
-	-@$(COMSPEC) /c if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)
-	$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /c if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
+	-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
+	$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)

 else  # bash

--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -100,11 +100,11 @@ RANLIB = $(HB_CCPREFIX)ranlib

 ifeq ($(AR_RULE),)
 ifeq ($(SHLVL),) # non-bash
-LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@
+DOS_LIB_DIR_ = $(subst /,\,$(LIB_DIR))\$@
 else
-LIB_DIR_DOS_ = $(LIB_DIR)/$@
+DOS_LIB_DIR_ = $(LIB_DIR)/$@
 endif
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_DOS_)
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(DOS_LIB_DIR_)
 # our libs have a lot of cross referenced now and we have to group them
 # until we won't have cleaned them
 LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)