diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bc7450fa6a..17cf090d21 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-15 03:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/pp/Makefile + * config/hpux/global.cf + * config/darwin/global.cf + * config/dos/global.cf + * config/lib.cf + * config/win/global.cf + * config/linux/global.cf + * config/bin.cf + * config/os2/global.cf + * config/test.cf + * config/sunos/global.cf + * config/bsd/global.cf + * config/wce/global.cf + * ARCH_COMP_OS -> OBJ_DIR_OS + * ARCH_COMP_DIR -> OBJ_DIR + (using names that make more sense) + 2009-07-15 03:28 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gtwin/gtwin.c * added code to disable/enable mouse input by: diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf index 45ec9e9c1a..5fdc839693 100644 --- a/harbour/config/bin.cf +++ b/harbour/config/bin.cf @@ -25,15 +25,15 @@ EXE_NAME = $(PRG_MAIN:.prg=$(EXE_EXT)) endif endif -EXE_FILE = $(ARCH_COMP_DIR)/$(EXE_NAME) -LIB_DIR = $(TOP)$(ROOT)lib/$(ARCH_COMP_DIR) +EXE_FILE = $(OBJ_DIR)/$(EXE_NAME) +LIB_DIR = $(TOP)$(ROOT)lib/$(OBJ_DIR) ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS) first:: dirbase descend descend:: dirbase - +@$(MK) -C $(ARCH_COMP_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(EXE_NAME) $(HB_USER_MAKEFLAGS) + +@$(MK) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(EXE_NAME) $(HB_USER_MAKEFLAGS) $(EXE_NAME) : $(ALL_OBJS) $(LD_RULE) diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf index 218c76a42a..13a65f1ba1 100644 --- a/harbour/config/bsd/global.cf +++ b/harbour/config/bsd/global.cf @@ -12,7 +12,7 @@ HB_GT_LIBS=\ MAKE = gmake -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -23,8 +23,8 @@ MDP = mkdir -p RANLIB = ranlib dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf index 2ae5e5aa6b..127c91fd26 100644 --- a/harbour/config/darwin/global.cf +++ b/harbour/config/darwin/global.cf @@ -10,7 +10,7 @@ HB_GT_LIBS=\ gtstd \ gttrm \ -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -21,8 +21,8 @@ MDP = mkdir -p RANLIB = ranlib dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf index 92f53b4ed8..4ee645675d 100644 --- a/harbour/config/dos/global.cf +++ b/harbour/config/dos/global.cf @@ -15,10 +15,10 @@ HB_GT_LIBS=\ ifeq ($(SHLVL),) # non-bash # There is a conflict with the use of '\' and '/' characters -# The MAKE requires '/' in filenames (ARCH_COMP_DIR) however some compilers -# and some DOS commands require '\' (ARCH_COMP_OS) -ARCH_COMP_DIR = $(ARCH_COMP) -ARCH_COMP_OS = $(subst /,\,$(ARCH_COMP)) +# The MAKE requires '/' in filenames (OBJ_DIR) however some compilers +# and some DOS commands require '\' (OBJ_DIR_OS) +OBJ_DIR = $(ARCH_COMP) +OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP)) LIB_DIR_OS = $(subst /,\,$(LIB_DIR)) LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR)) LIB_FILE_OS = $(subst /,\,$(LIB_FILE)) @@ -50,17 +50,17 @@ MD = md RANLIB = ranlib dirbase:: - -@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(ARCH_COMP_OS)) do if not exist %d\nul $(MD) %d + -@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(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,) clean:: - -@$(COMSPEC) /Cfor %f in ($(ARCH_COMP_OS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f - -@$(COMSPEC) /Cfor %d in ($(ARCH_COMP_OS) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d + -@$(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 $(if $(LIB_FILE_OS),-@$(COMSPEC) /Cif exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) else # bash -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f @@ -74,11 +74,11 @@ MDP = mkdir -p RANLIB = ranlib dirbase:: - @sh -c "[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR)" + @sh -c "[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)" @sh -c "[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)" clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) endif endif diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf index bb2a1a8093..93aa78dbe9 100644 --- a/harbour/config/hpux/global.cf +++ b/harbour/config/hpux/global.cf @@ -10,7 +10,7 @@ HB_GT_LIBS=\ gtstd \ gttrm \ -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -20,8 +20,8 @@ MD = mkdir MDP = mkdir -p dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf index f54f952b06..bc5c02cc53 100644 --- a/harbour/config/lib.cf +++ b/harbour/config/lib.cf @@ -23,7 +23,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS) first:: dirbase descend descend:: dirbase - +@$(MK) -C $(ARCH_COMP_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(HB_USER_MAKEFLAGS) + +@$(MK) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(LIB_NAME) $(HB_USER_MAKEFLAGS) vpath $(LIB_NAME) $(LIB_DIR) $(LIB_NAME) : $(ALL_OBJS) diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf index b312eb1e70..fef350438e 100644 --- a/harbour/config/linux/global.cf +++ b/harbour/config/linux/global.cf @@ -12,8 +12,8 @@ HB_GT_LIBS=\ ifeq ($(SHLVL),) # non-bash -ARCH_COMP_DIR = $(ARCH_COMP) -ARCH_COMP_OS = $(subst /,\,$(ARCH_COMP)) +OBJ_DIR = $(ARCH_COMP) +OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP)) LIB_DIR_OS = $(subst /,\,$(LIB_DIR)) LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR)) LIB_FILE_OS = $(subst /,\,$(LIB_FILE)) @@ -37,11 +37,11 @@ ifeq ($(OS2_SHELL),) # non-OS/2 MV = move dirbase:: - -@$(COMSPEC) /c if not exist $(ARCH_COMP_OS) $(MD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS) $(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),) clean:: - -@$(COMSPEC) /c if exist $(ARCH_COMP_OS) $(RD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS) $(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) else # OS/2 @@ -54,20 +54,20 @@ else # OS/2 ifeq ($(LIB_ARCH_DIR),) dirbase:: - -for %d in ($(HB_ARCHITECTURE) $(ARCH_COMP_OS)) do if not exist %d $(MD) %d + -for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d clean:: - -if exist $(ARCH_COMP_OS)\*.* $(RM) $(ARCH_COMP_OS)\*.* - -for %d in ($(ARCH_COMP_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d + -if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.* + -for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d else dirbase:: - -for %d in ($(HB_ARCHITECTURE) $(ARCH_COMP_OS) $(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d + -for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS) $(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d clean:: - -if exist $(ARCH_COMP_OS)\*.* $(RM) $(ARCH_COMP_OS)\*.* - -for %d in ($(ARCH_COMP_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d + -if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.* + -for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d -if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS) endif @@ -76,7 +76,7 @@ endif else # bash -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -87,10 +87,10 @@ MDP = mkdir -p RANLIB = ranlib dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) endif diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf index 3fe00fdf9e..bf65031e95 100644 --- a/harbour/config/os2/global.cf +++ b/harbour/config/os2/global.cf @@ -12,8 +12,8 @@ HB_GT_LIBS=\ ifeq ($(SHLVL),) # non-bash -ARCH_COMP_DIR = $(ARCH_COMP) -ARCH_COMP_OS = $(subst /,\,$(ARCH_COMP)) +OBJ_DIR = $(ARCH_COMP) +OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP)) LIB_DIR_OS = $(subst /,\,$(LIB_DIR)) LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR)) LIB_FILE_OS = $(subst /,\,$(LIB_FILE)) @@ -37,11 +37,11 @@ ifeq ($(OS2_SHELL),) # non-OS/2 MV = move dirbase:: - -@$(COMSPEC) /c if not exist $(ARCH_COMP_OS) $(MD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS) $(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),) clean:: - -@$(COMSPEC) /c if exist $(ARCH_COMP_OS) $(RD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS) $(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) else # OS/2 @@ -54,20 +54,20 @@ else # OS/2 ifeq ($(LIB_ARCH_DIR),) dirbase:: - -for %d in ($(HB_ARCHITECTURE) $(ARCH_COMP_OS)) do if not exist %d $(MD) %d + -for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d clean:: - -if exist $(ARCH_COMP_OS)\*.* $(RM) $(ARCH_COMP_OS)\*.* - -for %d in ($(ARCH_COMP_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d + -if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.* + -for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d else dirbase:: - -for %d in ($(HB_ARCHITECTURE) $(ARCH_COMP_OS) $(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d + -for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS) $(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d clean:: - -if exist $(ARCH_COMP_OS)\*.* $(RM) $(ARCH_COMP_OS)\*.* - -for %d in ($(ARCH_COMP_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d + -if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.* + -for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d -if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS) endif @@ -76,7 +76,7 @@ endif else # bash -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -88,10 +88,10 @@ MDP = mkdir -p LIB_FILE_OS = $(LIB_FILE) dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) endif diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf index bb2a1a8093..93aa78dbe9 100644 --- a/harbour/config/sunos/global.cf +++ b/harbour/config/sunos/global.cf @@ -10,7 +10,7 @@ HB_GT_LIBS=\ gtstd \ gttrm \ -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -20,8 +20,8 @@ MD = mkdir MDP = mkdir -p dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) diff --git a/harbour/config/test.cf b/harbour/config/test.cf index 0bf88481bf..679ef6b90d 100644 --- a/harbour/config/test.cf +++ b/harbour/config/test.cf @@ -11,7 +11,7 @@ include $(TOP)$(ROOT)config/prg.cf first:: dirbase ^^^d^e^s^c^e^n^d^^^ ^^^d^e^s^c^e^n^d^^^ : - @$(MK) -C $(ARCH_COMP_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(PRG_EXES) + @$(MK) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(PRG_EXES) endif endif diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf index 119130e726..e6c8db1102 100644 --- a/harbour/config/wce/global.cf +++ b/harbour/config/wce/global.cf @@ -23,10 +23,10 @@ endif ifeq ($(SHLVL),) # non-bash # There is a conflict with the use of '\' and '/' characters -# The MAKE requires '/' in filenames (ARCH_COMP_DIR) however some compilers -# and some DOS commands require '\' (ARCH_COMP_OS) -ARCH_COMP_DIR = $(ARCH_COMP) -ARCH_COMP_OS = $(subst /,\,$(ARCH_COMP)) +# The MAKE requires '/' in filenames (OBJ_DIR) however some compilers +# and some DOS commands require '\' (OBJ_DIR_OS) +OBJ_DIR = $(ARCH_COMP) +OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP)) LIB_DIR_OS = $(subst /,\,$(LIB_DIR)) LIB_FILE_OS = $(subst /,\,$(LIB_FILE)) DIRSEP = $(subst /,\,\) @@ -48,16 +48,16 @@ CP = $(COMSPEC) /c copy MV = move dirbase:: - -@$(COMSPEC) /c if not exist $(ARCH_COMP_OS) $(MD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS) $(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),) clean:: - -@$(COMSPEC) /c if exist $(ARCH_COMP_OS) $(RD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS) $(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) else # bash -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -67,10 +67,10 @@ MD = mkdir MDP = mkdir -p dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) endif diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf index e6a4f1296c..e196383dff 100644 --- a/harbour/config/win/global.cf +++ b/harbour/config/win/global.cf @@ -19,10 +19,10 @@ endif ifeq ($(SHLVL),) # non-bash # There is a conflict with the use of '\' and '/' characters -# The MAKE requires '/' in filenames (ARCH_COMP_DIR) however some compilers -# and some DOS commands require '\' (ARCH_COMP_OS) -ARCH_COMP_DIR = $(ARCH_COMP) -ARCH_COMP_OS = $(subst /,\,$(ARCH_COMP)) +# The MAKE requires '/' in filenames (OBJ_DIR) however some compilers +# and some DOS commands require '\' (OBJ_DIR_OS) +OBJ_DIR = $(ARCH_COMP) +OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP)) LIB_DIR_OS = $(subst /,\,$(LIB_DIR)) LIB_FILE_OS = $(subst /,\,$(LIB_FILE)) DIRSEP = $(subst /,\,\) @@ -44,16 +44,16 @@ CP = $(COMSPEC) /c copy MV = move dirbase:: - -@$(COMSPEC) /c if not exist $(ARCH_COMP_OS) $(MD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS) $(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),) clean:: - -@$(COMSPEC) /c if exist $(ARCH_COMP_OS) $(RD) $(ARCH_COMP_OS) + -@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS) $(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) else # bash -ARCH_COMP_DIR = $(ARCH_COMP) +OBJ_DIR = $(ARCH_COMP) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -63,10 +63,10 @@ MD = mkdir MDP = mkdir -p dirbase:: - @[ -d $(ARCH_COMP_DIR) ] || $(MDP) $(ARCH_COMP_DIR) + @[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR) @[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR) clean:: - -$(RD) $(ARCH_COMP_DIR) $(LIB_FILE) + -$(RD) $(OBJ_DIR) $(LIB_FILE) endif diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index a0fd04151a..726db7d9e9 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -36,7 +36,7 @@ pptable.c : hbpp$(EXE_EXT) endif ifneq ($(HB_BIN_INSTALL),) -INSTALL_FILES = $(ARCH_COMP_DIR)/hbpp$(EXE_EXT) +INSTALL_FILES = $(OBJ_DIR)/hbpp$(EXE_EXT) INSTALL_DIR = $(HB_BIN_INSTALL) HB_INSTALL_DEF=yes include $(TOP)$(ROOT)config/install.cf