From 4cd1edfa6608b768c40256e544eddea2755806e1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 21 Aug 2009 10:48:05 +0000 Subject: [PATCH] 2009-08-21 12:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/win/mingw.mk * config/win/msvc.mk * config/rules.mk ! BIN_DIR -> DYN_DIR --- harbour/ChangeLog | 6 ++++++ harbour/config/rules.mk | 2 +- harbour/config/win/mingw.mk | 2 +- harbour/config/win/msvc.mk | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a1f0ee5ae2..d4d7d8ca0a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-21 12:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/win/mingw.mk + * config/win/msvc.mk + * config/rules.mk + ! BIN_DIR -> DYN_DIR + 2009-08-21 12:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/Makefile ! Fixed typo in prev commit. diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk index e954b4c221..917eb3b382 100644 --- a/harbour/config/rules.mk +++ b/harbour/config/rules.mk @@ -59,7 +59,7 @@ endif # The rule to link a dynamic library. ifeq ($(DY_RULE),) -# DY_RULE = $(DY) $(DY_OUT)$(subst /,$(DIRSEP),$(BIN_DIR)/$@) $^ $(DFLAGS) $(HB_USER_DFLAGS) $(DLIBS) +# DY_RULE = $(DY) $(DY_OUT)$(subst /,$(DIRSEP),$(DYN_DIR)/$@) $^ $(DFLAGS) $(HB_USER_DFLAGS) $(DLIBS) endif # Eliminate these rules. diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk index 9ebac6c53a..4079904fed 100644 --- a/harbour/config/win/mingw.mk +++ b/harbour/config/win/mingw.mk @@ -68,7 +68,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(DY_OUT)"$(BIN_DIR)/$@"$(ECHOQUOTE) __dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS) -Wl,--output-def,"$(BIN_DIR)/$(basename $@).def" + $(DY) $(DFLAGS) $(DY_OUT)"$(DYN_DIR)/$@"$(ECHOQUOTE) __dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS) -Wl,--output-def,"$(DYN_DIR)/$(basename $@).def" endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk index 0b6e514a64..2851acf2b0 100644 --- a/harbour/config/win/msvc.mk +++ b/harbour/config/win/msvc.mk @@ -77,7 +77,7 @@ endef define create_dynlib @$(ECHO) $(ECHOQUOTE) $(DFLAGS) > __dyn__.tmp $(foreach file,$^,$(dyn_object)) - $(DY) $(DY_OUT)"$(subst /,$(DIRSEP),$(BIN_DIR)/$@)"$(ECHOQUOTE) @__dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS) + $(DY) $(DY_OUT)"$(subst /,$(DIRSEP),$(DYN_DIR)/$@)"$(ECHOQUOTE) @__dyn__.tmp $(HB_USER_DFLAGS) $(DLIBS) endef DY_RULE = $(create_dynlib)