2009-08-22 16:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/rules.mk
  * config/dyn.mk
    % Cleaned the way dynamic lib creation logic is activated.
      Now there is no slowdown on targets where dynamic lib
      isn't available (or implemented).
This commit is contained in:
Viktor Szakats
2009-08-22 14:55:34 +00:00
parent 3d666bbd72
commit 3965b675de
3 changed files with 14 additions and 10 deletions

View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-22 16:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/rules.mk
* config/dyn.mk
% Cleaned the way dynamic lib creation logic is activated.
Now there is no slowdown on targets where dynamic lib
isn't available (or implemented).
2009-08-22 16:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/pp/Makefile
% Deleted rule to delete hbpp_dyn object. No longer necessary

View File

@@ -4,7 +4,6 @@
include $(TOP)$(ROOT)config/global.mk
ifneq ($(HB_BUILD_DLL),no)
ifneq ($(HB_ARCHITECTURE),)
ifneq ($(HB_COMPILER),)
@@ -12,6 +11,12 @@ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).mk
include $(TOP)$(ROOT)config/c.mk
include $(TOP)$(ROOT)config/prg.mk
DYN_FILE :=
IMP_FILE :=
ifneq ($(HB_BUILD_DLL),no)
ifneq ($(DY_RULE),)
DYN_NAME := $(DYN_PREF)$(DYNNAME)$(DYN_EXT)
DYN_FILE := $(DYN_DIR)/$(DYN_NAME)
@@ -27,14 +32,10 @@ first:: dirbase descend
descend:: dirbase
+@$(MK) $(MKFLAGS) -C $(OBJ_DIR) -f $(GRANDP)Makefile TOP=$(GRANDP) $(DYN_NAME)
ifneq ($(HB_BUILD_DLL),no)
vpath $(DYN_NAME) $(DYN_DIR)
$(DYN_NAME) : $(ALL_OBJS)
$(DY_RULE)
endif
INSTALL_FILES := $(DYN_FILE)
INSTALL_DIR := $(HB_DYN_INSTALL)
@@ -43,3 +44,4 @@ include $(TOP)$(ROOT)config/install.mk
endif
endif
endif
endif

View File

@@ -57,11 +57,6 @@ ifeq ($(LD_RULE),)
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$(subst /,$(DIRSEP),$(BIN_DIR)/$@) $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LDLIBS)
endif
# The rule to link a dynamic library.
ifeq ($(DY_RULE),)
DY_RULE = @$(ECHO) $(ECHOQUOTE)! Dynamic library creation not supported for this target$(ECHOQUOTE)
endif
# Eliminate these rules.
%.c : %.y