fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-15 17:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/dos/global.cf
  * config/global.cf
  * config/linux/global.cf
  * config/os2/gcc.cf
  * config/os2/global.cf
    * Finished internal support for obj base dir. In next step
      I'll enable it.
This commit is contained in:
Viktor Szakats
2009-07-15 15:25:53 +00:00
parent 1e67d269a8
commit 7c10651b62
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-15 17:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/dos/global.cf
* config/global.cf
* config/linux/global.cf
* config/os2/gcc.cf
* config/os2/global.cf
* Finished internal support for obj base dir. In next step
I'll enable it.
2009-07-15 17:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.cf
* config/darwin/global.cf

5
harbour/config/dos/global.cf
View File

@@ -18,6 +18,7 @@ ifeq ($(SHLVL),) # non-bash
# The MAKE requires '/' in filenames (OBJ_DIR) however some compilers
# and some DOS commands require '\' (OBJ_DIR_OS)
OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
OBJ_ARCH_DIR_OS = $(subst /,\,$(OBJ_ARCH_DIR))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
@@ -49,13 +50,13 @@ MV = move
MD = md
dirbase::
-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d\nul $(MD) %d
-@$(COMSPEC) /Cfor %d in ($(OBJ_BASE) $(OBJ_ARCH_DIR_OS) $(OBJ_DIR_OS)) do if not exist %d\nul $(MD) %d
$(if $(LIB_ARCH_DIR_OS),-@$(COMSPEC) /Cfor %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d\nul $(MD) %d,)
$(if $(EXE_ARCH_DIR_OS),-@$(COMSPEC) /Cfor %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d\nul $(MD) %d,)
clean::
-@$(COMSPEC) /Cfor %f in ($(OBJ_DIR_OS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
-@$(COMSPEC) /Cfor %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
-@$(COMSPEC) /Cfor %d in ($(OBJ_DIR_OS) $(OBJ_ARCH_DIR_OS) $(OBJ_BASE)) do if exist %d\nul $(RD) %d
$(if $(LIB_FILE_OS),-@$(COMSPEC) /Cif exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
$(if $(EXE_FILE_OS),-@$(COMSPEC) /Cif exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)

2
harbour/config/global.cf
View File

@@ -28,6 +28,8 @@ GRANDP = ../../
ARCH_COMP := $(HB_ARCHITECTURE)/$(HB_COMPILER)
# OBJ_DIR := $(OBJ_BASE)/$(ARCH_COMP)
OBJ_DIR := $(ARCH_COMP)
# OBJ_ARCH_DIR := $(OBJ_BASE)/$(HB_ARCHITECTURE)
OBJ_ARCH_DIR := $(HB_ARCHITECTURE)
# Directory separator default
ifeq ($(DIRSEP),)

5
harbour/config/linux/global.cf
View File

@@ -13,6 +13,7 @@ HB_GT_LIBS=\
ifeq ($(SHLVL),) # non-bash
OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
OBJ_ARCH_DIR_OS = $(subst /,\,$(OBJ_ARCH_DIR))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
@@ -56,13 +57,13 @@ else # OS/2
MV = move
dirbase::
-for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
-for %d in ($(OBJ_BASE) $(OBJ_ARCH_DIR_OS) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
$(if $(LIB_FILE_OS),-for %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d,)
$(if $(EXE_FILE_OS),-for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d $(MD) %d,)
clean::
-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
-for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-for %d in ($(OBJ_DIR_OS) $(OBJ_ARCH_DIR_OS) $(OBJ_BASE)) do if exist %d $(RD) %d
$(if $(LIB_FILE_OS),-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
$(if $(EXE_FILE_OS),-if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)

2
harbour/config/os2/gcc.cf
View File

@@ -40,7 +40,7 @@ LD_OUT = -o$(subst x,x, )
ifeq ($(C_MAIN),)
ifeq ($(HB_GT_LIB),os2pm)
# If building a PM program, override the main object.
LDFLAGS +=$(TOP)$(ROOT)source/vm/$(ARCH_COMP)/mainpm.o
LDFLAGS +=$(TOP)$(ROOT)source/vm/$(OBJ_DIR)/mainpm.o
endif
endif

5
harbour/config/os2/global.cf
View File

@@ -13,6 +13,7 @@ HB_GT_LIBS=\
ifeq ($(SHLVL),) # non-bash
OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
OBJ_ARCH_DIR_OS = $(subst /,\,$(OBJ_ARCH_DIR))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
@@ -56,13 +57,13 @@ else # OS/2
MV = move
dirbase::
-for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
-for %d in ($(OBJ_BASE) $(OBJ_ARCH_DIR_OS) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
$(if $(LIB_FILE_OS),-for %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d,)
$(if $(EXE_FILE_OS),-for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d $(MD) %d,)
clean::
-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
-for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-for %d in ($(OBJ_DIR_OS) $(OBJ_ARCH_DIR_OS) $(OBJ_BASE)) do if exist %d $(RD) %d
$(if $(LIB_FILE_OS),-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
$(if $(EXE_FILE_OS),-if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)