From d1a2ed4e8a5c010e6799bbb80b4ab8c242bed02d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 12 Aug 2009 13:01:23 +0000 Subject: [PATCH] 2009-08-12 14:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/wce/mingwarm.cf * config/win/mingw.cf - Deleted ranlib usage. I've tested with mingw 3.4.2, 4.4.0 and mingwarm 4.4.1, and the runlib command made no difference. If someone knows the reason why was it there, pls shout. * config/bsd/global.cf * config/darwin/global.cf * config/linux/global.cf - Deleted RANLIB variables. They are not used anywere through the make process. (only mingw/mingwarm uses it) --- harbour/ChangeLog | 14 ++++++++++++++ harbour/config/bsd/global.cf | 1 - harbour/config/darwin/global.cf | 2 -- harbour/config/linux/global.cf | 2 -- harbour/config/wce/mingwarm.cf | 4 +--- harbour/config/win/mingw.cf | 4 +--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1f179d9e63..1396457183 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-12 14:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/wce/mingwarm.cf + * config/win/mingw.cf + - Deleted ranlib usage. I've tested with mingw 3.4.2, 4.4.0 + and mingwarm 4.4.1, and the runlib command made no difference. + If someone knows the reason why was it there, pls shout. + + * config/bsd/global.cf + * config/darwin/global.cf + * config/linux/global.cf + - Deleted RANLIB variables. They are not used anywere through the + make process. + (only mingw/mingwarm uses it) + 2009-08-12 14:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/rules.cf ! Changed CC_RULE and CPP_RULE to have CC_OUT option _before_ CC_IN. diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf index 1d1a84acc4..4ab1b25657 100644 --- a/harbour/config/bsd/global.cf +++ b/harbour/config/bsd/global.cf @@ -11,4 +11,3 @@ DYN_EXT := .so HB_GT_LIBS += gttrm MAKE := gmake -RANLIB := ranlib diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf index 5c55b23aae..092d9d29bb 100644 --- a/harbour/config/darwin/global.cf +++ b/harbour/config/darwin/global.cf @@ -9,5 +9,3 @@ DYN_PRE := lib DYN_EXT := .dylib HB_GT_LIBS += gttrm - -RANLIB := ranlib diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf index 941a7f3148..dd0d1fdb57 100644 --- a/harbour/config/linux/global.cf +++ b/harbour/config/linux/global.cf @@ -9,5 +9,3 @@ DYN_PRE := lib DYN_EXT := .so HB_GT_LIBS += gttrm - -RANLIB := ranlib diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 050180ee81..5e491d3319 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -43,10 +43,8 @@ LDLIBS := $(foreach lib,$(LIBS),-l$(lib)) LDLIBS += -lwininet -lws2 LDFLAGS += $(LIBPATHS) -RANLIB := $(HB_CCPREFIX)ranlib - AR := $(HB_CCPREFIX)ar ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 8cc974de3c..32ac22619a 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -53,10 +53,8 @@ LDLIBS += -luser32 -lgdi32 -lws2_32 LDFLAGS += $(LIBPATHS) -RANLIB := $(HB_CCPREFIX)ranlib - AR := $(HB_CCPREFIX)ar ARFLAGS := -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) +AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) include $(TOP)$(ROOT)config/rules.cf