From 504ca98e1c96c9c05a8c36fd1e0f16d3ffbeed38 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 9 Aug 2009 19:23:43 +0000 Subject: [PATCH] 2009-08-09 21:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * tests/hbpptest/Makefile * tests/bldtest/Makefile * tests/Makefile * tests/multifnc/Makefile * doc/en-EN/Makefile * doc/Makefile * external/sqlite3/Makefile * external/libhpdf/Makefile * external/libpng/Makefile * external/Makefile * include/Makefile * source/hbextern/Makefile * source/pp/Makefile * source/lang/Makefile * source/vm/maindllh/Makefile * source/vm/mainstd/Makefile * source/vm/maindllp/Makefile * source/vm/Makefile * source/vm/vmmt/Makefile * source/vm/mainwin/Makefile * source/main/Makefile * source/debug/Makefile * source/common/Makefile * source/nortl/Makefile * source/macro/Makefile * source/rtl/gtdos/Makefile * source/rtl/gtwin/Makefile * source/rtl/gtxwc/Makefile * source/rtl/gtcrs/Makefile * source/rtl/gtstd/Makefile * source/rtl/gttrm/Makefile * source/rtl/Makefile * source/rtl/gtcgi/Makefile * source/rtl/gtos2/Makefile * source/rtl/gtsln/Makefile * source/rtl/gtpca/Makefile * source/rtl/gtgui/Makefile * source/rtl/gt_tpl/Makefile * source/rtl/gtwvt/Makefile * source/hbpcre/Makefile * source/codepage/Makefile * source/rdd/dbfntx/Makefile * source/rdd/nulsys/Makefile * source/rdd/Makefile * source/rdd/dbfnsx/Makefile * source/rdd/dbfcdx/Makefile * source/rdd/hsx/Makefile * source/rdd/usrrdd/rdds/Makefile * source/rdd/usrrdd/Makefile * source/rdd/dbffpt/Makefile * source/rdd/hbsix/Makefile * source/compiler/Makefile * source/hbzlib/Makefile * source/Makefile * utils/hbformat/Makefile * utils/hbmk2/Makefile * utils/hbtest/Makefile * utils/hbi18n/Makefile * utils/hbrun/Makefile * contrib/gtalleg/Makefile * contrib/hbmysql/Makefile * contrib/hbct/Makefile * contrib/xhb/Makefile * contrib/hbodbc/Makefile * contrib/hbtpathy/Makefile * contrib/hbgt/Makefile * contrib/hbmzip/Makefile * contrib/hbsqlit3/Makefile * contrib/hbblat/Makefile * contrib/hbqt/Makefile * contrib/hbqt/generator/hbqtgen.prg * contrib/hbqt/Makefile_gen * contrib/hbfbird/Makefile * contrib/hbziparc/Makefile * contrib/hbxbp/Makefile * contrib/xpp/Makefile * contrib/hbnf/Makefile * contrib/Makefile * contrib/hbcurl/hbcurls/Makefile * contrib/hbcurl/Makefile * contrib/gtqtc/Makefile * contrib/rddsql/sddmy/Makefile * contrib/rddsql/sddpg/Makefile * contrib/rddsql/sddfb/Makefile * contrib/rddsql/sddodbc/Makefile * contrib/rddsql/Makefile * contrib/hbhpdf/Makefile * contrib/rddado/Makefile * contrib/gtwvg/Makefile * contrib/hbpgsql/Makefile * contrib/hbclipsm/Makefile * contrib/rddads/Makefile * contrib/hbfimage/Makefile * contrib/hbgd/Makefile * contrib/hbtip/Makefile * contrib/hbbmcdx/Makefile * contrib/hbvpdf/Makefile * contrib/hbssl/Makefile * contrib/hbbtree/Makefile % Using ':=' instead of '=' where possible. ; TODO: Central make files (.cf). * config/global.cf * config/bin.cf * config/globsh.cf * config/dir.cf * config/bsd/gcc.cf * config/bsd/global.cf * config/c.cf * config/wce/msvcarm.cf * config/wce/global.cf * config/wce/mingwarm.cf * config/wce/poccarm.cf * config/rules.cf * config/hpux/gcc.cf * config/darwin/gcc.cf * config/darwin/global.cf * config/dos/watcom.cf * config/dos/djgpp.cf * config/win/watcom.cf * config/win/icc.cf * config/win/global.cf * config/win/cygwin.cf * config/win/msvc.cf * config/win/xcc.cf * config/win/mingw.cf * config/win/pocc.cf * config/win/bcc.cf * config/linux/watcom.cf * config/linux/gcc.cf * config/linux/icc.cf * config/linux/sunpro64.cf * config/linux/sunpro.cf * config/os2/watcom.cf * config/os2/gcc.cf * config/sunos/gcc.cf * config/sunos/sunpro64.cf * config/sunos/sunpro.cf % Using ':=' instead of '=' where possible. (incomplete. pass one) * config/none.cf * Little change in text. * config/global.cf ! Fixed HB_ARCHITECTURE mis-detection as wce for a few win compilers. --- harbour/ChangeLog | 150 ++++++++++++++++++++- harbour/config/bin.cf | 2 +- harbour/config/bsd/gcc.cf | 18 +-- harbour/config/bsd/global.cf | 4 +- harbour/config/c.cf | 2 +- harbour/config/darwin/gcc.cf | 24 ++-- harbour/config/darwin/global.cf | 2 +- harbour/config/dir.cf | 4 +- harbour/config/dos/djgpp.cf | 18 +-- harbour/config/dos/watcom.cf | 20 +-- harbour/config/global.cf | 18 ++- harbour/config/globsh.cf | 30 ++--- harbour/config/hpux/gcc.cf | 20 +-- harbour/config/linux/gcc.cf | 18 +-- harbour/config/linux/icc.cf | 20 +-- harbour/config/linux/sunpro.cf | 18 +-- harbour/config/linux/sunpro64.cf | 2 +- harbour/config/linux/watcom.cf | 20 +-- harbour/config/none.cf | 2 +- harbour/config/os2/gcc.cf | 18 +-- harbour/config/os2/watcom.cf | 20 +-- harbour/config/rules.cf | 12 +- harbour/config/sunos/gcc.cf | 20 +-- harbour/config/sunos/sunpro.cf | 20 +-- harbour/config/sunos/sunpro64.cf | 2 +- harbour/config/wce/global.cf | 4 +- harbour/config/wce/mingwarm.cf | 16 +-- harbour/config/wce/msvcarm.cf | 18 +-- harbour/config/wce/poccarm.cf | 14 +- harbour/config/win/bcc.cf | 18 +-- harbour/config/win/cygwin.cf | 18 +-- harbour/config/win/global.cf | 2 +- harbour/config/win/icc.cf | 18 +-- harbour/config/win/mingw.cf | 16 +-- harbour/config/win/msvc.cf | 18 +-- harbour/config/win/pocc.cf | 18 +-- harbour/config/win/watcom.cf | 20 +-- harbour/config/win/xcc.cf | 18 +-- harbour/contrib/Makefile | 10 +- harbour/contrib/gtalleg/Makefile | 10 +- harbour/contrib/gtqtc/Makefile | 30 ++--- harbour/contrib/gtwvg/Makefile | 22 +-- harbour/contrib/hbblat/Makefile | 10 +- harbour/contrib/hbbmcdx/Makefile | 6 +- harbour/contrib/hbbtree/Makefile | 12 +- harbour/contrib/hbclipsm/Makefile | 10 +- harbour/contrib/hbct/Makefile | 12 +- harbour/contrib/hbcurl/Makefile | 12 +- harbour/contrib/hbcurl/hbcurls/Makefile | 8 +- harbour/contrib/hbfbird/Makefile | 10 +- harbour/contrib/hbfimage/Makefile | 14 +- harbour/contrib/hbgd/Makefile | 12 +- harbour/contrib/hbgt/Makefile | 8 +- harbour/contrib/hbhpdf/Makefile | 8 +- harbour/contrib/hbmysql/Makefile | 12 +- harbour/contrib/hbmzip/Makefile | 8 +- harbour/contrib/hbnf/Makefile | 14 +- harbour/contrib/hbodbc/Makefile | 20 +-- harbour/contrib/hbpgsql/Makefile | 12 +- harbour/contrib/hbqt/Makefile | 30 ++--- harbour/contrib/hbqt/Makefile_gen | 6 +- harbour/contrib/hbqt/generator/hbqtgen.prg | 4 +- harbour/contrib/hbsqlit3/Makefile | 10 +- harbour/contrib/hbssl/Makefile | 12 +- harbour/contrib/hbtip/Makefile | 10 +- harbour/contrib/hbtpathy/Makefile | 10 +- harbour/contrib/hbvpdf/Makefile | 8 +- harbour/contrib/hbxbp/Makefile | 27 ++-- harbour/contrib/hbziparc/Makefile | 6 +- harbour/contrib/rddado/Makefile | 8 +- harbour/contrib/rddads/Makefile | 10 +- harbour/contrib/rddsql/Makefile | 8 +- harbour/contrib/rddsql/sddfb/Makefile | 8 +- harbour/contrib/rddsql/sddmy/Makefile | 8 +- harbour/contrib/rddsql/sddodbc/Makefile | 16 +-- harbour/contrib/rddsql/sddpg/Makefile | 8 +- harbour/contrib/xhb/Makefile | 12 +- harbour/contrib/xpp/Makefile | 10 +- harbour/doc/Makefile | 6 +- harbour/doc/en-EN/Makefile | 6 +- harbour/external/Makefile | 6 +- harbour/external/libhpdf/Makefile | 18 +-- harbour/external/libpng/Makefile | 18 +-- harbour/external/sqlite3/Makefile | 18 +-- harbour/include/Makefile | 8 +- harbour/source/Makefile | 14 +- harbour/source/codepage/Makefile | 6 +- harbour/source/common/Makefile | 8 +- harbour/source/compiler/Makefile | 20 +-- harbour/source/debug/Makefile | 8 +- harbour/source/hbextern/Makefile | 6 +- harbour/source/hbpcre/Makefile | 6 +- harbour/source/hbzlib/Makefile | 6 +- harbour/source/lang/Makefile | 6 +- harbour/source/macro/Makefile | 42 +++--- harbour/source/main/Makefile | 8 +- harbour/source/nortl/Makefile | 8 +- harbour/source/pp/Makefile | 22 +-- harbour/source/rdd/Makefile | 12 +- harbour/source/rdd/dbfcdx/Makefile | 6 +- harbour/source/rdd/dbffpt/Makefile | 8 +- harbour/source/rdd/dbfnsx/Makefile | 6 +- harbour/source/rdd/dbfntx/Makefile | 6 +- harbour/source/rdd/hbsix/Makefile | 8 +- harbour/source/rdd/hsx/Makefile | 6 +- harbour/source/rdd/nulsys/Makefile | 8 +- harbour/source/rdd/usrrdd/Makefile | 6 +- harbour/source/rdd/usrrdd/rdds/Makefile | 6 +- harbour/source/rtl/Makefile | 13 +- harbour/source/rtl/gt_tpl/Makefile | 6 +- harbour/source/rtl/gtcgi/Makefile | 6 +- harbour/source/rtl/gtcrs/Makefile | 22 +-- harbour/source/rtl/gtdos/Makefile | 6 +- harbour/source/rtl/gtgui/Makefile | 12 +- harbour/source/rtl/gtos2/Makefile | 6 +- harbour/source/rtl/gtpca/Makefile | 6 +- harbour/source/rtl/gtsln/Makefile | 18 +-- harbour/source/rtl/gtstd/Makefile | 6 +- harbour/source/rtl/gttrm/Makefile | 24 ++-- harbour/source/rtl/gtwin/Makefile | 6 +- harbour/source/rtl/gtwvt/Makefile | 12 +- harbour/source/rtl/gtxwc/Makefile | 10 +- harbour/source/vm/Makefile | 70 +++++----- harbour/source/vm/maindllh/Makefile | 6 +- harbour/source/vm/maindllp/Makefile | 6 +- harbour/source/vm/mainstd/Makefile | 6 +- harbour/source/vm/mainwin/Makefile | 6 +- harbour/source/vm/vmmt/Makefile | 40 +++--- harbour/tests/Makefile | 6 +- harbour/tests/bldtest/Makefile | 8 +- harbour/tests/hbpptest/Makefile | 10 +- harbour/tests/multifnc/Makefile | 30 +---- harbour/utils/hbformat/Makefile | 12 +- harbour/utils/hbi18n/Makefile | 10 +- harbour/utils/hbmk2/Makefile | 10 +- harbour/utils/hbrun/Makefile | 10 +- harbour/utils/hbtest/Makefile | 32 ++--- 137 files changed, 1004 insertions(+), 876 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3a2b6aae3c..5dcf8c96ec 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,154 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-09 21:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * tests/hbpptest/Makefile + * tests/bldtest/Makefile + * tests/Makefile + * tests/multifnc/Makefile + * doc/en-EN/Makefile + * doc/Makefile + * external/sqlite3/Makefile + * external/libhpdf/Makefile + * external/libpng/Makefile + * external/Makefile + * include/Makefile + * source/hbextern/Makefile + * source/pp/Makefile + * source/lang/Makefile + * source/vm/maindllh/Makefile + * source/vm/mainstd/Makefile + * source/vm/maindllp/Makefile + * source/vm/Makefile + * source/vm/vmmt/Makefile + * source/vm/mainwin/Makefile + * source/main/Makefile + * source/debug/Makefile + * source/common/Makefile + * source/nortl/Makefile + * source/macro/Makefile + * source/rtl/gtdos/Makefile + * source/rtl/gtwin/Makefile + * source/rtl/gtxwc/Makefile + * source/rtl/gtcrs/Makefile + * source/rtl/gtstd/Makefile + * source/rtl/gttrm/Makefile + * source/rtl/Makefile + * source/rtl/gtcgi/Makefile + * source/rtl/gtos2/Makefile + * source/rtl/gtsln/Makefile + * source/rtl/gtpca/Makefile + * source/rtl/gtgui/Makefile + * source/rtl/gt_tpl/Makefile + * source/rtl/gtwvt/Makefile + * source/hbpcre/Makefile + * source/codepage/Makefile + * source/rdd/dbfntx/Makefile + * source/rdd/nulsys/Makefile + * source/rdd/Makefile + * source/rdd/dbfnsx/Makefile + * source/rdd/dbfcdx/Makefile + * source/rdd/hsx/Makefile + * source/rdd/usrrdd/rdds/Makefile + * source/rdd/usrrdd/Makefile + * source/rdd/dbffpt/Makefile + * source/rdd/hbsix/Makefile + * source/compiler/Makefile + * source/hbzlib/Makefile + * source/Makefile + * utils/hbformat/Makefile + * utils/hbmk2/Makefile + * utils/hbtest/Makefile + * utils/hbi18n/Makefile + * utils/hbrun/Makefile + * contrib/gtalleg/Makefile + * contrib/hbmysql/Makefile + * contrib/hbct/Makefile + * contrib/xhb/Makefile + * contrib/hbodbc/Makefile + * contrib/hbtpathy/Makefile + * contrib/hbgt/Makefile + * contrib/hbmzip/Makefile + * contrib/hbsqlit3/Makefile + * contrib/hbblat/Makefile + * contrib/hbqt/Makefile + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/Makefile_gen + * contrib/hbfbird/Makefile + * contrib/hbziparc/Makefile + * contrib/hbxbp/Makefile + * contrib/xpp/Makefile + * contrib/hbnf/Makefile + * contrib/Makefile + * contrib/hbcurl/hbcurls/Makefile + * contrib/hbcurl/Makefile + * contrib/gtqtc/Makefile + * contrib/rddsql/sddmy/Makefile + * contrib/rddsql/sddpg/Makefile + * contrib/rddsql/sddfb/Makefile + * contrib/rddsql/sddodbc/Makefile + * contrib/rddsql/Makefile + * contrib/hbhpdf/Makefile + * contrib/rddado/Makefile + * contrib/gtwvg/Makefile + * contrib/hbpgsql/Makefile + * contrib/hbclipsm/Makefile + * contrib/rddads/Makefile + * contrib/hbfimage/Makefile + * contrib/hbgd/Makefile + * contrib/hbtip/Makefile + * contrib/hbbmcdx/Makefile + * contrib/hbvpdf/Makefile + * contrib/hbssl/Makefile + * contrib/hbbtree/Makefile + % Using ':=' instead of '=' where possible. + ; TODO: Central make files (.cf). + + * config/global.cf + * config/bin.cf + * config/globsh.cf + * config/dir.cf + * config/bsd/gcc.cf + * config/bsd/global.cf + * config/c.cf + * config/wce/msvcarm.cf + * config/wce/global.cf + * config/wce/mingwarm.cf + * config/wce/poccarm.cf + * config/rules.cf + * config/hpux/gcc.cf + * config/darwin/gcc.cf + * config/darwin/global.cf + * config/dos/watcom.cf + * config/dos/djgpp.cf + * config/win/watcom.cf + * config/win/icc.cf + * config/win/global.cf + * config/win/cygwin.cf + * config/win/msvc.cf + * config/win/xcc.cf + * config/win/mingw.cf + * config/win/pocc.cf + * config/win/bcc.cf + * config/linux/watcom.cf + * config/linux/gcc.cf + * config/linux/icc.cf + * config/linux/sunpro64.cf + * config/linux/sunpro.cf + * config/os2/watcom.cf + * config/os2/gcc.cf + * config/sunos/gcc.cf + * config/sunos/sunpro64.cf + * config/sunos/sunpro.cf + % Using ':=' instead of '=' where possible. + (incomplete. pass one) + + * config/none.cf + * Little change in text. + + * config/global.cf + ! Fixed HB_ARCHITECTURE mis-detection as wce for a few win compilers. + 2009-08-09 19:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * Makefile * tests/Makefile @@ -24,7 +172,7 @@ * contrib/hbwin/Makefile * utils/Makefile % Started converting '=' operators to ':=' where applicable. - ; TODO: Rest of Makefiles. + ; TODO: Rest of Makefiles. [DONE] * contrib/hbwin/Makefile ! Including 'global.cf' directly to make HB_ARCHITECTURE/HB_COMPILER diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf index d62ec26c0e..07bf66991d 100644 --- a/harbour/config/bin.cf +++ b/harbour/config/bin.cf @@ -10,7 +10,7 @@ ifneq ($(HB_COMPILER),) include $(TOP)$(ROOT)config/c.cf include $(TOP)$(ROOT)config/prg.cf -HB_GCMODE = 0 +HB_GCMODE := 0 BIN_NAME = diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index b1018b85fe..bd7ae6d987 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -31,7 +31,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CMP) -LD_OUT = -o +LD_OUT := -o LINKPATHS += -L$(LIB_DIR) @@ -88,7 +88,7 @@ LINKLIBS += -lm -Wl,--end-group LDFLAGS += $(LINKPATHS) -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf index 95e51837b9..b6f21db587 100644 --- a/harbour/config/bsd/global.cf +++ b/harbour/config/bsd/global.cf @@ -8,5 +8,5 @@ BIN_EXT := HB_GT_LIBS += gttrm -MAKE = gmake -RANLIB = ranlib +MAKE := gmake +RANLIB := ranlib diff --git a/harbour/config/c.cf b/harbour/config/c.cf index afa44c8e07..e592be9afb 100644 --- a/harbour/config/c.cf +++ b/harbour/config/c.cf @@ -10,7 +10,7 @@ ifdef YACC_SOURCE YACC_BASE = $(YACC_SOURCE:.y=) YACC_C = $(YACC_BASE)y.c YACC_H_TMP = $(YACC_C:.c=.h) - YACC_H = y_tab.h + YACC_H := y_tab.h YACC_OUTPUT = $(YACC_C:.c=.out) YACC_OBJ = $(YACC_C:.c=$(OBJ_EXT)) YACC_HB_H := $(foreach h, $(YACC_HEADERS), $(HB_INC_COMPILE)/$(h)) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 46e568acad..43013e1f31 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -3,22 +3,22 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else # for old Darwin systems (having GCC 2.95) this may need to be # redefined to 'cc'. - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) -CC_IN = -c +CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. -CC_OUT = -o$(subst x,x, ) +CC_OUT := -o$(subst x,x, ) CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -45,7 +45,7 @@ endif #CFLAGS += -Wno-long-double LD = $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) -LD_OUT = -o +LD_OUT := -o LINKPATHS += -L$(LIB_DIR) @@ -63,7 +63,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB = ncurses +HB_CRS_LIB := ncurses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) @@ -99,12 +99,12 @@ LINKLIBS += -lm LDFLAGS = $(LINKPATHS) LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) $(LINKLIBS) -#AR = ar +#AR := ar #ARFLAGS = $(HB_USER_AFLAGS) #AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@ -LIBTOOL = libtool +LIBTOOL := libtool LIBTOOLFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(LIBTOOL) -static $(LIBTOOLFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) -RANLIB = ranlib +RANLIB := ranlib include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf index ee890dff49..cad3aa2ee4 100644 --- a/harbour/config/darwin/global.cf +++ b/harbour/config/darwin/global.cf @@ -8,4 +8,4 @@ BIN_EXT := HB_GT_LIBS += gttrm -RANLIB = ranlib +RANLIB := ranlib diff --git a/harbour/config/dir.cf b/harbour/config/dir.cf index 4ecf7e765b..0e786a408f 100644 --- a/harbour/config/dir.cf +++ b/harbour/config/dir.cf @@ -36,12 +36,12 @@ DIRS_PURE = $(filter-out {%},$(subst {, {,$(DIRS))) DIRS_DEP = $(filter-out $(DIRS_PURE),$(DIRS)) DIRS_MK = $(foreach d, $(DIRS_PURE), $(if $(wildcard $(d)/Makefile),$(d),)) DIR_RULE = $(foreach dir, $(DIRS_MK), $(dir_mk)) -MULTI_DEPS = yes +MULTI_DEPS := yes else DIRS := $(filter-out {%},$(subst {, {,$(DIRS))) -MULTI_DEPS = no +MULTI_DEPS := no endif diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 4af2a5599d..077b94447e 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = gpp + HB_CMP := gpp else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -31,7 +31,7 @@ CFLAGS += -g endif LD = $(HB_CMP) -LD_OUT = -o +LD_OUT := -o LDLIBS = -lm LINKPATHS += -L$(LIB_DIR) @@ -82,7 +82,7 @@ $(foreach file, $(LINKLIBS), $(link_file)) -$(LD) @__link__.tmp endef -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(create_library) diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index e5dd747fc4..581c0d0236 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -11,22 +11,22 @@ # http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlib.html # --------------------------------------------------------------- -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib ifeq ($(HB_BUILD_MODE),c) -CC = wcc386 +CC := wcc386 endif ifeq ($(HB_BUILD_MODE),cpp) -CC = wpp386 +CC := wpp386 endif # Build in C++ mode by default ifeq ($(HB_BUILD_MODE),) -CC = wpp386 +CC := wpp386 endif -CC_IN = -CC_OUT = -fo= +CC_IN := +CC_OUT := -fo= CPPFLAGS = -zq -bt=dos @@ -92,7 +92,7 @@ $(foreach lib, $(GTLIBS), $(link_lib)) -$(LD) @__link__.tmp endef -LD = wlink +LD := wlink # different SYS values: dos4g (default), pmodew (commercial), causeway ifeq ($(LIBNAME),hbpp) # we force causeway here as workaround for reduced command line size in dos4g @@ -129,7 +129,7 @@ $(foreach file, $(^F), $(lib_object)) $(AR) $(ARFLAGS) @__lib__.tmp endef -AR = wlib +AR := wlib ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS) AR_RULE = $(create_library) diff --git a/harbour/config/global.cf b/harbour/config/global.cf index a665b317a0..da4a57aae1 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -281,9 +281,9 @@ endif # Directory separator default ifeq ($(DIRSEP),) - DIRSEP = / + DIRSEP := / ifneq ($(HB_SHELL),sh) - DIRSEP = $(subst /,\,\) + DIRSEP := $(subst /,\,\) endif endif # Path separator default @@ -291,9 +291,9 @@ ifeq ($(PTHSEP),) # small hack, it's hard to detect what is real path separator because # some shells in DOS/Windows translates DOS style paths to POSIX form ifeq ($(subst ;,:,$(PATH)),$(PATH)) - PTHSEP = : + PTHSEP := : else - PTHSEP = ; + PTHSEP := ; endif endif @@ -361,8 +361,16 @@ endif ifeq ($(HB_ARCHITECTURE),) HB_ARCHITECTURE := $(HB_HOST_ARCH) - ifneq ($(findstring $(HB_COMPILER),msvcarm mingwarm poccarm),) + ifeq ($(HB_COMPILER),msvcarm) HB_ARCHITECTURE := wce + else + ifeq ($(HB_COMPILER),mingwarm) + HB_ARCHITECTURE := wce + else + ifeq ($(HB_COMPILER),poccarm) + HB_ARCHITECTURE := wce + endif + endif endif endif ifeq ($(HB_COMPILER),) diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf index f06e873791..6cbbc9b60d 100644 --- a/harbour/config/globsh.cf +++ b/harbour/config/globsh.cf @@ -28,11 +28,11 @@ endif ifeq ($(HB_SHELL),sh) MK = $(MAKE) -RM = rm -f -RDP = rm -f -r -CP = cp -f -MD = mkdir -MDP = mkdir -p +RM := rm -f +RDP := rm -f -r +CP := cp -f +MD := mkdir +MDP := mkdir -p dirbase:: @[ -d "$(OBJ_DIR)" ] || $(MDP) $(OBJ_DIR) @@ -55,11 +55,11 @@ endif ifeq ($(HB_SHELL),nt) MK = "$(subst \,/,$(subst \~,~,$(MAKE)))" -RM = del /q /f -RDP = rmdir /q /s -CP = copy -MD = mkdir -MDP = mkdir +RM := del /q /f +RDP := rmdir /q /s +CP := copy +MD := mkdir +MDP := mkdir dirbase:: -@if not exist "$(OBJ_DIR_OS)" $(MDP) "$(OBJ_DIR_OS)" @@ -80,10 +80,10 @@ endif ifeq ($(HB_SHELL),os2) MK = $(subst \,/,$(subst \~,~,$(MAKE))) -RM = del /n +RM := del /n RDP = $(TOOL_DIR)os2-rm -rf -CP = copy -MD = mkdir +CP := copy +MD := mkdir MDP = $(TOOL_DIR)os2-mkdir -p dirbase:: @@ -101,10 +101,10 @@ endif ifeq ($(HB_SHELL),dos) MK = $(subst \,/,$(subst \~,~,$(MAKE))) -RM = del +RM := del RDP = $(TOOL_DIR)dj-rm -f -r CP = $(TOOL_DIR)dj-cp -f -MD = mkdir +MD := mkdir MDP = $(TOOL_DIR)dj-mkdir -p dirbase:: diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index eec332e326..2d80ecd3c6 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -39,7 +39,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CMP) -LD_OUT = -o +LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -57,7 +57,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB = ncurses +HB_CRS_LIB := ncurses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) LINKLIBS += -l$(HB_CRS_LIB) @@ -85,7 +85,7 @@ LINKLIBS += -lm -lrt LDFLAGS += $(LINKPATHS) -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index dda4ccbecd..05414c0735 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) ifeq ($(HB_COMPILER),icc) @@ -46,7 +46,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP) -LD_OUT = -o +LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -69,7 +69,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)),) LINKLIBS += -l$(HB_CRS_LIB) diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 0fa87407d0..0328e2674e 100644 --- a/harbour/config/linux/icc.cf +++ b/harbour/config/linux/icc.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = icpc + HB_CMP := icpc else - HB_CMP = icc + HB_CMP := icc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) #CFLAGS = -fast @@ -40,7 +40,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CMP) -LD_OUT = -o +LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -63,7 +63,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)),) LINKLIBS += -l$(HB_CRS_LIB) @@ -96,7 +96,7 @@ LINKLIBS += -lm -lrt -ldl -Wl,--end-group LDFLAGS = $(LINKPATHS) -AR = xiar +AR := xiar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index 5f51d18b9b..767c251f9d 100644 --- a/harbour/config/linux/sunpro.cf +++ b/harbour/config/linux/sunpro.cf @@ -3,17 +3,17 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = CC + HB_CMP := CC else - HB_CMP = cc + HB_CMP := cc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) -CC_IN = -c +CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. CC_OUT = -o$(subst x,x, ) @@ -51,7 +51,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) -LD_OUT = -o$(subst x,x, ) +LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -69,7 +69,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB = curses +HB_CRS_LIB := curses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) LINKLIBS += -l$(HB_CRS_LIB) @@ -102,7 +102,7 @@ LINKLIBS += -lnsl -lresolv LDFLAGS += $(LINKPATHS) -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) diff --git a/harbour/config/linux/sunpro64.cf b/harbour/config/linux/sunpro64.cf index 1d56875633..bc1f77b9bc 100644 --- a/harbour/config/linux/sunpro64.cf +++ b/harbour/config/linux/sunpro64.cf @@ -2,6 +2,6 @@ # $Id$ # -HB_ISAOPT = -m64 +HB_ISAOPT := -m64 include $(TOP)$(ROOT)config/linux/sunpro.cf diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf index dda8c71629..0dfc348d9c 100644 --- a/harbour/config/linux/watcom.cf +++ b/harbour/config/linux/watcom.cf @@ -11,22 +11,22 @@ # http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlib.html # --------------------------------------------------------------- -OBJ_EXT = .o -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .o +LIB_PREF := +LIB_EXT := .lib ifeq ($(HB_BUILD_MODE),c) -CC = wcc386 +CC := wcc386 endif ifeq ($(HB_BUILD_MODE),cpp) -CC = wpp386 +CC := wpp386 endif # Build in C++ mode by default ifeq ($(HB_BUILD_MODE),) -CC = wpp386 +CC := wpp386 endif -CC_IN = -CC_OUT = -fo= +CC_IN := +CC_OUT := -fo= CPPFLAGS = -zq -bt=linux @@ -63,7 +63,7 @@ empty:= space:= $(empty) $(empty) comma:= , -LD = wlink +LD := wlink LDFLAGS = SYS linux ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) @@ -91,7 +91,7 @@ ifneq ($(LDLIBS),) LD_RULE += LIB $(LDLIBS) endif -AR = wlib +AR := wlib # ARFLAGS = -c -n -fa $(HB_USER_AFLAGS) ARFLAGS = -c -n $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file, $(^F), -+$(file)) diff --git a/harbour/config/none.cf b/harbour/config/none.cf index 4e6ec57b42..8fe8ff1b63 100644 --- a/harbour/config/none.cf +++ b/harbour/config/none.cf @@ -8,7 +8,7 @@ ifneq ($(HB_ARCHITECTURE),) ifneq ($(HB_COMPILER),) ifneq ($(LIBNAME),) - DIR_RULE := @echo "The '$(LIBNAME)' library ignored." + DIR_RULE := @echo "Harbour GNU Make: '$(LIBNAME)' library ignored." else DIR_RULE := endif diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index b3d26c40d0..7812faa7bf 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := +LIB_EXT := .a CC = $(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -34,7 +34,7 @@ LD = $(HB_CMP) LDFLAGS = # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. -LD_OUT = -o$(subst x,x, ) +LD_OUT := -o$(subst x,x, ) ifeq ($(C_MAIN),) ifeq ($(HB_GT_LIB),os2pm) @@ -102,7 +102,7 @@ endef # Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is & -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(create_library) & $(RM) __lib__.tmp diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf index 163a6e55f8..eb58e02767 100644 --- a/harbour/config/os2/watcom.cf +++ b/harbour/config/os2/watcom.cf @@ -11,22 +11,22 @@ # http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlib.html # --------------------------------------------------------------- -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib ifeq ($(HB_BUILD_MODE),c) -CC = wcc386 +CC := wcc386 endif ifeq ($(HB_BUILD_MODE),cpp) -CC = wpp386 +CC := wpp386 endif # Build in C++ mode by default ifeq ($(HB_BUILD_MODE),) -CC = wpp386 +CC := wpp386 endif -CC_IN = -CC_OUT = -fo= +CC_IN := +CC_OUT := -fo= CPPFLAGS = -zq -bt=os2 @@ -66,7 +66,7 @@ empty:= space:= $(empty) $(empty) comma:= , -LD = wlink +LD := wlink LDFLAGS = SYS os2v2 ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) @@ -103,7 +103,7 @@ endef ARFILES = $(addprefix -+,$(^F)) -AR = wlib +AR := wlib ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS) AR_RULE = $(create_library) diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index fe5f6d289f..edb62b1a84 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -3,28 +3,28 @@ # # How to run yacc. -YACC = bison +YACC := bison YACC_FLAGS := -d $(YACC_FLAGS) # How to run lex. -LEX = flex +LEX := flex LEX_FLAGS := -i -8 $(LEX_FLAGS) ifeq ($(HB_BUILD_DEBUG),yes) - HB_CDBG = -DHB_TR_LEVEL_DEBUG + HB_CDBG := -DHB_TR_LEVEL_DEBUG else - HB_PDBG = -l + HB_PDBG := -l endif ifeq ($(HB_BUILD_UNICODE),yes) - HB_CUNICODE = -DUNICODE + HB_CUNICODE := -DUNICODE endif # How to run Harbour HB := $(HB_HOST_BIN_DIR)/harbour$(HB_HOST_BIN_EXT) ifeq ($(HB_GCMODE),) - HB_GCMODE = 0 + HB_GCMODE := 0 endif HB_FLAGS := -i$(HB_INC_COMPILE) -q0 -w3 -es2 -kmo $(HB_PDBG) HB_RULE = $(HB) $? -n1 $(HB_FLAGS) -gc$(HB_GCMODE) $(HB_FLAGSEXTRA) $(HB_USER_PRGFLAGS) diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 867d05f690..1d39ebea85 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -3,20 +3,20 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CMP) -CC_IN = -c +CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. -CC_OUT = -o$(subst x,x, ) +CC_OUT := -o$(subst x,x, ) CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -38,7 +38,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CMP) -LD_OUT = -o +LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -56,7 +56,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB = curses +HB_CRS_LIB := curses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) LINKLIBS += -l$(HB_CRS_LIB) @@ -85,7 +85,7 @@ LINKLIBS += -lsocket -lnsl -lresolv LDFLAGS += $(LINKPATHS) -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf index 0d6fd3e398..bbdcf3cfc0 100644 --- a/harbour/config/sunos/sunpro.cf +++ b/harbour/config/sunos/sunpro.cf @@ -3,20 +3,20 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = CC + HB_CMP := CC else - HB_CMP = cc + HB_CMP := cc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) -CC_IN = -c +CC_IN := -c # NOTE: The ending space after -o is important, please preserve it. # Now solved with '$(subst x,x, )' expression. -CC_OUT = -o$(subst x,x, ) +CC_OUT := -o$(subst x,x, ) CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -61,7 +61,7 @@ CFLAGS += -g endif LD = $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP) -LD_OUT = -o$(subst x,x, ) +LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -79,7 +79,7 @@ LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl # screen driver libraries ifeq ($(HB_CRS_LIB),) -HB_CRS_LIB = curses +HB_CRS_LIB := curses endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) LINKLIBS += -l$(HB_CRS_LIB) @@ -107,7 +107,7 @@ LINKLIBS += -lsocket -lnsl -lresolv LDFLAGS += $(LINKPATHS) -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false ) diff --git a/harbour/config/sunos/sunpro64.cf b/harbour/config/sunos/sunpro64.cf index 0b3fbf0cd1..f49a152d71 100644 --- a/harbour/config/sunos/sunpro64.cf +++ b/harbour/config/sunos/sunpro64.cf @@ -2,6 +2,6 @@ # $Id$ # -HB_ISAOPT = -m64 +HB_ISAOPT := -m64 include $(TOP)$(ROOT)config/sunos/sunpro.cf diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf index 372981f50e..c11c6d43f1 100644 --- a/harbour/config/wce/global.cf +++ b/harbour/config/wce/global.cf @@ -9,8 +9,8 @@ BIN_EXT := .exe HB_GT_LIBS += gtwvt gtgui # Favor size for CE builds. -HB_GCMODE = 0 +HB_GCMODE := 0 ifeq ($(HB_DYNLIB),yes) - HB_CDYNLIB = -DHB_DYNLIB + HB_CDYNLIB := -DHB_DYNLIB endif diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 94c451410f..08c9fd1322 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCPREFIX)$(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -33,7 +33,7 @@ CFLAGS += -g endif LD = $(HB_CCPREFIX)$(HB_CMP) -LD_OUT = -o +LD_OUT := -o LINKPATHS = LIBLIST = diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf index 3a1f26f276..2d86761308 100644 --- a/harbour/config/wce/msvcarm.cf +++ b/harbour/config/wce/msvcarm.cf @@ -4,17 +4,17 @@ # Work in progress. Please test. -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib ifeq ($(HB_VISUALC_VER_PRE80),) -CC = cl.exe +CC := cl.exe else -CC = clarm.exe +CC := clarm.exe endif -CC_IN = -c -CC_OUT = -Fo +CC_IN := -c +CC_OUT := -Fo CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = -nologo -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN @@ -46,7 +46,7 @@ LD = cl.exe else LD = clarm.exe endif -LD_OUT = -Fe +LD_OUT := -Fe LINKPATHS += /link LINKPATHS += /subsystem:windowsce,4.20 /machine:arm /armpadcode /stack:65536,4096 /nodefaultlib:"oldnames.lib" @@ -70,7 +70,7 @@ endif LDFLAGS = /nologo $(LINKPATHS) -AR = lib.exe +AR := lib.exe ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf index fdbe536c29..0b2451095c 100644 --- a/harbour/config/wce/poccarm.cf +++ b/harbour/config/wce/poccarm.cf @@ -4,13 +4,13 @@ # GNU MAKE file for Pelles ISO C Compiler for WinCE -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib CC = pocc.exe -CC_IN = -c -CC_OUT = -Fo +CC_IN := -c +CC_OUT := -Fo CPPFLAGS = -I. CPPFLAGS += -Ze -Go @@ -38,7 +38,7 @@ endif CFLAGS = LD = polink.exe -LD_OUT = -OUT: +LD_OUT := -OUT: # Add all libraries specified in LIBS. LINKPATHS += -LIBPATH:$(LIB_DIR) @@ -57,7 +57,7 @@ endif LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib LDFLAGS += /SUBSYSTEM:WINDOWS -AR = polib.exe +AR := polib.exe ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 219d979926..e22e6b6467 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -4,13 +4,13 @@ # GNU MAKE file for Borland/CodeGear C/C++ 32-bit (4.x-) -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib -CC = bcc32.exe -CC_IN = -c -CC_OUT = -o +CC := bcc32.exe +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = -q -tWM @@ -33,9 +33,9 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -y -v endif -LD = bcc32.exe +LD := bcc32.exe LDFLAGS = -O2 -LD_OUT = -e +LD_OUT := -e # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -58,7 +58,7 @@ LINKLIBS = $(foreach lib, $(LIBLIST), $(LIB_DIR)/$(lib)) LDFLAGS = $(LINKPATHS) # create library rules -AR = tlib.exe +AR := tlib.exe ARFLAGS = /P64 $(HB_USER_AFLAGS) ifneq ($(HB_SHELL),sh) diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index eb759efe24..6f05c0007b 100644 --- a/harbour/config/win/cygwin.cf +++ b/harbour/config/win/cygwin.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -32,7 +32,7 @@ CFLAGS += -g endif LD = $(HB_CMP) -LD_OUT = -o +LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) @@ -63,7 +63,7 @@ endif LDFLAGS = $(LINKPATHS) -AR = ar +AR := ar ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf index e600b7e3ad..e86bd208a5 100644 --- a/harbour/config/win/global.cf +++ b/harbour/config/win/global.cf @@ -9,5 +9,5 @@ BIN_EXT := .exe HB_GT_LIBS += gtwvt gtgui gtwin ifeq ($(HB_DYNLIB),yes) - HB_CDYNLIB = -DHB_DYNLIB + HB_CDYNLIB := -DHB_DYNLIB endif diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf index 50d1ec5583..37bdc63a24 100644 --- a/harbour/config/win/icc.cf +++ b/harbour/config/win/icc.cf @@ -5,13 +5,13 @@ # Intel(R) C/C++ Compiler # (usage is largely compatible with msvc) -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib -CC = icl.exe -CC_IN = -c -CC_OUT = -Fo +CC := icl.exe +CC_IN := -c +CC_OUT := -Fo CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE) CFLAGS = -Gs @@ -36,8 +36,8 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -Zi endif -LD = icl.exe -LD_OUT = -Fe +LD := icl.exe +LD_OUT := -Fe # Add all libraries specified in LIBS. LINKPATHS += /link /libpath:$(LIB_DIR) @@ -55,7 +55,7 @@ endif LDFLAGS = $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib -AR = xilib.exe +AR := xilib.exe ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index b37d8c7300..2cefe7555a 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -3,18 +3,18 @@ # ifeq ($(HB_BUILD_MODE),cpp) - HB_CMP = g++ + HB_CMP := g++ else - HB_CMP = gcc + HB_CMP := gcc endif -OBJ_EXT = .o -LIB_PREF = lib -LIB_EXT = .a +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a CC = $(HB_CCPREFIX)$(HB_CMP) -CC_IN = -c -CC_OUT = -o +CC_IN := -c +CC_OUT := -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = @@ -35,7 +35,7 @@ CFLAGS += -g endif LD = $(HB_CCPREFIX)$(HB_CMP) -LD_OUT = -o +LD_OUT := -o LINKPATHS = LIBLIST = diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf index 228923806f..24ce9d8e89 100644 --- a/harbour/config/win/msvc.cf +++ b/harbour/config/win/msvc.cf @@ -2,13 +2,13 @@ # $Id$ # -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib -CC = cl.exe -CC_IN = -c -CC_OUT = -Fo +CC := cl.exe +CC_IN := -c +CC_OUT := -Fo CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE) -Gs ifeq ($(HB_BUILD_MODE),c) @@ -46,8 +46,8 @@ endif # CPPFLAGS += -GA # endif -LD = link.exe -LD_OUT = /out: +LD := link.exe +LD_OUT := /out: # Add all libraries specified in LIBS. LINKPATHS += /libpath:$(LIB_DIR) @@ -65,7 +65,7 @@ endif LDFLAGS = /nologo $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib -AR = lib.exe +AR := lib.exe ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf index 9fe4e38263..e5cf0746e9 100644 --- a/harbour/config/win/pocc.cf +++ b/harbour/config/win/pocc.cf @@ -4,13 +4,13 @@ # GNU MAKE file for Pelles ISO C Compiler -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib -CC = pocc.exe -CC_IN = -c -CC_OUT = -Fo +CC := pocc.exe +CC_IN := -c +CC_OUT := -Fo CPPFLAGS = -I. CPPFLAGS += -Ze -Go -MT @@ -34,8 +34,8 @@ endif CFLAGS = -LD = polink.exe -LD_OUT = -OUT: +LD := polink.exe +LD_OUT := -OUT: # Add all libraries specified in LIBS. LINKPATHS += -LIBPATH:$(LIB_DIR) @@ -56,7 +56,7 @@ LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \ comctl32.lib mapi32.lib mpr.lib LDFLAGS += /SUBSYSTEM:CONSOLE -AR = polib.exe +AR := polib.exe ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf index cd681c8104..a6e53fe8e4 100644 --- a/harbour/config/win/watcom.cf +++ b/harbour/config/win/watcom.cf @@ -11,22 +11,22 @@ # http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlib.html # --------------------------------------------------------------- -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib ifeq ($(HB_BUILD_MODE),c) -CC = wcc386 +CC := wcc386 endif ifeq ($(HB_BUILD_MODE),cpp) -CC = wpp386 +CC := wpp386 endif # Build in C++ mode by default ifeq ($(HB_BUILD_MODE),) -CC = wpp386 +CC := wpp386 endif -CC_IN = -CC_OUT = -fo= +CC_IN := +CC_OUT := -fo= CPPFLAGS = -zq -bt=nt -bm @@ -87,7 +87,7 @@ $(foreach lib, $(GTLIBS), $(link_lib)) -$(LD) @__link__.tmp endef -LD = wlink +LD := wlink LDFLAGS = SYS nt ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) @@ -118,7 +118,7 @@ $(foreach file, $(^F), $(lib_object)) $(AR) $(ARFLAGS) @__lib__.tmp endef -AR = wlib +AR := wlib ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS) AR_RULE = $(create_library) diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf index 840d30f4d2..5c98c6b4b7 100644 --- a/harbour/config/win/xcc.cf +++ b/harbour/config/win/xcc.cf @@ -4,13 +4,13 @@ # GNU MAKE file for xHarbour.com POCC compiler -OBJ_EXT = .obj -LIB_PREF = -LIB_EXT = .lib +OBJ_EXT := .obj +LIB_PREF := +LIB_EXT := .lib -CC = xcc.exe -CC_IN = -c -CC_OUT = -Fo +CC := xcc.exe +CC_IN := -c +CC_OUT := -Fo CFLAGS = -I. ifneq ($(HB_INC_COMPILE),) CFLAGS += -I$(HB_INC_COMPILE) @@ -28,8 +28,8 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -Zi endif -LD = xlink.exe -LD_OUT = -OUT: +LD := xlink.exe +LD_OUT := -OUT: # Add all libraries specified in LIBS. LINKPATHS += -LIBPATH:$(LIB_DIR) @@ -49,7 +49,7 @@ LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib gdi32.lib ws2_32.lib advapi32.lib LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \ comctl32.lib mapi32.lib mpr.lib -AR = xlib.exe +AR := xlib.exe ARFLAGS = $(HB_USER_AFLAGS) AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index d15a84591d..5c1910b211 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../ +ROOT := ../ ifeq ($(HB_CONTRIBLIBS),) # standalone contribs -DIRS=\ +DIRS := \ gtwvg \ hbbmcdx \ hbbtree \ @@ -30,7 +30,7 @@ DIRS=\ xpp \ # contribs with external dependencies -DIRS +=\ +DIRS += \ gtalleg \ hbblat \ hbcurl \ @@ -46,13 +46,13 @@ DIRS +=\ rddsql \ # contribs dependent on above -DIRS +=\ +DIRS += \ hbxbp \ else ifneq ($(HB_CONTRIBLIBS),no) -DIRS = $(HB_CONTRIBLIBS) +DIRS := $(HB_CONTRIBLIBS) endif endif diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile index 5ff38fb3d7..1b5e2d12a6 100644 --- a/harbour/contrib/gtalleg/Makefile +++ b/harbour/contrib/gtalleg/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=gtalleg +LIBNAME := gtalleg ifneq ($(HB_COMPILER),pocc) ifneq ($(HB_COMPILER),pocc64) @@ -16,7 +16,7 @@ ifneq ($(HB_COMPILER),mingwarm) ifeq ($(HB_INC_ALLEGRO),) ifeq ($(HB_XBUILD),) -HB_INC_ALLEGRO = /usr/include /opt/local/include +HB_INC_ALLEGRO := /usr/include /opt/local/include endif endif @@ -25,13 +25,13 @@ HB_INC_ALLEGRO_OK += $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegr ifneq ($(strip $(HB_INC_ALLEGRO_OK)),) ifneq ($(HB_ALLEGRO_STATIC),) -LIBNAME=gtallegs +LIBNAME := gtallegs HB_USER_CFLAGS += -DALLEGRO_STATICLINK endif HB_USER_CFLAGS += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ gtalleg.c \ ssf.c \ diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile index a32df54f09..2820091f9b 100644 --- a/harbour/contrib/gtqtc/Makefile +++ b/harbour/contrib/gtqtc/Makefile @@ -2,35 +2,35 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=gtqtc +LIBNAME := gtqtc ifeq ($(HB_WITH_QT),) -HB_WITH_QT=yes +HB_WITH_QT := yes ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),mingw64) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),watcom) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),bcc) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),pocc) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),pocc64) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),poccarm) -HB_WITH_QT=no +HB_WITH_QT := no endif endif @@ -38,14 +38,14 @@ ifeq ($(HB_WITH_QT),yes) ifeq ($(HB_INC_QT),) ifeq ($(HB_XBUILD),) -HB_INC_QT = /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include +HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include endif endif HB_INC_QT_OK += $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)) ifeq ($(HB_ARCHITECTURE),darwin) ifeq ($(strip $(HB_INC_QT_OK)),) -HB_INC_QT_OK = $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,) +HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,) ifeq ($(HB_INC_QT_OK),spec) HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers @@ -66,11 +66,11 @@ ifneq ($(strip $(HB_INC_QT_OK)),spec) HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit) endif -CPP_SOURCES=\ +CPP_SOURCES := \ gtqtc.cpp \ moc_gtqtc.cpp \ -C_HEADERS=\ +C_HEADERS := \ gtqtc.h \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index 01a5db00e6..e9d57a975d 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -4,30 +4,30 @@ HB_USER_CFLAGS += -I$(TOP)$(ROOT)contrib/hbwin -ROOT = ../../ +ROOT := ../../ -LIBNAME=gtwvg +LIBNAME := gtwvg ifeq ($(HB_WITH_GTWVG),) ifeq ($(HB_ARCHITECTURE),win) ifeq ($(HB_COMPILER),mingw) -HB_WITH_GTWVG=yes +HB_WITH_GTWVG := yes endif ifeq ($(HB_COMPILER),msvc) -HB_WITH_GTWVG=yes +HB_WITH_GTWVG := yes endif ifeq ($(HB_COMPILER),watcom) -HB_WITH_GTWVG=yes +HB_WITH_GTWVG := yes endif ifeq ($(HB_COMPILER),pocc) -HB_WITH_GTWVG=yes +HB_WITH_GTWVG := yes endif ifeq ($(HB_COMPILER),icc) -HB_WITH_GTWVG=yes +HB_WITH_GTWVG := yes endif ifeq ($(HB_COMPILER),bcc) -HB_WITH_GTWVG=yes +HB_WITH_GTWVG := yes endif endif @@ -35,7 +35,7 @@ endif ifeq ($(HB_WITH_GTWVG),yes) -C_SOURCES=\ +C_SOURCES := \ gtwvg.c \ wvgcore.c \ wvgutils.c \ @@ -46,7 +46,7 @@ C_SOURCES=\ wincallb.c \ wvgcuig.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ wvgclass.prg \ wvgpaint.prg \ wvgphdlr.prg \ @@ -76,7 +76,7 @@ PRG_SOURCES=\ wvgscrlb.prg \ wvgtabpg.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ hbgtwvg.ch \ wvtwin.ch \ wvgparts.ch \ diff --git a/harbour/contrib/hbblat/Makefile b/harbour/contrib/hbblat/Makefile index 9331c98138..161d401972 100644 --- a/harbour/contrib/hbblat/Makefile +++ b/harbour/contrib/hbblat/Makefile @@ -2,19 +2,19 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbblat +LIBNAME := hbblat ifeq ($(HB_ARCHITECTURE),win) -C_SOURCES = \ +C_SOURCES := \ blatwrp.c \ -PRG_SOURCES = \ +PRG_SOURCES := \ blatcls.prg \ -PRG_HEADERS = \ +PRG_HEADERS := \ hbblat.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbbmcdx/Makefile b/harbour/contrib/hbbmcdx/Makefile index 0969097b7b..01ee57f585 100644 --- a/harbour/contrib/hbbmcdx/Makefile +++ b/harbour/contrib/hbbmcdx/Makefile @@ -2,12 +2,12 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ bmdbfcdx.c \ bmsixcdx.c -LIBNAME=hbbmcdx +LIBNAME := hbbmcdx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbbtree/Makefile b/harbour/contrib/hbbtree/Makefile index 8dcc568995..3e6f5b9d46 100644 --- a/harbour/contrib/hbbtree/Makefile +++ b/harbour/contrib/hbbtree/Makefile @@ -2,21 +2,21 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ hb_btree.c \ -C_HEADERS=\ +C_HEADERS := \ hb_btree.h \ -PRG_SOURCES=\ +PRG_SOURCES := \ tbtree.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ hb_btree.ch \ -LIBNAME=hbbtree +LIBNAME := hbbtree include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) diff --git a/harbour/contrib/hbclipsm/Makefile b/harbour/contrib/hbclipsm/Makefile index 594c3ef923..4970ea5046 100644 --- a/harbour/contrib/hbclipsm/Makefile +++ b/harbour/contrib/hbclipsm/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ date.c \ environ.c \ gauge.c \ @@ -15,12 +15,12 @@ C_SOURCES=\ status.c \ time.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ -PRG_HEADERS=\ +PRG_HEADERS := \ time87.ch \ -LIBNAME=hbclipsm +LIBNAME := hbclipsm include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) diff --git a/harbour/contrib/hbct/Makefile b/harbour/contrib/hbct/Makefile index a6ca18091a..e18f96f301 100644 --- a/harbour/contrib/hbct/Makefile +++ b/harbour/contrib/hbct/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbct +LIBNAME := hbct -C_SOURCES =\ +C_SOURCES := \ addascii.c \ asciisum.c \ ascpos.c \ @@ -86,7 +86,7 @@ C_SOURCES =\ wordrepl.c \ wordtoch.c \ -C_HEADERS = \ +C_HEADERS := \ ct.h \ ctmath.h \ ctset.h \ @@ -94,7 +94,7 @@ C_HEADERS = \ ctstrfil.h \ ctwin.h \ -PRG_SOURCES=\ +PRG_SOURCES := \ ct.prg \ ctdummy.prg \ ctmisc.prg \ @@ -112,7 +112,7 @@ PRG_SOURCES=\ scrmark.prg \ showtime.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ ct.ch \ ctdisk.ch \ cterror.ch \ diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index ce7c6f8ef9..39e3cd2cf3 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -2,17 +2,17 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbcurl +LIBNAME := hbcurl -HB_INC_CURL_OK = +HB_INC_CURL_OK := ifneq ($(HB_ARCHITECTURE),dos) ifeq ($(HB_INC_CURL),) ifeq ($(HB_XBUILD),) -HB_INC_CURL = /usr/include +HB_INC_CURL := /usr/include endif endif @@ -24,11 +24,11 @@ ifneq ($(strip $(HB_INC_CURL_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ hbcurl.c \ hbcurlm.c \ -PRG_HEADERS=\ +PRG_HEADERS := \ hbcurl.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbcurl/hbcurls/Makefile b/harbour/contrib/hbcurl/hbcurls/Makefile index 8f2ab155d6..e5d81621ea 100644 --- a/harbour/contrib/hbcurl/hbcurls/Makefile +++ b/harbour/contrib/hbcurl/hbcurls/Makefile @@ -4,11 +4,11 @@ vpath %.c ../ -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=hbcurls +LIBNAME := hbcurls -HB_INC_CURL_OK = $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),)) +HB_INC_CURL_OK := $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),)) ifneq ($(strip $(HB_INC_CURL_OK)),) @@ -16,7 +16,7 @@ ifneq ($(strip $(HB_INC_CURL_OK)),) HB_USER_CFLAGS += -DCURL_STATICLIB HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ hbcurl.c \ hbcurlm.c \ diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile index f0318c1c95..053f2eea8b 100644 --- a/harbour/contrib/hbfbird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -2,16 +2,16 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbfbird +LIBNAME := hbfbird ifneq ($(HB_COMPILER),pocc64) ifneq ($(HB_COMPILER),poccarm) ifeq ($(HB_INC_FIREBIRD),) ifeq ($(HB_XBUILD),) -HB_INC_FIREBIRD = /usr/include /opt/firebird/include +HB_INC_FIREBIRD := /usr/include /opt/firebird/include endif endif @@ -21,10 +21,10 @@ ifneq ($(strip $(HB_INC_FIREBIRD_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ firebird.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ tfirebrd.prg \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index e57f39323c..7d386b9fbd 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbfimage +LIBNAME := hbfimage -HB_INC_FREEIMAGE_OK = +HB_INC_FREEIMAGE_OK := ifneq ($(HB_ARCHITECTURE),dos) # disabled until a proper solution is found for type collision @@ -16,7 +16,7 @@ ifneq ($(HB_ARCHITECTURE),darwin) ifeq ($(HB_INC_FREEIMAGE),) ifeq ($(HB_XBUILD),) -HB_INC_FREEIMAGE = /usr/include /opt/local/include +HB_INC_FREEIMAGE := /usr/include /opt/local/include endif endif @@ -27,13 +27,13 @@ ifneq ($(strip $(HB_INC_FREEIMAGE_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_FREEIMAGE_OK), -I$(d)) -C_SOURCES = \ +C_SOURCES := \ fi_winfu.c \ fi_wrp.c \ -PRG_SOURCES= \ +PRG_SOURCES := \ -PRG_HEADERS=\ +PRG_HEADERS := \ freeimage.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index 7274b2c95c..14ff0dbb2f 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -8,13 +8,13 @@ # On Linux you'll need these packages: # gd, gd-devel -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbgd +LIBNAME := hbgd ifeq ($(HB_INC_GD),) ifeq ($(HB_XBUILD),) -HB_INC_GD = /usr/include /opt/local/include +HB_INC_GD := /usr/include /opt/local/include endif endif @@ -24,14 +24,14 @@ ifneq ($(strip $(HB_INC_GD_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_GD_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ gdwrp.c \ -PRG_HEADERS=\ +PRG_HEADERS := \ gd.ch \ gdextern.ch \ -PRG_SOURCES=\ +PRG_SOURCES := \ gd.prg \ gdbar.prg \ gdchart.prg \ diff --git a/harbour/contrib/hbgt/Makefile b/harbour/contrib/hbgt/Makefile index 967fbb2ee9..adc3dd3841 100644 --- a/harbour/contrib/hbgt/Makefile +++ b/harbour/contrib/hbgt/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ asciisgt.c \ ascposgt.c \ atdiff.c \ @@ -23,8 +23,6 @@ C_SOURCES=\ strpbrk.c \ strright.c \ -PRG_SOURCES=\ - -LIBNAME=hbgt +LIBNAME := hbgt include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index 398544c678..e22906a1f7 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -4,7 +4,7 @@ ROOT = ../../ -LIBNAME=hbhpdf +LIBNAME := hbhpdf ifeq ($(HB_INC_LIBHARU),) ifeq ($(HB_XBUILD),) @@ -18,14 +18,12 @@ ifneq ($(strip $(HB_INC_LIBHARU_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_LIBHARU_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ harupdf.c \ -PRG_HEADERS=\ +PRG_HEADERS := \ harupdf.ch \ -PRG_SOURCES=\ - include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index 3f5d93d788..33cdd6a372 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbmysql +LIBNAME := hbmysql ifeq ($(HB_INC_MYSQL),) ifeq ($(HB_XBUILD),) -HB_INC_MYSQL = /usr/include/mysql /opt/local/include/mysql5/mysql +HB_INC_MYSQL := /usr/include/mysql /opt/local/include/mysql5/mysql endif endif @@ -18,15 +18,15 @@ ifneq ($(strip $(HB_INC_MYSQL_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ mysql.c \ mysqlold.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ tmysql.prg \ tsqlbrw.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ mysql.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbmzip/Makefile b/harbour/contrib/hbmzip/Makefile index 550ec34435..02c2584d38 100644 --- a/harbour/contrib/hbmzip/Makefile +++ b/harbour/contrib/hbmzip/Makefile @@ -2,17 +2,17 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbmzip +LIBNAME := hbmzip -C_SOURCES =\ +C_SOURCES := \ ioapi.c \ zip.c \ unzip.c \ hbmzip.c -PRG_HEADERS=\ +PRG_HEADERS := \ hbmzip.ch include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbnf/Makefile b/harbour/contrib/hbnf/Makefile index df1db84f50..d8469e120f 100644 --- a/harbour/contrib/hbnf/Makefile +++ b/harbour/contrib/hbnf/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbnf +LIBNAME := hbnf -C_SOURCES =\ +C_SOURCES := \ alt.c \ caplock.c \ chdir.c \ @@ -38,12 +38,12 @@ C_SOURCES =\ shift.c \ stod.c \ -BAD_C_SOURCES =\ +BAD_C_SOURCES := \ ontick.c \ peek.c \ poke.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ aading.prg \ aavg.prg \ acctadj.prg \ @@ -146,10 +146,10 @@ PRG_SOURCES=\ xbox.prg \ year.prg \ -BAD_PRG_SOURCES=\ +BAD_PRG_SOURCES := \ mouse1.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ ftmenuto.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index ee6b5dad1e..c8699ba52e 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -2,18 +2,18 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbodbc +LIBNAME := hbodbc ifeq ($(HB_COMPILER),rsxnt) -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif ifeq ($(HB_ARCHITECTURE),dos) -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif ifneq ($(HB_ARCHITECTURE),win) @@ -22,7 +22,7 @@ ifeq ($(HB_WITHOUT_ODBC),) ifeq ($(HB_INC_ODBC),) ifeq ($(HB_XBUILD),) -HB_INC_ODBC = /usr/include /usr/local/include +HB_INC_ODBC := /usr/include /usr/local/include endif endif @@ -31,7 +31,7 @@ HB_INC_ODBC_OK += $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d), ifneq ($(strip $(HB_INC_ODBC_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d)) else -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif endif @@ -40,15 +40,15 @@ endif ifneq ($(HB_WITHOUT_ODBC),yes) -C_SOURCES= \ +C_SOURCES := \ odbc.c \ odbcold.c \ -PRG_SOURCES= \ +PRG_SOURCES := \ todbc.prg \ browodbc.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ sql.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index 186b076269..0ecaef0d9f 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbpgsql +LIBNAME := hbpgsql ifeq ($(HB_INC_PGSQL),) ifeq ($(HB_XBUILD),) -HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83 +HB_INC_PGSQL := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83 endif endif @@ -18,14 +18,14 @@ ifneq ($(strip $(HB_INC_PGSQL_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ postgres.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ tpostgre.prg \ pgrdd.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ postgres.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile index 8032f87a12..1dc654d8f1 100644 --- a/harbour/contrib/hbqt/Makefile +++ b/harbour/contrib/hbqt/Makefile @@ -2,35 +2,35 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbqt +LIBNAME := hbqt ifeq ($(HB_WITH_QT),) -HB_WITH_QT=yes +HB_WITH_QT := yes ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),mingw64) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),watcom) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),bcc) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),pocc) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),pocc64) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),poccarm) -HB_WITH_QT=no +HB_WITH_QT := no endif endif @@ -38,14 +38,14 @@ ifeq ($(HB_WITH_QT),yes) ifeq ($(HB_INC_QT),) ifeq ($(HB_XBUILD),) -HB_INC_QT = /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include +HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include endif endif HB_INC_QT_OK += $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)) ifeq ($(HB_ARCHITECTURE),darwin) ifeq ($(strip $(HB_INC_QT_OK)),) -HB_INC_QT_OK = $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,) +HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,) ifeq ($(HB_INC_QT_OK),spec) HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers @@ -58,7 +58,7 @@ endif ifneq ($(strip $(HB_INC_QT_OK)),) ifneq ($(HB_QT_STATIC),) -LIBNAME=hbqts +LIBNAME := hbqts HB_USER_CFLAGS += -DQT_NODLL endif @@ -68,7 +68,7 @@ endif include $(TOP)$(ROOT)contrib/hbqt/Makefile_gen -PRG_HEADERS=\ +PRG_HEADERS := \ hbqt.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbqt/Makefile_gen b/harbour/contrib/hbqt/Makefile_gen index 3d7a2dcfa5..811ae9ac02 100644 --- a/harbour/contrib/hbqt/Makefile_gen +++ b/harbour/contrib/hbqt/Makefile_gen @@ -3,7 +3,7 @@ # -CPP_SOURCES=\ +CPP_SOURCES := \ moc_slots.cpp \ hbqt_base.cpp \ hbqt_utils.cpp \ @@ -235,7 +235,7 @@ CPP_SOURCES=\ -PRG_SOURCES=\ +PRG_SOURCES := \ TQAbstractButton.prg \ TQAbstractItemModel.prg \ TQAbstractItemView.prg \ @@ -460,5 +460,3 @@ PRG_SOURCES=\ TQWindowsStyle.prg \ TQWindowsXPStyle.prg \ TQWizard.prg \ - - diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index e1e8b86d5c..502b0ad2be 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1372,7 +1372,7 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut ) aadd( txt_, "# " ) aadd( txt_, " " ) aadd( txt_, " " ) - aadd( txt_, "CPP_SOURCES=\ " ) + aadd( txt_, "CPP_SOURCES := \ " ) /* Insert .cpp sources */ aadd( txt_, chr( 9 ) + 'moc_slots.cpp \' ) @@ -1386,7 +1386,7 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut ) aadd( txt_, " " ) aadd( txt_, " " ) IF !empty( prg_ ) - aadd( txt_, "PRG_SOURCES=\ " ) + aadd( txt_, "PRG_SOURCES := \ " ) FOR EACH s IN prg_ aadd( txt_, chr( 9 ) + 'T' + s + '.prg \' ) NEXT diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index 80942440fb..b76f978875 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbsqlit3 +LIBNAME := hbsqlit3 ifeq ($(HB_INC_SQLITE3),) ifeq ($(HB_XBUILD),) -HB_INC_SQLITE3 = /usr/include +HB_INC_SQLITE3 := /usr/include ifeq ($(HB_ARCHITECTURE),win) HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3 endif @@ -30,10 +30,10 @@ ifneq ($(strip $(HB_INC_SQLITE3_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_SQLITE3_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ hbsqlit3.c \ -PRG_HEADERS=\ +PRG_HEADERS := \ hbsqlit3.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile index 0f21c89e3a..b8254c15a4 100644 --- a/harbour/contrib/hbssl/Makefile +++ b/harbour/contrib/hbssl/Makefile @@ -2,18 +2,18 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbssl +LIBNAME := hbssl -HB_INC_OPENSSL_OK = +HB_INC_OPENSSL_OK := ifneq ($(HB_ARCHITECTURE),dos) ifneq ($(HB_COMPILER),watcom) ifeq ($(HB_INC_OPENSSL),) ifeq ($(HB_XBUILD),) -HB_INC_OPENSSL = /usr/include /usr/local/ssl/include +HB_INC_OPENSSL := /usr/include /usr/local/ssl/include endif endif @@ -29,7 +29,7 @@ ifneq ($(strip $(HB_INC_OPENSSL_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_OPENSSL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ hbssl.c \ bio.c \ err.c \ @@ -46,7 +46,7 @@ C_SOURCES=\ sslsess.c \ x509.c \ -PRG_HEADERS=\ +PRG_HEADERS := \ hbssl.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile index 9e3cac15ea..c68949e4e5 100644 --- a/harbour/contrib/hbtip/Makefile +++ b/harbour/contrib/hbtip/Makefile @@ -2,17 +2,17 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbtip +LIBNAME := hbtip ifneq ($(HB_ARCHITECTURE),dos) -C_SOURCES = \ +C_SOURCES := \ encmthd.c \ utils.c \ -PRG_SOURCES= \ +PRG_SOURCES := \ cgi.prg \ client.prg \ credent.prg \ @@ -31,7 +31,7 @@ PRG_SOURCES= \ thtml.prg \ url.prg \ -PRG_HEADERS= \ +PRG_HEADERS := \ thtml.ch \ tip.ch \ diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index 6067d17a99..2d5a2147bf 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -2,21 +2,21 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbtpathy +LIBNAME := hbtpathy -C_SOURCES=\ +C_SOURCES := \ tpcommon.c \ tpunix.c \ tpwin.c \ tpos2.c \ tpdos.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ telepath.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ telepath.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbvpdf/Makefile b/harbour/contrib/hbvpdf/Makefile index 7a13b1958f..6e221f7ac5 100644 --- a/harbour/contrib/hbvpdf/Makefile +++ b/harbour/contrib/hbvpdf/Makefile @@ -2,16 +2,16 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbvpdf +LIBNAME := hbvpdf -PRG_SOURCES=\ +PRG_SOURCES := \ hbvpdf.prg \ hbvpdft.prg \ hbvpsup.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ hbvpdf.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile index 5ea6570563..8deb5e9486 100644 --- a/harbour/contrib/hbxbp/Makefile +++ b/harbour/contrib/hbxbp/Makefile @@ -4,42 +4,42 @@ HB_USER_PRGFLAGS += -I$(TOP)$(ROOT)contrib/hbqt -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbxbp +LIBNAME := hbxbp ifeq ($(HB_WITH_QT),) -HB_WITH_QT=yes +HB_WITH_QT := yes ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),mingw64) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),watcom) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),bcc) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),pocc) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),pocc64) -HB_WITH_QT=no +HB_WITH_QT := no endif ifeq ($(HB_COMPILER),poccarm) -HB_WITH_QT=no +HB_WITH_QT := no endif endif ifeq ($(HB_WITH_QT),yes) -PRG_SOURCES=\ +PRG_SOURCES := \ xbpgeneric.prg \ xbpdialog.prg \ xbpwindow.prg \ @@ -73,8 +73,7 @@ PRG_SOURCES=\ xbpprintdialog.prg \ xbpbrowse.prg \ - -PRG_HEADERS=\ +PRG_HEADERS := \ xbp.ch \ xbpdev.ch \ appevent.ch \ diff --git a/harbour/contrib/hbziparc/Makefile b/harbour/contrib/hbziparc/Makefile index 0c94e78a4c..c2310fcacc 100644 --- a/harbour/contrib/hbziparc/Makefile +++ b/harbour/contrib/hbziparc/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=hbziparc +LIBNAME := hbziparc -PRG_SOURCES= \ +PRG_SOURCES := \ hbziparc.prg \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile index 7dc5d827d1..f215d7b7a6 100644 --- a/harbour/contrib/rddado/Makefile +++ b/harbour/contrib/rddado/Makefile @@ -2,16 +2,16 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=rddado +LIBNAME := rddado ifneq ($(HB_ARCHITECTURE),os2) -PRG_SOURCES= \ +PRG_SOURCES := \ adordd.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ adordd.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile index 939b115c99..2007d2fb84 100644 --- a/harbour/contrib/rddads/Makefile +++ b/harbour/contrib/rddads/Makefile @@ -2,15 +2,15 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=rddads +LIBNAME := rddads ifneq ($(HB_ARCHITECTURE),dos) ifneq ($(HB_ARCHITECTURE),os2) ifeq ($(HB_INC_ADS),) -HB_INC_ADS = /usr/local/ads/acesdk $(HOME)/ads/acesdk +HB_INC_ADS := /usr/local/ads/acesdk $(HOME)/ads/acesdk endif HB_INC_ADS_OK += $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),)) @@ -22,13 +22,13 @@ ifneq ($(strip $(HB_INC_ADS_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_ADS_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ ads1.c \ adsfunc.c \ adsmgmnt.c \ adsx.c \ -PRG_HEADERS=\ +PRG_HEADERS := \ ads.ch \ adsextrn.ch \ diff --git a/harbour/contrib/rddsql/Makefile b/harbour/contrib/rddsql/Makefile index ff41f6f16c..4abaaaa72c 100644 --- a/harbour/contrib/rddsql/Makefile +++ b/harbour/contrib/rddsql/Makefile @@ -2,15 +2,15 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=rddsql +LIBNAME := rddsql -C_SOURCES=\ +C_SOURCES := \ sqlbase.c \ sqlmix.c \ -DIRS=\ +DIRS := \ sddmy \ sddpg \ sddfb \ diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/rddsql/sddfb/Makefile index 3f745d25b9..4cdeeda023 100644 --- a/harbour/contrib/rddsql/sddfb/Makefile +++ b/harbour/contrib/rddsql/sddfb/Makefile @@ -2,15 +2,15 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=sddfb +LIBNAME := sddfb ifneq ($(HB_COMPILER),pocc64) ifeq ($(HB_INC_FIREBIRD),) ifeq ($(HB_XBUILD),) -HB_INC_FIREBIRD = /usr/include /opt/firebird/include +HB_INC_FIREBIRD := /usr/include /opt/firebird/include endif endif @@ -20,7 +20,7 @@ ifneq ($(strip $(HB_INC_FIREBIRD_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_FIREBIRD_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ fbirddd.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/rddsql/sddmy/Makefile index 39a469f769..1cf8663c8d 100644 --- a/harbour/contrib/rddsql/sddmy/Makefile +++ b/harbour/contrib/rddsql/sddmy/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=sddmy +LIBNAME := sddmy ifeq ($(HB_INC_MYSQL),) ifeq ($(HB_XBUILD),) -HB_INC_MYSQL = /usr/include/mysql /opt/local/include/mysql5/mysql +HB_INC_MYSQL := /usr/include/mysql /opt/local/include/mysql5/mysql endif endif @@ -18,7 +18,7 @@ ifneq ($(strip $(HB_INC_MYSQL_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_MYSQL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ mysqldd.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile index ab5e7f3396..780e14aae7 100644 --- a/harbour/contrib/rddsql/sddodbc/Makefile +++ b/harbour/contrib/rddsql/sddodbc/Makefile @@ -2,18 +2,18 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=sddodbc +LIBNAME := sddodbc ifeq ($(HB_COMPILER),rsxnt) -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif ifeq ($(HB_ARCHITECTURE),dos) -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif ifneq ($(HB_ARCHITECTURE),win) @@ -22,7 +22,7 @@ ifeq ($(HB_WITHOUT_ODBC),) ifeq ($(HB_INC_ODBC),) ifeq ($(HB_XBUILD),) -HB_INC_ODBC = /usr/include /usr/local/include +HB_INC_ODBC := /usr/include /usr/local/include endif endif @@ -31,7 +31,7 @@ HB_INC_ODBC_OK += $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d), ifneq ($(strip $(HB_INC_ODBC_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d)) else -HB_WITHOUT_ODBC=yes +HB_WITHOUT_ODBC := yes endif endif @@ -40,7 +40,7 @@ endif ifneq ($(HB_WITHOUT_ODBC),yes) -C_SOURCES=\ +C_SOURCES := \ odbcdd.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/rddsql/sddpg/Makefile index c7e9beea2a..3c2090f808 100644 --- a/harbour/contrib/rddsql/sddpg/Makefile +++ b/harbour/contrib/rddsql/sddpg/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=sddpg +LIBNAME := sddpg ifeq ($(HB_INC_PGSQL),) ifeq ($(HB_XBUILD),) -HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83 +HB_INC_PGSQL := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83 endif endif @@ -18,7 +18,7 @@ ifneq ($(strip $(HB_INC_PGSQL_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_PGSQL_OK), -I$(d)) -C_SOURCES=\ +C_SOURCES := \ pgsqldd.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile index 6be0531fe5..ba3e992ae2 100644 --- a/harbour/contrib/xhb/Makefile +++ b/harbour/contrib/xhb/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=xhb +LIBNAME := xhb -C_SOURCES=\ +C_SOURCES := \ bkgtsks.c \ cstructc.c \ datesxhb.c \ @@ -37,11 +37,11 @@ C_SOURCES=\ xhbwith.c \ xstrdel.c \ -C_HEADERS=\ +C_HEADERS := \ hbcompat.h \ xhb.h \ -PRG_SOURCES=\ +PRG_SOURCES := \ arrayblk.prg \ cstruct.prg \ dbgfx.prg \ @@ -77,7 +77,7 @@ PRG_SOURCES=\ tframe.prg \ thtm.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ hbcompat.ch \ xhb.ch \ diff --git a/harbour/contrib/xpp/Makefile b/harbour/contrib/xpp/Makefile index 77b0e8307b..c798f41941 100644 --- a/harbour/contrib/xpp/Makefile +++ b/harbour/contrib/xpp/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -LIBNAME=xpp +LIBNAME := xpp -C_SOURCES=\ +C_SOURCES := \ binnumx.c \ dbcmdx.c \ dbdetacx.c \ @@ -15,7 +15,7 @@ C_SOURCES=\ oemansix.c \ philesx.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ browdbx.prg \ dbfuncsx.prg \ dbjoinx.prg \ @@ -31,7 +31,7 @@ PRG_SOURCES=\ tthreadx.prg \ typefilx.prg \ -PRG_HEADERS=\ +PRG_HEADERS := \ xpp.ch \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index 3c408a651b..9cd9126c38 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../ +ROOT := ../ -DOC_FILES=\ +DOC_FILES := \ c_std.txt \ class_tp.txt \ cmdline.txt \ @@ -33,7 +33,7 @@ DOC_FILES=\ whatsnew.txt \ windll.txt \ -DIRS=\ +DIRS := \ en-EN \ include $(TOP)$(ROOT)config/doc.cf diff --git a/harbour/doc/en-EN/Makefile b/harbour/doc/en-EN/Makefile index d8248c90e4..e69d9d8455 100644 --- a/harbour/doc/en-EN/Makefile +++ b/harbour/doc/en-EN/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -DOC_SUBDIR=/en-EN +DOC_SUBDIR := /en-EN -DOC_FILES=\ +DOC_FILES := \ array.txt \ binnum.txt \ browse.txt \ diff --git a/harbour/external/Makefile b/harbour/external/Makefile index 63def60404..b27144408f 100644 --- a/harbour/external/Makefile +++ b/harbour/external/Makefile @@ -2,12 +2,12 @@ # $Id$ # -ROOT = ../ +ROOT := ../ ifeq ($(HB_EXTERNALLIBS),) # standalone contribs -DIRS=\ +DIRS := \ libhpdf \ libpng \ sqlite3 \ @@ -15,7 +15,7 @@ DIRS=\ else ifneq ($(HB_EXTERNALLIBS),no) -DIRS = $(HB_EXTERNALLIBS) +DIRS := $(HB_EXTERNALLIBS) endif endif diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index 0daf06cc28..7bff3349b0 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -6,27 +6,27 @@ HB_BUILD_WARN := no HB_BUILD_MODE := c HB_USER_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib -ROOT = ../../ +ROOT := ../../ -LIBNAME=libhpdf +LIBNAME := libhpdf ifeq ($(HB_WITH_LIBHPDF),) -HB_WITH_LIBHPDF=yes +HB_WITH_LIBHPDF := yes ifeq ($(HB_COMPILER),watcom) -HB_WITH_LIBHPDF=no +HB_WITH_LIBHPDF := no endif ifeq ($(HB_COMPILER),pocc64) -HB_WITH_LIBHPDF=no +HB_WITH_LIBHPDF := no endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_LIBHPDF=no +HB_WITH_LIBHPDF := no endif ifeq ($(HB_COMPILER),mingwarm) -HB_WITH_LIBHPDF=yes +HB_WITH_LIBHPDF := yes HB_USER_CFLAGS += -U__COREDLL__ endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_LIBHPDF=yes +HB_WITH_LIBHPDF := yes endif endif @@ -60,7 +60,7 @@ ifneq ($(strip $(HB_INC_LIBPNG_OK)),) HB_USER_CFLAGS += $(foreach d, $(HB_INC_LIBPNG_OK), -I$(d)) -C_SOURCES = \ +C_SOURCES := \ _hbhbpdf.c \ hpdf_annotation.c \ hpdf_array.c \ diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile index 297db257da..b6dea92f2f 100644 --- a/harbour/external/libpng/Makefile +++ b/harbour/external/libpng/Makefile @@ -9,34 +9,34 @@ ifeq ($(HB_COMPILER),djgpp) HB_USER_CFLAGS += -DPNG_NO_SNPRINTF endif -ROOT = ../../ +ROOT := ../../ -LIBNAME=libpng +LIBNAME := libpng ifeq ($(HB_WITH_LIBPNG),) ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_LIBPNG=yes +HB_WITH_LIBPNG := yes endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_LIBPNG=yes +HB_WITH_LIBPNG := yes endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_LIBPNG=yes +HB_WITH_LIBPNG := yes endif ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_LIBPNG=yes +HB_WITH_LIBPNG := yes endif ifeq ($(HB_ARCHITECTURE),darwin) -HB_WITH_LIBPNG=yes +HB_WITH_LIBPNG := yes endif ifeq ($(HB_COMPILER),poccarm) -HB_WITH_LIBPNG=no +HB_WITH_LIBPNG := no endif endif ifeq ($(HB_WITH_LIBPNG),yes) -C_SOURCES =\ +C_SOURCES := \ png.c \ pngerror.c \ pnggccrd.c \ diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index fd236c5b65..c314e9de13 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -15,33 +15,33 @@ ifeq ($(HB_ARCHITECTURE),dos) HB_USER_CFLAGS += -DSQLITE_OS_OTHER endif -ROOT = ../../ +ROOT := ../../ -LIBNAME=sqlite3 +LIBNAME := sqlite3 ifeq ($(HB_WITH_SQLITE3),) ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_SQLITE3=yes +HB_WITH_SQLITE3 := yes endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_SQLITE3=yes +HB_WITH_SQLITE3 := yes endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_SQLITE3=yes +HB_WITH_SQLITE3 := yes endif ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_SQLITE3=yes +HB_WITH_SQLITE3 := yes endif ifeq ($(HB_COMPILER),mingwarm) -HB_WITH_SQLITE3=no +HB_WITH_SQLITE3 := no endif ifeq ($(HB_COMPILER),poccarm) -HB_WITH_SQLITE3=no +HB_WITH_SQLITE3 := no endif endif ifeq ($(HB_WITH_SQLITE3),yes) -C_SOURCES =\ +C_SOURCES := \ sqlite3.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 44c3732e76..4c4f3e2233 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../ +ROOT := ../ -C_HEADERS=\ +C_HEADERS := \ clipdefs.h \ extend.h \ hbapi.h \ @@ -62,7 +62,7 @@ C_HEADERS=\ hbzlib.h \ hb_io.h \ -PRG_HEADERS=\ +PRG_HEADERS := \ achoice.ch \ assert.ch \ box.ch \ @@ -115,7 +115,7 @@ PRG_HEADERS=\ hbsxdef.ch \ tbrowse.ch \ -API_HEADERS=\ +API_HEADERS := \ error.api \ extend.api \ filesys.api \ diff --git a/harbour/source/Makefile b/harbour/source/Makefile index d4d1e6d05d..615bffbc2f 100644 --- a/harbour/source/Makefile +++ b/harbour/source/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../ +ROOT := ../ ifeq ($(HB_HOST_BUILD),yes) -DIRS=\ +DIRS := \ common \ nortl \ pp{common,nortl} \ @@ -16,14 +16,14 @@ DIRS=\ else ifeq ($(HB_HOST_BUILD),lib) -HB_COMP_DIR= -HB_COMP_REF= + HB_COMP_DIR := + HB_COMP_REF := else -HB_COMP_DIR=main{compiler} -HB_COMP_REF={main} + HB_COMP_DIR := main{compiler} + HB_COMP_REF := {main} endif -DIRS=\ +DIRS := \ common \ nortl \ pp{common,nortl} \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 7ea67baa82..8ac4d34b63 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ cpbg866.c \ cpbgiso.c \ cpbgmik.c \ @@ -138,6 +138,6 @@ C_SOURCES=\ ucmactrk.c \ ucnext.c \ -LIBNAME=hbcpage +LIBNAME := hbcpage include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/common/Makefile b/harbour/source/common/Makefile index 64a8e3f6b8..858613f9cc 100644 --- a/harbour/source/common/Makefile +++ b/harbour/source/common/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ expropt1.c \ expropt2.c \ hbffind.c \ @@ -24,8 +24,6 @@ C_SOURCES=\ reserved.c \ strwild.c \ -PRG_SOURCES=\ - -LIBNAME=hbcommon +LIBNAME := hbcommon include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile index 1a618c4062..cb71e0ba91 100644 --- a/harbour/source/compiler/Makefile +++ b/harbour/source/compiler/Makefile @@ -2,19 +2,19 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -#LEX_FLAGS = -Phb_comp -C -#LEX_SOURCE=harbour.l -#LEX_HEADERS=\ +#LEX_FLAGS := -Phb_comp -C +#LEX_SOURCE := harbour.l +#LEX_HEADERS := \ # hbsetup.h \ # hberrors.h \ # hbdefs.h \ -#YACC_FLAGS = -p hb_comp -YACC_SOURCE=harbour.y -YACC_DEPEND=complex.c -YACC_HEADERS=\ +#YACC_FLAGS := -p hb_comp +YACC_SOURCE := harbour.y +YACC_DEPEND := complex.c +YACC_HEADERS := \ hbcomp.h \ hbcompdf.h \ hbsetup.h \ @@ -23,7 +23,7 @@ YACC_HEADERS=\ hberrors.h \ hbpp.h \ -C_SOURCES=\ +C_SOURCES := \ cmdcheck.c \ genc.c \ gencc.c \ @@ -49,6 +49,6 @@ C_SOURCES=\ compi18n.c \ hbmain.c \ -LIBNAME=hbcplr +LIBNAME := hbcplr include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/debug/Makefile b/harbour/source/debug/Makefile index ffd09badc6..50f57568a4 100644 --- a/harbour/source/debug/Makefile +++ b/harbour/source/debug/Makefile @@ -2,12 +2,12 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ dbgentry.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ dbgmenu.prg \ dbghelp.prg \ dbgtinp.prg \ @@ -22,6 +22,6 @@ PRG_SOURCES=\ dbgwa.prg \ dbgbrwsr.prg \ -LIBNAME=hbdebug +LIBNAME := hbdebug include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/hbextern/Makefile b/harbour/source/hbextern/Makefile index d41ad45811..9e4c1f858a 100644 --- a/harbour/source/hbextern/Makefile +++ b/harbour/source/hbextern/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ hbextern.prg \ -LIBNAME=hbextern +LIBNAME := hbextern include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/hbpcre/Makefile b/harbour/source/hbpcre/Makefile index 709c8bb7be..d3f2503623 100644 --- a/harbour/source/hbpcre/Makefile +++ b/harbour/source/hbpcre/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ _hbpcreg.c \ chartabs.c \ pcrecomp.c \ @@ -26,6 +26,6 @@ C_SOURCES=\ pcrevutf.c \ pcrexcls.c \ -LIBNAME=hbpcre +LIBNAME := hbpcre include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/hbzlib/Makefile b/harbour/source/hbzlib/Makefile index 27fa098d40..bc71b01bf4 100644 --- a/harbour/source/hbzlib/Makefile +++ b/harbour/source/hbzlib/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ adler32.c \ compress.c \ crc32.c \ @@ -18,6 +18,6 @@ C_SOURCES=\ uncompr.c \ zutil.c \ -LIBNAME=hbzlib +LIBNAME := hbzlib include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile index 9603e40e03..6cffca849e 100644 --- a/harbour/source/lang/Makefile +++ b/harbour/source/lang/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ msgbe866.c \ msgbewin.c \ msgbg866.c \ @@ -72,6 +72,6 @@ C_SOURCES=\ msgzhb5.c \ msgzhgb.c \ -LIBNAME=hblang +LIBNAME := hblang include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/macro/Makefile b/harbour/source/macro/Makefile index 9afa2d9eb9..639514dfcd 100644 --- a/harbour/source/macro/Makefile +++ b/harbour/source/macro/Makefile @@ -2,40 +2,42 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -#NOTE: You can pass additional parameters that control the speed/size -# ratio of generated flex scanner. These parameters are: -# -Cf - fastest/biggest -# -CF -# -C - in between -# -Cm -# -Ce -# -Cem - slowest/smallest -# see Flex documentation for full set of switches -#LEX_FLAGS = -Phb_macro -C -#LEX_SOURCE=macro.l -#LEX_HEADERS=\ +# NOTE: You can pass additional parameters that control the speed/size +# ratio of generated flex scanner. These parameters are: +# +# -Cf - fastest/biggest +# -CF +# -C - in between +# -Cm +# -Ce +# -Cem - slowest/smallest +# +# see Flex documentation for full set of switches + +#LEX_FLAGS := -Phb_macro -C +#LEX_SOURCE := macro.l +#LEX_HEADERS := \ # hbsetup.h \ # hberrors.h \ # hbdefs.h \ # hbmacro.h \ -#YACC_FLAGS = -p hb_macro -YACC_SOURCE=macro.y -YACC_DEPEND=macrolex.c -YACC_HEADERS=\ +#YACC_FLAGS := -p hb_macro +YACC_SOURCE := macro.y +YACC_DEPEND := macrolex.c +YACC_HEADERS := \ hbmacro.h \ hbsetup.h \ hbpcode.h \ hbdefs.h \ -C_SOURCES=\ +C_SOURCES := \ macroa.c \ macrob.c \ macrolex.c \ - -LIBNAME=hbmacro +LIBNAME := hbmacro include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/main/Makefile b/harbour/source/main/Makefile index 9c87ef977c..2c98764457 100644 --- a/harbour/source/main/Makefile +++ b/harbour/source/main/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ -C_MAIN=harbour.c +C_MAIN := harbour.c -LIBS=\ +LIBS := \ hbcplr \ hbpp \ hbcommon \ diff --git a/harbour/source/nortl/Makefile b/harbour/source/nortl/Makefile index aec6984211..ca514d6b87 100644 --- a/harbour/source/nortl/Makefile +++ b/harbour/source/nortl/Makefile @@ -2,13 +2,11 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ nortl.c \ -PRG_SOURCES=\ - -LIBNAME=hbnortl +LIBNAME := hbnortl include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index 70f3777719..b11edd3ea2 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -2,18 +2,18 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ pptable.c \ - ppcore.c \ - pplib.c \ - pplib2.c \ - pplib3.c \ + ppcore.c \ + pplib.c \ + pplib2.c \ + pplib3.c \ -LIBNAME=hbpp +LIBNAME := hbpp -LIBS=\ +LIBS := \ hbcommon \ hbnortl \ @@ -35,9 +35,9 @@ pptable.c : hbpp$(BIN_EXT) ifneq ($(HB_HOST_BUILD),lib) ifneq ($(HB_BIN_INSTALL),) -INSTALL_FILES = $(BIN_DIR)/hbpp$(BIN_EXT) -INSTALL_DIR = $(HB_BIN_INSTALL) -HB_INSTALL_DEF = yes +INSTALL_FILES := $(BIN_DIR)/hbpp$(BIN_EXT) +INSTALL_DIR := $(HB_BIN_INSTALL) +HB_INSTALL_DEF := yes include $(TOP)$(ROOT)config/install.cf endif endif diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile index 7fe38a410a..41061d0333 100644 --- a/harbour/source/rdd/Makefile +++ b/harbour/source/rdd/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ ifneq ($(HB_ARCHITECTURE),wce) - HB_GCMODE=3 + HB_GCMODE := 3 endif -C_SOURCES=\ +C_SOURCES := \ dbcmd.c \ dbcmd53.c \ dbcmdhb.c \ @@ -29,7 +29,7 @@ C_SOURCES=\ rddinfo.c \ hbdbsort.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ dbdelim.prg \ dbfuncs.prg \ dbfuncsx.prg \ @@ -51,10 +51,10 @@ PRG_SOURCES=\ rddordu.prg \ rddsys.prg \ -LIBNAME=hbrdd +LIBNAME := hbrdd # The list of all valid DB drivers is defined in config/global.cf. -DIRS=nulsys $(HB_DB_DIRS) +DIRS = nulsys $(HB_DB_DIRS) include $(TOP)$(ROOT)config/lib.cf include $(TOP)$(ROOT)config/dir.cf diff --git a/harbour/source/rdd/dbfcdx/Makefile b/harbour/source/rdd/dbfcdx/Makefile index db35ba3ee7..daa2699815 100644 --- a/harbour/source/rdd/dbfcdx/Makefile +++ b/harbour/source/rdd/dbfcdx/Makefile @@ -2,12 +2,12 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ dbfcdx1.c \ sixcdx1.c \ -LIBNAME=rddcdx +LIBNAME := rddcdx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/dbffpt/Makefile b/harbour/source/rdd/dbffpt/Makefile index e1d65002e2..ea27cb4a6b 100644 --- a/harbour/source/rdd/dbffpt/Makefile +++ b/harbour/source/rdd/dbffpt/Makefile @@ -3,14 +3,14 @@ # ifeq ($(HB_COMPILER),xcc) -HB_USER_CFLAGS:=$(subst -Ox,,$(subst -Ot,,$(HB_USER_CFLAGS))) + HB_USER_CFLAGS := $(subst -Ox,,$(subst -Ot,,$(HB_USER_CFLAGS))) endif -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ dbffpt1.c \ -LIBNAME=rddfpt +LIBNAME := rddfpt include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/dbfnsx/Makefile b/harbour/source/rdd/dbfnsx/Makefile index 23cd497c02..9e1ee71fb9 100644 --- a/harbour/source/rdd/dbfnsx/Makefile +++ b/harbour/source/rdd/dbfnsx/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ dbfnsx1.c \ -LIBNAME=rddnsx +LIBNAME := rddnsx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/dbfntx/Makefile b/harbour/source/rdd/dbfntx/Makefile index e892347c75..62891c71e4 100644 --- a/harbour/source/rdd/dbfntx/Makefile +++ b/harbour/source/rdd/dbfntx/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ dbfntx1.c \ -LIBNAME=rddntx +LIBNAME := rddntx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/hbsix/Makefile b/harbour/source/rdd/hbsix/Makefile index b8f219ac46..8c64307876 100644 --- a/harbour/source/rdd/hbsix/Makefile +++ b/harbour/source/rdd/hbsix/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ sxcompr.c \ sxcrypt.c \ sxdate.c \ @@ -15,11 +15,11 @@ C_SOURCES=\ sxutil.c \ sxredir.c \ -PRG_SOURCES=\ +PRG_SOURCES := \ sxcompat.prg \ sxini.prg \ sxtrig.prg \ -LIBNAME=hbsix +LIBNAME := hbsix include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/hsx/Makefile b/harbour/source/rdd/hsx/Makefile index 0c32836ea1..24085f85b7 100644 --- a/harbour/source/rdd/hsx/Makefile +++ b/harbour/source/rdd/hsx/Makefile @@ -2,12 +2,12 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ hsx.c \ cftsfunc.c \ -LIBNAME=hbhsx +LIBNAME := hbhsx include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/nulsys/Makefile b/harbour/source/rdd/nulsys/Makefile index d057654d39..19863cdbfa 100644 --- a/harbour/source/rdd/nulsys/Makefile +++ b/harbour/source/rdd/nulsys/Makefile @@ -2,13 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ nulsys.c \ -PRG_SOURCES=\ - -LIBNAME=hbnulrdd +LIBNAME := hbnulrdd include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/usrrdd/Makefile b/harbour/source/rdd/usrrdd/Makefile index 2789c86eaf..56690ceda7 100644 --- a/harbour/source/rdd/usrrdd/Makefile +++ b/harbour/source/rdd/usrrdd/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ usrrdd.c \ -LIBNAME=hbusrrdd +LIBNAME := hbusrrdd include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rdd/usrrdd/rdds/Makefile b/harbour/source/rdd/usrrdd/rdds/Makefile index 96abf568c3..1981218cec 100644 --- a/harbour/source/rdd/usrrdd/rdds/Makefile +++ b/harbour/source/rdd/usrrdd/rdds/Makefile @@ -2,9 +2,9 @@ # $Id$ # -ROOT = ../../../../ +ROOT := ../../../../ -PRG_SOURCES=\ +PRG_SOURCES := \ arrayrdd.prg \ logrdd.prg \ hscdx.prg \ @@ -14,6 +14,6 @@ PRG_SOURCES=\ smtcdx.prg \ vfpcdx.prg \ -LIBNAME=hbuddall +LIBNAME := hbuddall include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index edf5cc082a..80c8419937 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ ifneq ($(HB_ARCHITECTURE),wce) - HB_GCMODE=3 + HB_GCMODE := 3 endif -C_SOURCES=\ +C_SOURCES := \ abs.c \ accept.c \ ampm.c \ @@ -188,8 +188,7 @@ C_SOURCES=\ xhelp.c \ xsavescr.c \ - -PRG_SOURCES=\ +PRG_SOURCES := \ achoice.prg \ adir.prg \ alert.prg \ @@ -262,9 +261,9 @@ PRG_SOURCES=\ valtoexp.prg \ wait.prg \ -LIBNAME=hbrtl +LIBNAME := hbrtl -DIRS=\ +DIRS := \ gtcgi \ gtcrs \ gtdos \ diff --git a/harbour/source/rtl/gt_tpl/Makefile b/harbour/source/rtl/gt_tpl/Makefile index 7fe0c18704..3a92dfe1ae 100644 --- a/harbour/source/rtl/gt_tpl/Makefile +++ b/harbour/source/rtl/gt_tpl/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ gt_tpl.c \ -LIBNAME=gt_tpl +LIBNAME := gt_tpl include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtcgi/Makefile b/harbour/source/rtl/gtcgi/Makefile index 6d412dd8cf..3f9742aa66 100644 --- a/harbour/source/rtl/gtcgi/Makefile +++ b/harbour/source/rtl/gtcgi/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ gtcgi.c \ -LIBNAME=gtcgi +LIBNAME := gtcgi include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile index bb22e04480..56b1b05e9a 100644 --- a/harbour/source/rtl/gtcrs/Makefile +++ b/harbour/source/rtl/gtcrs/Makefile @@ -2,46 +2,46 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtcrs +LIBNAME := gtcrs -C_SOURCES=\ +C_SOURCES := \ gtcrs.c \ ifeq ($(HB_INC_CURSES),) ifeq ($(HB_XBUILD),) ifeq ($(HB_NCURSES_194),yes) -HB_INC_CURSES = /usr/include/ncur194 +HB_INC_CURSES := /usr/include/ncur194 else -HB_INC_CURSES = /usr/include /usr/local/include /sw/include /opt/local/include +HB_INC_CURSES := /usr/include /usr/local/include /sw/include /opt/local/include endif endif endif ifeq ($(HB_WITHOUT_GTCRS),yes) -HB_INC_CURSES = +HB_INC_CURSES := endif ifeq ($(HB_ARCHITECTURE),os2) -HB_INC_CURSES = +HB_INC_CURSES := endif HB_INC_CURSES_OK += $(foreach d, $(HB_INC_CURSES), $(if $(wildcard $(d)/curses.h),$(d),)) -HB_INC_CURSES_OK:=$(strip $(HB_INC_CURSES_OK)) +HB_INC_CURSES_OK := $(strip $(HB_INC_CURSES_OK)) ifeq ($(HB_INC_CURSES_OK),) ifeq ($(HB_COMPILER),djgpp) HB_INC_CURSES_OK += $(foreach d, $(subst ;, ,$(PATH)), $(if $(wildcard $(d)/../include/curses.h),$(d)/../include,)) -HB_INC_CURSES_OK:=$(strip $(HB_INC_CURSES_OK)) +HB_INC_CURSES_OK := $(strip $(HB_INC_CURSES_OK)) endif endif ifneq ($(HB_INC_CURSES_OK),) -HB_INC_GPM_OK = +HB_INC_GPM_OK := ifneq ($(HB_GPM_MOUSE),no) ifneq ($(HB_COMMERCE),yes) -HB_INC_GPM = /usr/include /usr/local/include +HB_INC_GPM := /usr/include /usr/local/include HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) endif endif diff --git a/harbour/source/rtl/gtdos/Makefile b/harbour/source/rtl/gtdos/Makefile index 55150e8a3d..6407583700 100644 --- a/harbour/source/rtl/gtdos/Makefile +++ b/harbour/source/rtl/gtdos/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtdos +LIBNAME := gtdos ifeq ($(HB_ARCHITECTURE),dos) -C_SOURCES=\ +C_SOURCES := \ gtdos.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtgui/Makefile b/harbour/source/rtl/gtgui/Makefile index 15e7808e89..da67a07b0c 100644 --- a/harbour/source/rtl/gtgui/Makefile +++ b/harbour/source/rtl/gtgui/Makefile @@ -2,21 +2,21 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtgui +LIBNAME := gtgui -HB_WITH_GTGUI=no +HB_WITH_GTGUI := no ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_GTGUI=yes + HB_WITH_GTGUI := yes endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_GTGUI=yes + HB_WITH_GTGUI := yes endif ifeq ($(HB_WITH_GTGUI),yes) -C_SOURCES=\ +C_SOURCES := \ gtgui.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtos2/Makefile b/harbour/source/rtl/gtos2/Makefile index a2a02f35fb..3faa07a0f6 100644 --- a/harbour/source/rtl/gtos2/Makefile +++ b/harbour/source/rtl/gtos2/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtos2 +LIBNAME := gtos2 ifeq ($(HB_ARCHITECTURE),os2) -C_SOURCES=\ +C_SOURCES := \ gtos2.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtpca/Makefile b/harbour/source/rtl/gtpca/Makefile index abccfba7a2..29a7d9d8ad 100644 --- a/harbour/source/rtl/gtpca/Makefile +++ b/harbour/source/rtl/gtpca/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ gtpca.c \ -LIBNAME=gtpca +LIBNAME := gtpca include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile index ca0f00dd97..f51ce0f0a3 100644 --- a/harbour/source/rtl/gtsln/Makefile +++ b/harbour/source/rtl/gtsln/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtsln +LIBNAME := gtsln -C_SOURCES=\ +C_SOURCES := \ gtsln.c \ kbsln.c \ mousesln.c \ @@ -14,30 +14,30 @@ C_SOURCES=\ ifeq ($(HB_INC_SLANG),) ifeq ($(HB_XBUILD),) ifeq ($(HB_LOCAL_SLN),yes) -HB_INC_SLANG = /usr/local/include /usr/local/include/slang +HB_INC_SLANG := /usr/local/include /usr/local/include/slang LDFLAGS := -L/usr/local/lib $(LDFLAGS) else -HB_INC_SLANG = /usr/include /usr/include/slang /usr/local/include /usr/local/include/slang /sw/include /sw/include/slang /opt/local/include /opt/local/include/slang +HB_INC_SLANG := /usr/include /usr/include/slang /usr/local/include /usr/local/include/slang /sw/include /sw/include/slang /opt/local/include /opt/local/include/slang LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(LDFLAGS) endif endif endif ifeq ($(HB_WITHOUT_GTSLN),yes) -HB_INC_SLANG = +HB_INC_SLANG := endif ifeq ($(HB_COMMERCE),yes) -HB_INC_SLANG = +HB_INC_SLANG := endif HB_INC_SLANG_OK += $(foreach d, $(HB_INC_SLANG), $(if $(wildcard $(d)/slang.h),$(d),)) ifneq ($(strip $(HB_INC_SLANG_OK)),) -HB_INC_GPM_OK = +HB_INC_GPM_OK := ifneq ($(HB_GPM_MOUSE),no) ifneq ($(HB_COMMERCE),yes) -HB_INC_GPM = /usr/include /usr/local/include +HB_INC_GPM := /usr/include /usr/local/include HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) endif endif diff --git a/harbour/source/rtl/gtstd/Makefile b/harbour/source/rtl/gtstd/Makefile index 136f9bfb27..0c2d993c61 100644 --- a/harbour/source/rtl/gtstd/Makefile +++ b/harbour/source/rtl/gtstd/Makefile @@ -2,11 +2,11 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ gtstd.c \ -LIBNAME=gtstd +LIBNAME := gtstd include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile index 450adbc9fd..1f14f10479 100644 --- a/harbour/source/rtl/gttrm/Makefile +++ b/harbour/source/rtl/gttrm/Makefile @@ -2,39 +2,39 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gttrm +LIBNAME := gttrm -C_SOURCES=\ +C_SOURCES := \ gttrm.c \ -HB_WITH_GTTRM=yes +HB_WITH_GTTRM := yes ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_GTTRM=no + HB_WITH_GTTRM := no endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_GTTRM=no + HB_WITH_GTTRM := no endif ifeq ($(HB_ARCHITECTURE),dos) -HB_WITH_GTTRM=no + HB_WITH_GTTRM := no endif ifeq ($(HB_ARCHITECTURE),os2) -HB_WITH_GTTRM=no + HB_WITH_GTTRM := no endif ifeq ($(HB_COMPILER),cygwin) -HB_WITH_GTTRM=yes + HB_WITH_GTTRM := yes endif ifeq ($(HB_COMPILER),djgpp) -HB_WITH_GTTRM=yes + HB_WITH_GTTRM := yes endif ifeq ($(HB_WITH_GTTRM),yes) -HB_INC_GPM_OK = +HB_INC_GPM_OK := ifneq ($(HB_GPM_MOUSE),no) ifneq ($(HB_COMMERCE),yes) -HB_INC_GPM = /usr/include /usr/local/include +HB_INC_GPM := /usr/include /usr/local/include HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) endif endif diff --git a/harbour/source/rtl/gtwin/Makefile b/harbour/source/rtl/gtwin/Makefile index 99353c369e..02f593bdae 100644 --- a/harbour/source/rtl/gtwin/Makefile +++ b/harbour/source/rtl/gtwin/Makefile @@ -2,13 +2,13 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtwin +LIBNAME := gtwin ifeq ($(HB_ARCHITECTURE),win) -C_SOURCES=\ +C_SOURCES := \ gtwin.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtwvt/Makefile b/harbour/source/rtl/gtwvt/Makefile index 005fcb55dc..a2a2d9cf0b 100644 --- a/harbour/source/rtl/gtwvt/Makefile +++ b/harbour/source/rtl/gtwvt/Makefile @@ -2,21 +2,21 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtwvt +LIBNAME := gtwvt -HB_WITH_GTWVT=no +HB_WITH_GTWVT := no ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_GTWVT=yes +HB_WITH_GTWVT := yes endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_GTWVT=yes +HB_WITH_GTWVT := yes endif ifeq ($(HB_WITH_GTWVT),yes) -C_SOURCES=\ +C_SOURCES := \ gtwvt.c \ include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtxwc/Makefile b/harbour/source/rtl/gtxwc/Makefile index 2f1a03a5cf..f6ecb41652 100644 --- a/harbour/source/rtl/gtxwc/Makefile +++ b/harbour/source/rtl/gtxwc/Makefile @@ -2,21 +2,21 @@ # $Id$ # -ROOT = ../../../ +ROOT := ../../../ -LIBNAME=gtxwc +LIBNAME := gtxwc -C_SOURCES=\ +C_SOURCES := \ gtxwc.c \ ifeq ($(HB_INC_X11),) ifeq ($(HB_XBUILD),) -HB_INC_X11 = /usr/include +HB_INC_X11 := /usr/include endif endif ifeq ($(HB_WITHOUT_GTXWC),yes) -HB_INC_X11 = +HB_INC_X11 := endif HB_INC_X11_OK += $(foreach d, $(HB_INC_X11), $(if $(wildcard $(d)/X11/Xlib.h),$(d),)) diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index a143f71a2a..36c7c6341a 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -2,65 +2,65 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ ifeq ($(HB_HVM_ALL),) -HB_HVM_ALL = yes +HB_HVM_ALL := yes ifeq ($(HB_COMPILER),watcom) - HB_HVM_ALL = no + HB_HVM_ALL := no endif ifeq ($(HB_COMPILER),bcc) - HB_HVM_ALL = no + HB_HVM_ALL := no endif ifeq ($(HB_COMPILER),pocc) - HB_HVM_ALL = no + HB_HVM_ALL := no endif ifeq ($(HB_COMPILER),pocc64) - HB_HVM_ALL = no + HB_HVM_ALL := no endif ifeq ($(HB_COMPILER),poccarm) - HB_HVM_ALL = no + HB_HVM_ALL := no endif ifeq ($(HB_COMPILER),xcc) - HB_HVM_ALL = no + HB_HVM_ALL := no endif ifeq ($(HB_COMPILER),dmc) - HB_HVM_ALL = no + HB_HVM_ALL := no endif export HB_HVM_ALL endif -DIRS= +DIRS := ifeq ($(HB_ARCHITECTURE),win) - ifeq ($(HB_COMPILER),mingw) - C_MAIN = mainwin.c - else - C_MAIN = mainstd.c mainwin.c - endif - DIRS = mainstd mainwin maindllh maindllp + ifeq ($(HB_COMPILER),mingw) + C_MAIN := mainwin.c + else + C_MAIN := mainstd.c mainwin.c + endif + DIRS := mainstd mainwin maindllh maindllp else - ifeq ($(HB_ARCHITECTURE),wce) - C_MAIN = mainwin.c - DIRS = mainstd mainwin maindllh maindllp - else - ifeq ($(HB_ARCHITECTURE),os2) - C_MAIN = mainstd.c - else - C_MAIN = main.c - endif - endif + ifeq ($(HB_ARCHITECTURE),wce) + C_MAIN := mainwin.c + DIRS := mainstd mainwin maindllh maindllp + else + ifeq ($(HB_ARCHITECTURE),os2) + C_MAIN := mainstd.c + else + C_MAIN := main.c + endif + endif endif ifeq ($(HB_HVM_ALL),yes) -C_SOURCES=\ +C_SOURCES := \ hvmall.c \ else -C_SOURCES=\ +C_SOURCES := \ hvm.c \ arrays.c \ classes.c \ @@ -79,7 +79,7 @@ C_SOURCES=\ endif -C_SOURCES+=\ +C_SOURCES += \ arrayshb.c \ asort.c \ break.c \ @@ -100,27 +100,27 @@ C_SOURCES+=\ vm.c \ $(C_MAIN) \ -PRG_SOURCES=\ +PRG_SOURCES := \ harbinit.prg \ -LIBNAME=hbvm +LIBNAME := hbvm -HB_USER_CFLAGS:=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) +HB_USER_CFLAGS := $(subst -DHB_MT_VM,,$(HB_USER_CFLAGS)) ifneq ($(HB_MT),yes) ifeq ($(HB_ARCHITECTURE),dos) ifneq ($(HB_COMPILER),djgpp) ifneq ($(HB_COMPILER),watcom) - HB_MT = no + HB_MT := no endif endif endif endif ifneq ($(HB_MT),no) - DIRS+= vmmt + DIRS += vmmt endif include $(TOP)$(ROOT)config/lib.cf ifneq ($(DIRS),) - include $(TOP)$(ROOT)config/dir.cf + include $(TOP)$(ROOT)config/dir.cf endif diff --git a/harbour/source/vm/maindllh/Makefile b/harbour/source/vm/maindllh/Makefile index 1e704850fc..b23d3e6e65 100644 --- a/harbour/source/vm/maindllh/Makefile +++ b/harbour/source/vm/maindllh/Makefile @@ -4,12 +4,12 @@ vpath %.c ../ -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ maindllh.c \ -LIBNAME=hbmaindllh +LIBNAME := hbmaindllh # always export symbols HB_USER_CFLAGS += -DHB_DYNLIB diff --git a/harbour/source/vm/maindllp/Makefile b/harbour/source/vm/maindllp/Makefile index cde15b6aa4..8f16d17493 100644 --- a/harbour/source/vm/maindllp/Makefile +++ b/harbour/source/vm/maindllp/Makefile @@ -4,12 +4,12 @@ vpath %.c ../ -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ maindllp.c \ -LIBNAME=hbmaindllp +LIBNAME := hbmaindllp # always export symbols HB_USER_CFLAGS += -DHB_DYNLIB diff --git a/harbour/source/vm/mainstd/Makefile b/harbour/source/vm/mainstd/Makefile index fbb38375a0..06a603b600 100644 --- a/harbour/source/vm/mainstd/Makefile +++ b/harbour/source/vm/mainstd/Makefile @@ -4,11 +4,11 @@ vpath %.c ../ -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ mainstd.c \ -LIBNAME=hbmainstd +LIBNAME := hbmainstd include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/vm/mainwin/Makefile b/harbour/source/vm/mainwin/Makefile index bc9a7cbde4..e9d1331110 100644 --- a/harbour/source/vm/mainwin/Makefile +++ b/harbour/source/vm/mainwin/Makefile @@ -4,11 +4,11 @@ vpath %.c ../ -ROOT = ../../../ +ROOT := ../../../ -C_SOURCES=\ +C_SOURCES := \ mainwin.c \ -LIBNAME=hbmainwin +LIBNAME := hbmainwin include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile index 71aa2e96ce..9282c3f777 100644 --- a/harbour/source/vm/vmmt/Makefile +++ b/harbour/source/vm/vmmt/Makefile @@ -5,34 +5,34 @@ vpath %.c ../ vpath %.prg ../ -ROOT = ../../../ +ROOT := ../../../ ifeq ($(HB_ARCHITECTURE),win) - ifeq ($(HB_COMPILER),mingw) - C_MAIN = mainwin.c - else - C_MAIN = mainstd.c mainwin.c - endif + ifeq ($(HB_COMPILER),mingw) + C_MAIN := mainwin.c + else + C_MAIN := mainstd.c mainwin.c + endif else - ifeq ($(HB_ARCHITECTURE),wce) - C_MAIN = mainwin.c - else - ifeq ($(HB_ARCHITECTURE),os2) - C_MAIN = mainstd.c - else - C_MAIN = main.c - endif - endif + ifeq ($(HB_ARCHITECTURE),wce) + C_MAIN := mainwin.c + else + ifeq ($(HB_ARCHITECTURE),os2) + C_MAIN := mainstd.c + else + C_MAIN := main.c + endif + endif endif ifeq ($(HB_HVM_ALL),yes) -C_SOURCES=\ +C_SOURCES := \ hvmall.c \ else -C_SOURCES=\ +C_SOURCES := \ hvm.c \ arrays.c \ classes.c \ @@ -51,7 +51,7 @@ C_SOURCES=\ endif -C_SOURCES+=\ +C_SOURCES += \ arrayshb.c \ asort.c \ break.c \ @@ -72,10 +72,10 @@ C_SOURCES+=\ vm.c \ $(C_MAIN) \ -PRG_SOURCES=\ +PRG_SOURCES := \ harbinit.prg \ -LIBNAME=hbvmmt +LIBNAME := hbvmmt ifeq ($(HB_USER_CFLAGS),$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS))) HB_USER_CFLAGS += -DHB_MT_VM diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile index 217cab9d33..be2dd58532 100644 --- a/harbour/tests/Makefile +++ b/harbour/tests/Makefile @@ -3,12 +3,12 @@ # ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif ROOT := ../ -LIBS=\ +LIBS := \ hbdebug \ hbvm \ hbrtl \ @@ -22,7 +22,7 @@ LIBS=\ hbpcre \ ifeq ($(PM),) - PM := $(pm) + PM := $(pm) endif ifeq ($(PM),) # PM not defined = build all files diff --git a/harbour/tests/bldtest/Makefile b/harbour/tests/bldtest/Makefile index 4c3aa6f2e4..421aefb9fa 100644 --- a/harbour/tests/bldtest/Makefile +++ b/harbour/tests/bldtest/Makefile @@ -2,12 +2,12 @@ # $Id$ # -ROOT = ../../ +ROOT := ../../ -C_SOURCES=\ +C_SOURCES := \ -C_MAIN=bldtest.c +C_MAIN := bldtest.c -LIBS=\ +LIBS := \ include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/tests/hbpptest/Makefile b/harbour/tests/hbpptest/Makefile index 84fc13131b..b9398fd617 100644 --- a/harbour/tests/hbpptest/Makefile +++ b/harbour/tests/hbpptest/Makefile @@ -3,17 +3,17 @@ # ifeq ($(HB_MAIN),) - HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ hbpptest.prg \ -PRG_MAIN=hbpptest.prg +PRG_MAIN := hbpptest.prg -LIBS=\ +LIBS := \ hbdebug \ hbvm \ hbrtl \ diff --git a/harbour/tests/multifnc/Makefile b/harbour/tests/multifnc/Makefile index 67e9c7bd4f..f1c8e5aa10 100644 --- a/harbour/tests/multifnc/Makefile +++ b/harbour/tests/multifnc/Makefile @@ -2,44 +2,28 @@ # $Id$ # -ifeq ($(HB_COMPILER),gcc) +ifneq ($(findstring $(HB_COMPILER),gcc djgpp mingw cygwin),) HB_USER_LDFLAGS += -Wl,--allow-multiple-definition else -ifeq ($(HB_COMPILER),gpp) -HB_USER_LDFLAGS += -Wl,--allow-multiple-definition -else -ifeq ($(HB_COMPILER),djgpp) -HB_USER_LDFLAGS += -Wl,--allow-multiple-definition -else -ifeq ($(HB_COMPILER),mingw) -HB_USER_LDFLAGS += -Wl,--allow-multiple-definition -else -ifeq ($(HB_COMPILER),xcc) +ifneq ($(findstring $(HB_COMPILER),msvc pocc xcc),) HB_USER_LDFLAGS += /FORCE:MULTIPLE -else -ifeq ($(HB_COMPILER),pocc) -HB_USER_LDFLAGS += /FORCE:MULTIPLE -endif -endif -endif -endif endif endif ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ t0.prg \ t1.prg \ t2.prg \ -PRG_MAIN=t0.prg +PRG_MAIN := t0.prg -LIBS=\ +LIBS := \ hbdebug \ hbvm \ hbrtl \ diff --git a/harbour/utils/hbformat/Makefile b/harbour/utils/hbformat/Makefile index e2a4e4bb53..6413516e4b 100644 --- a/harbour/utils/hbformat/Makefile +++ b/harbour/utils/hbformat/Makefile @@ -3,20 +3,20 @@ # ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ hbformat.prg \ -C_SOURCES=\ +C_SOURCES := \ hbformac.c \ -PRG_MAIN=hbformat.prg +PRG_MAIN := hbformat.prg -LIBS=\ +LIBS := \ hbdebug \ hbvm \ hbrtl \ diff --git a/harbour/utils/hbi18n/Makefile b/harbour/utils/hbi18n/Makefile index bf0546fcc4..57bec81fe7 100644 --- a/harbour/utils/hbi18n/Makefile +++ b/harbour/utils/hbi18n/Makefile @@ -3,17 +3,17 @@ # ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ hbi18n.prg \ -PRG_MAIN=hbi18n.prg +PRG_MAIN := hbi18n.prg -LIBS=\ +LIBS := \ hbdebug \ hbvm \ hbrtl \ diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile index 927fcd8c49..12b43267f3 100644 --- a/harbour/utils/hbmk2/Makefile +++ b/harbour/utils/hbmk2/Makefile @@ -3,17 +3,17 @@ # ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ hbmk2.prg \ -PRG_MAIN=hbmk2.prg +PRG_MAIN := hbmk2.prg -LIBS=\ +LIBS := \ hbdebug \ hbvmmt \ hbrtl \ diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile index 520da29742..5a42595170 100644 --- a/harbour/utils/hbrun/Makefile +++ b/harbour/utils/hbrun/Makefile @@ -3,17 +3,17 @@ # ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ +PRG_SOURCES := \ hbrun.prg \ -PRG_MAIN=hbrun.prg +PRG_MAIN := hbrun.prg -LIBS=\ +LIBS := \ hbextern \ hbdebug \ hbvm \ diff --git a/harbour/utils/hbtest/Makefile b/harbour/utils/hbtest/Makefile index 79f75d109e..5df1e7bafa 100644 --- a/harbour/utils/hbtest/Makefile +++ b/harbour/utils/hbtest/Makefile @@ -3,32 +3,32 @@ # ifeq ($(HB_MAIN),) -HB_MAIN = std + HB_MAIN := std endif -ROOT = ../../ +ROOT := ../../ -PRG_SOURCES=\ - hbtest.prg \ +PRG_SOURCES := \ + hbtest.prg \ rt_array.prg \ - rt_date.prg \ - rt_file.prg \ - rt_hvm.prg \ - rt_hvma.prg \ - rt_math.prg \ - rt_misc.prg \ - rt_mt.prg \ - rt_str.prg \ - rt_stra.prg \ + rt_date.prg \ + rt_file.prg \ + rt_hvm.prg \ + rt_hvma.prg \ + rt_math.prg \ + rt_misc.prg \ + rt_mt.prg \ + rt_str.prg \ + rt_stra.prg \ rt_trans.prg \ rt_class.prg \ -C_SOURCES=\ +C_SOURCES := \ rt_miscc.c \ -PRG_MAIN=hbtest.prg +PRG_MAIN := hbtest.prg -LIBS=\ +LIBS := \ hbdebug \ hbvm \ hbrtl \