diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b81b9f87a5..a63b6d17a9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-20 20:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/dos/watcom.mk + * config/common/watcom.mk + * config/win/watcom.mk + * config/linux/watcom.mk + * config/os2/watcom.mk + ! Fix to prev. (missed to deleted platform specific rules from nt/dos ones) + * Moved LDLIBS formation back to platform spefific watcom.mk files. + (the only reason is SYSLIBS present only on win) + 2009-08-20 20:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/common/watcom.mk + Readded dos/nt shell specific logic. (they were the same so diff --git a/harbour/config/common/watcom.mk b/harbour/config/common/watcom.mk index 03ab45206a..03e74e7427 100644 --- a/harbour/config/common/watcom.mk +++ b/harbour/config/common/watcom.mk @@ -19,8 +19,6 @@ ifeq ($(CC),wcc386) endif endif -LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) - # NOTE: Hack to force no extension for Linux binaries created on non-Linux hosts. # Otherwise they become '.elf'. [vszakats] ifeq ($(HB_ARCHITECTURE),linux) @@ -83,15 +81,6 @@ ifneq ($(filter $(HB_SHELL),nt dos),) -$(LD) @__link__.tmp endef - LD := wlink - ifeq ($(HB_BUILD_DEBUG),yes) - LDFLAGS += DEBUG ALL - endif - LDFLAGS += SYS nt - - LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) - LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)) - LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) # NOTE: The empty line directly before 'endef' HAVE TO exist! diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk index e85ccd5303..7785a2365a 100644 --- a/harbour/config/dos/watcom.mk +++ b/harbour/config/dos/watcom.mk @@ -63,6 +63,8 @@ else LDFLAGS += SYS dos4g OP STUB=wstubq.exe endif +LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) + include $(TOP)$(ROOT)config/common/watcom.mk include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk index 59680f4f81..107f2c2d25 100644 --- a/harbour/config/linux/watcom.mk +++ b/harbour/config/linux/watcom.mk @@ -59,6 +59,8 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LDFLAGS += SYS linux +LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) + include $(TOP)$(ROOT)config/common/watcom.mk include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk index 75d8b5eca9..561568dea5 100644 --- a/harbour/config/os2/watcom.mk +++ b/harbour/config/os2/watcom.mk @@ -59,6 +59,8 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LDFLAGS += SYS os2v2 +LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) + include $(TOP)$(ROOT)config/common/watcom.mk include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk index 46f3ef9199..f965f2d68a 100644 --- a/harbour/config/win/watcom.mk +++ b/harbour/config/win/watcom.mk @@ -61,6 +61,9 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LDFLAGS += SYS nt +LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) +LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)) + include $(TOP)$(ROOT)config/common/watcom.mk include $(TOP)$(ROOT)config/rules.mk