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

2008-02-07 20:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/config/lib.cf
    * moved some definitions for easier detecting library build mode
  * harbour/config/os2/dir.cf
  * harbour/config/os2/global.cf
    * some modifications which should help for old GNU make OS2 ports
      and maybe also current ones
This commit is contained in:
Przemyslaw Czerpak
2008-02-07 19:17:55 +00:00
parent 7ee8dfff26
commit c68b5e22e3
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-02-07 20:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/lib.cf
* moved some definitions for easier detecting library build mode
* harbour/config/os2/dir.cf
* harbour/config/os2/global.cf
* some modifications which should help for old GNU make OS2 ports
and maybe also current ones
2008-02-07 11:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/os2/gcc.cf
* use OS2_LIB_ARCH as library name to avoid problems with DEL

10
harbour/config/lib.cf
View File

@@ -5,17 +5,17 @@
ifneq ($(HB_ARCHITECTURE),)
ifneq ($(HB_COMPILER),)
#no slash at the end
LIB_PATH := $(TOP)$(ROOT)lib/$(HB_ARCHITECTURE)
#no slash at the end
LIB_DIR := $(LIB_PATH)/$(HB_COMPILER)
include $(TOP)$(ROOT)config/global.cf
include $(TOP)$(ROOT)config/c.cf
include $(TOP)$(ROOT)config/prg.cf
LIB_NAME := $(LIB_PREF)$(LIBNAME)$(LIB_EXT)
#no slash at the end
LIB_PATH := $(TOP)$(ROOT)lib/$(HB_ARCHITECTURE)
#no slash at the end
LIB_DIR := $(LIB_PATH)/$(HB_COMPILER)
LIB_ARCH := $(LIB_DIR)/$(LIB_NAME)
ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)

4
harbour/config/os2/dir.cf
View File

@@ -10,9 +10,9 @@ ifeq ($(DIRS),) # Empty directory list
DIR_RULE =\
@echo Done
else
DIR_MAKE = $(subst /,\,$(MK))
DIR_LIST = $(subst /,\,$(DIRS))
DIR_RULE =\
CMD.EXE /c FOR %d IN ($(DIR_LIST)) DO $(MK) -C %d $@
DIR_RULE = CMD.EXE /C FOR %d IN ($(DIR_LIST)) DO $(DIR_MAKE) -C %d $@
endif
else # bash

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

@@ -42,23 +42,25 @@ CP = copy
MV = move
MD = md
ifeq ($(OS2_LIB_PATH),)
dirbase::
-FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR)) DO IF NOT EXIST %d $(MD) %d
else
dirbase::
-FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR) $(OS2_LIB_PATH) $(OS2_LIB_DIR)) DO IF NOT EXIST %d $(MD) %d
endif
ifeq ($(LIB_PATH),)
dirbase::
-CMD.EXE /C FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR)) DO IF NOT EXIST %d $(MD) %d
ifeq ($(OS2_LIB_ARCH),)
clean::
-IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
-CMD.EXE /C IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-CMD.EXE /C FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
else
dirbase::
-CMD.EXE /C FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR) $(OS2_LIB_PATH) $(OS2_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)
-CMD.EXE /C IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-CMD.EXE /C FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
-CMD.EXE /C IF EXIST $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH)
endif
else # bash