From 135cfb8a6eb8a37e5ecdb9b0d97542f218ecc6e3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 10 Aug 2009 00:47:30 +0000 Subject: [PATCH] 2009-08-10 02:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/globsh.cf * config/bsd/gcc.cf * config/wce/msvcarm.cf * config/wce/mingwarm.cf * config/wce/poccarm.cf * config/darwin/gcc.cf * config/hpux/gcc.cf * config/dos/djgpp.cf * config/win/cygwin.cf * config/win/mingw.cf * config/linux/gcc.cf * config/linux/icc.cf * config/linux/sunpro.cf * config/os2/gcc.cf * config/sunos/gcc.cf * config/sunos/sunpro.cf % Using ':=' instead of '=' where possible. (incomplete. pass two) The rest is really the core and need deeper examination of ordering and variable dependency. There is probably more room for improvement. --- harbour/ChangeLog | 25 ++++++++++++++++++++++++- harbour/config/bsd/gcc.cf | 6 +++--- harbour/config/darwin/gcc.cf | 4 ++-- harbour/config/dos/djgpp.cf | 4 ++-- harbour/config/globsh.cf | 18 +++++++++--------- harbour/config/hpux/gcc.cf | 4 ++-- harbour/config/linux/gcc.cf | 6 +++--- harbour/config/linux/icc.cf | 4 ++-- harbour/config/linux/sunpro.cf | 4 ++-- harbour/config/os2/gcc.cf | 4 ++-- harbour/config/sunos/gcc.cf | 4 ++-- harbour/config/sunos/sunpro.cf | 4 ++-- harbour/config/wce/mingwarm.cf | 6 +++--- harbour/config/wce/msvcarm.cf | 4 ++-- harbour/config/wce/poccarm.cf | 4 ++-- harbour/config/win/cygwin.cf | 4 ++-- harbour/config/win/mingw.cf | 6 +++--- 17 files changed, 67 insertions(+), 44 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index af2079f19c..994c8e4430 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,29 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-10 02:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/globsh.cf + * config/bsd/gcc.cf + * config/wce/msvcarm.cf + * config/wce/mingwarm.cf + * config/wce/poccarm.cf + * config/darwin/gcc.cf + * config/hpux/gcc.cf + * config/dos/djgpp.cf + * config/win/cygwin.cf + * config/win/mingw.cf + * config/linux/gcc.cf + * config/linux/icc.cf + * config/linux/sunpro.cf + * config/os2/gcc.cf + * config/sunos/gcc.cf + * config/sunos/sunpro.cf + % Using ':=' instead of '=' where possible. + (incomplete. pass two) + The rest is really the core and need deeper examination + of ordering and variable dependency. There is probably more + room for improvement. + 2009-08-09 17:35 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/hbqt_slots.cpp * contrib/hbxbp/xbpbrowse.prg @@ -28,7 +51,7 @@ * contrib/hbxbp/xbpbrowse.prg ! Column display protocol tweaked to provide a descent view. + Implemented ::sizeCols() instance variable of XbpBrowse() object. - This provides for switching off the resizing behavior of the columns. + This provides for switching off the resizing behavior of the columns. * contrib/hbxbp/tests/demoxbp.prg ! Demonstrated the above facts. diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index bd7ae6d987..31f89b8151 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CMP) +CC := $(HB_CCACHE) $(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -30,7 +30,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CMP) +LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o LINKPATHS += -L$(LIB_DIR) @@ -51,7 +51,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB = ncurses +HB_CRS_LIB := ncurses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 43013e1f31..83aa82f46e 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -14,7 +14,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. @@ -44,7 +44,7 @@ endif # remove it if you have newer compiler version #CFLAGS += -Wno-long-double -LD = $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +LD := $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) LD_OUT := -o LINKPATHS += -L$(LIB_DIR) diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 077b94447e..0cac3c5c31 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CMP) +CC := $(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -30,7 +30,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CMP) +LD := $(HB_CMP) LD_OUT := -o LDLIBS = -lm diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf index 6cbbc9b60d..d48ac42577 100644 --- a/harbour/config/globsh.cf +++ b/harbour/config/globsh.cf @@ -27,7 +27,7 @@ endif ifeq ($(HB_SHELL),sh) -MK = $(MAKE) +MK := $(MAKE) RM := rm -f RDP := rm -f -r CP := cp -f @@ -54,7 +54,7 @@ endif ifeq ($(HB_SHELL),nt) -MK = "$(subst \,/,$(subst \~,~,$(MAKE)))" +MK := "$(subst \,/,$(subst \~,~,$(MAKE)))" RM := del /q /f RDP := rmdir /q /s CP := copy @@ -79,12 +79,12 @@ endif ifeq ($(HB_SHELL),os2) -MK = $(subst \,/,$(subst \~,~,$(MAKE))) +MK := $(subst \,/,$(subst \~,~,$(MAKE))) RM := del /n -RDP = $(TOOL_DIR)os2-rm -rf +RDP := $(TOOL_DIR)os2-rm -rf CP := copy MD := mkdir -MDP = $(TOOL_DIR)os2-mkdir -p +MDP := $(TOOL_DIR)os2-mkdir -p dirbase:: -@if not exist $(OBJ_DIR_OS) $(MDP) $(OBJ_DIR) @@ -100,12 +100,12 @@ endif ifeq ($(HB_SHELL),dos) -MK = $(subst \,/,$(subst \~,~,$(MAKE))) +MK := $(subst \,/,$(subst \~,~,$(MAKE))) RM := del -RDP = $(TOOL_DIR)dj-rm -f -r -CP = $(TOOL_DIR)dj-cp -f +RDP := $(TOOL_DIR)dj-rm -f -r +CP := $(TOOL_DIR)dj-cp -f MD := mkdir -MDP = $(TOOL_DIR)dj-mkdir -p +MDP := $(TOOL_DIR)dj-mkdir -p dirbase:: -@if not exist $(OBJ_DIR_OS)\nul $(MDP) $(OBJ_DIR_OS) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 2d80ecd3c6..281116b3ab 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CMP) +CC := $(HB_CCACHE) $(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -38,7 +38,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CMP) +LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 05414c0735..3ee346ff26 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) +CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -45,7 +45,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) +LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. @@ -102,7 +102,7 @@ LINKLIBS += -lm -lrt -ldl -Wl,--end-group LDFLAGS = $(LINKPATHS) -AR = $(HB_CCPREFIX)ar +AR := $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 0328e2674e..45fd974302 100644 --- a/harbour/config/linux/icc.cf +++ b/harbour/config/linux/icc.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CMP) +CC := $(HB_CCACHE) $(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -39,7 +39,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CMP) +LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index 767c251f9d..387f310766 100644 --- a/harbour/config/linux/sunpro.cf +++ b/harbour/config/linux/sunpro.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) +CC := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. @@ -50,7 +50,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) +LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 7812faa7bf..76c81dc5c1 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := LIB_EXT := .a -CC = $(HB_CMP) +CC := $(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -30,7 +30,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CMP) +LD := $(HB_CMP) LDFLAGS = # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 1d39ebea85..aa878f621e 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CMP) +CC := $(HB_CCACHE) $(HB_CMP) CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. @@ -37,7 +37,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CMP) +LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf index bbdcf3cfc0..2d08a8b4fe 100644 --- a/harbour/config/sunos/sunpro.cf +++ b/harbour/config/sunos/sunpro.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) +CC := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. @@ -60,7 +60,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) +LD := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 08c9fd1322..6218da7ed7 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCPREFIX)$(HB_CMP) +CC := $(HB_CCPREFIX)$(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -32,7 +32,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCPREFIX)$(HB_CMP) +LD := $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o LINKPATHS = LIBLIST = @@ -58,7 +58,7 @@ SYSLIBS += -lcommdlg -lcommctrl -luuid -lole32 LDFLAGS = -AR = $(HB_CCPREFIX)ar +AR := $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) RANLIB = $(HB_CCPREFIX)ranlib diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf index 2d86761308..bfc1c9d05d 100644 --- a/harbour/config/wce/msvcarm.cf +++ b/harbour/config/wce/msvcarm.cf @@ -42,9 +42,9 @@ CFLAGS += -Zi endif ifeq ($(HB_VISUALC_VER_PRE80),) -LD = cl.exe +LD := cl.exe else -LD = clarm.exe +LD := clarm.exe endif LD_OUT := -Fe diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf index 0b2451095c..ccc3e40556 100644 --- a/harbour/config/wce/poccarm.cf +++ b/harbour/config/wce/poccarm.cf @@ -8,7 +8,7 @@ OBJ_EXT := .obj LIB_PREF := LIB_EXT := .lib -CC = pocc.exe +CC := pocc.exe CC_IN := -c CC_OUT := -Fo CPPFLAGS = -I. @@ -37,7 +37,7 @@ endif CFLAGS = -LD = polink.exe +LD := polink.exe LD_OUT := -OUT: # Add all libraries specified in LIBS. diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index 6f05c0007b..a6beb7fc58 100644 --- a/harbour/config/win/cygwin.cf +++ b/harbour/config/win/cygwin.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CMP) +CC := $(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -31,7 +31,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CMP) +LD := $(HB_CMP) LD_OUT := -o # Add all libraries specified in LIBS. diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 2cefe7555a..5600cbb9f8 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -12,7 +12,7 @@ OBJ_EXT := .o LIB_PREF := lib LIB_EXT := .a -CC = $(HB_CCPREFIX)$(HB_CMP) +CC := $(HB_CCPREFIX)$(HB_CMP) CC_IN := -c CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -34,7 +34,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(HB_CCPREFIX)$(HB_CMP) +LD := $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o LINKPATHS = LIBLIST = @@ -65,7 +65,7 @@ endif SYSLIBS = -luser32 -lgdi32 SYSLIBS += -lwinspool -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lmpr -lws2_32 -lmapi32 -AR = $(HB_CCPREFIX)ar +AR := $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) RANLIB = $(HB_CCPREFIX)ranlib