From 934ddf43b14f82fccbff7b1d062490917d028a5d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 15 Jul 2009 16:53:53 +0000 Subject: [PATCH] 2009-07-15 18:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/win/mingw.cf * config/wce/mingwarm.cf % Optimized out LIB_DIR_OS_ vars. * config/dos/watcom.cf * config/win/watcom.cf * config/win/bcc.cf * config/linux/watcom.cf * config/os2/watcom.cf ! Minor: += -> = (after recent changes) --- harbour/ChangeLog | 12 ++++++++++++ harbour/config/dos/watcom.cf | 2 +- harbour/config/linux/watcom.cf | 2 +- harbour/config/os2/watcom.cf | 2 +- harbour/config/wce/mingwarm.cf | 7 +------ harbour/config/win/bcc.cf | 2 +- harbour/config/win/mingw.cf | 7 +------ harbour/config/win/watcom.cf | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 054ae059c3..fb6e67f44f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-15 18:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/win/mingw.cf + * config/wce/mingwarm.cf + % Optimized out LIB_DIR_OS_ vars. + + * config/dos/watcom.cf + * config/win/watcom.cf + * config/win/bcc.cf + * config/linux/watcom.cf + * config/os2/watcom.cf + ! Minor: += -> = (after recent changes) + 2009-07-15 18:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/pp/Makefile * source/pp/hbpp.c diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index 01175cad32..a4782ec0e3 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -104,7 +104,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the RDD library, add all DB drivers. ifeq ($(findstring hbrdd,$(LIBS)),hbrdd) diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf index 0df914179c..4cbe63d3ce 100644 --- a/harbour/config/linux/watcom.cf +++ b/harbour/config/linux/watcom.cf @@ -69,7 +69,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the RDD library, add all DB drivers. ifeq ($(findstring hbrdd,$(LIBS)),hbrdd) diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf index 85e24102af..66fc22cfa4 100644 --- a/harbour/config/os2/watcom.cf +++ b/harbour/config/os2/watcom.cf @@ -90,7 +90,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the RDD library, add all DB drivers. ifeq ($(findstring hbrdd,$(LIBS)),hbrdd) diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 28b74c6d3a..62d8174eaf 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -65,12 +65,7 @@ ARFLAGS = $(HB_USER_AFLAGS) RANLIB = $(HB_CCPREFIX)ranlib ifeq ($(AR_RULE),) -ifeq ($(SHLVL),) # non-bash -LIB_DIR_OS_ = $(subst /,\,$(LIB_DIR))\$@ -else -LIB_DIR_OS_ = $(LIB_DIR)/$@ -endif -AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_OS_) +AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) # our libs have a lot of cross referenced now and we have to group them # until we won't have cleaned them LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS) diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 9420238cbd..75ce807493 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -55,7 +55,7 @@ endif # It's probably not necessary in native Windows but I need it # for my Linux box because -L seems to not work with WINE -LINKLIBS += $(foreach lib, $(LIBLIST), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib, $(LIBLIST), $(LIB_DIR)/$(lib)) LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 7c7aedac7b..fbb37b10e4 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -72,12 +72,7 @@ ARFLAGS = $(HB_USER_AFLAGS) RANLIB = $(HB_CCPREFIX)ranlib ifeq ($(AR_RULE),) -ifeq ($(SHLVL),) # non-bash -LIB_DIR_OS_ = $(subst /,\,$(LIB_DIR))\$@ -else -LIB_DIR_OS_ = $(LIB_DIR)/$@ -endif -AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_OS_) +AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) # our libs have a lot of cross referenced now and we have to group them # until we won't have cleaned them LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS) diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf index d95b981144..adb2899b57 100644 --- a/harbour/config/win/watcom.cf +++ b/harbour/config/win/watcom.cf @@ -93,7 +93,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := debug all $(LDFLAGS) endif -LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) # If LIBS specifies the RDD library, add all DB drivers. ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)