From 7c10651b62a25f87a3ec6f27c0f1bcf34313d9fb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 15 Jul 2009 15:25:53 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 9 +++++++++ harbour/config/dos/global.cf | 5 +++-- harbour/config/global.cf | 2 ++ harbour/config/linux/global.cf | 5 +++-- harbour/config/os2/gcc.cf | 2 +- harbour/config/os2/global.cf | 5 +++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7d2b004923..9f8467fe26 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf index 63ffbb15a6..241b06fbf5 100644 --- a/harbour/config/dos/global.cf +++ b/harbour/config/dos/global.cf @@ -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),) diff --git a/harbour/config/global.cf b/harbour/config/global.cf index e07f683739..397325b911 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -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),) diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf index 4b5a52afb6..5fec30f926 100644 --- a/harbour/config/linux/global.cf +++ b/harbour/config/linux/global.cf @@ -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),) diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index dbf1f0d577..8a95109493 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -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 diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf index 029bd52b2a..c8677fc4da 100644 --- a/harbour/config/os2/global.cf +++ b/harbour/config/os2/global.cf @@ -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),)