diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8c3592b0b7..b8b8266e60 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-11 09:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.cf + ! Fixed little typo in config display section. + + * config/bsd/gcc.cf + * config/wce/mingwarm.cf + * config/win/cygwin.cf + * config/win/mingw.cf + * config/win/bcc.cf + % Cleanups, syncing between each other, eliminating unique + variables. + 2009-08-11 01:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbatomic.h ! Suppressed recent bcc warnings. diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 79459e1510..fd2b44f738 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -33,9 +33,8 @@ endif LD := $(HB_CCACHE) $(HB_CMP) LD_OUT := -o -LINKPATHS += -L$(LIB_DIR) - -LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) +LINKPATHS = -L$(LIB_DIR) +LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs ifeq ($(HB_CRS_LIB),) @@ -53,7 +52,7 @@ ifneq ($(findstring gtsln, $(LIBS)),) endif ifneq ($(findstring gtxwc, $(LIBS)),) LINKLIBS += -lX11 - #LINKPATHS += -L/usr/X11R6/lib64 + #LINKPATHS += -L/usr/X11R6/lib64 LINKPATHS += -L/usr/X11R6/lib endif diff --git a/harbour/config/global.cf b/harbour/config/global.cf index 5d74de49b1..dffad50cb6 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -176,7 +176,7 @@ ifeq ($(HB_CONFIG_SHOWN),) # Some additional ones to be given a standard name: # HB_HOST_BUILD, HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER, HB_DB_DRVEXT - # HB_COMMERCE, HB_CRS_LIB + # HB_COMMERCE, HB_CRS_LIB, HB_BUILD_VERBOSE ifeq ($(HB_DYNLIB),yes) $(info ! Dynamic library creation phase) @@ -207,7 +207,7 @@ ifeq ($(HB_CONFIG_SHOWN),) $(info ! HB_LIB_INSTALL: $(HB_LIB_INSTALL)) endif ifneq ($(HB_INC_INSTALL),) - $(info ! HB_LIB_INSTALL: $(HB_INC_INSTALL)) + $(info ! HB_INC_INSTALL: $(HB_INC_INSTALL)) endif ifneq ($(HB_DOC_INSTALL),) $(info ! HB_DOC_INSTALL: $(HB_DOC_INSTALL)) diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 7e49764e15..caeac904c8 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -36,17 +36,16 @@ LD := $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o LINKPATHS = -L$(LIB_DIR) -LIBLIST = $(foreach lib,$(LIBS),-l$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) -LDFLAGS := -SYSLIBS := -lwininet -lws2 +LINKLIBS += -lwininet -lws2 +LDFLAGS += $(LINKPATHS) + +RANLIB := $(HB_CCPREFIX)ranlib AR := $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) -RANLIB := $(HB_CCPREFIX)ranlib - AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) -LINKLIBS = $(LINKPATHS) $(LIBLIST) $(SYSLIBS) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 86d4f9c189..22ca567fac 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -11,8 +11,8 @@ LIB_EXT := .lib CC := bcc32.exe CC_IN := -c CC_OUT := -o -CPPFLAGS = -I. -I$(HB_INC_COMPILE) -CFLAGS = -q -tWM +CPPFLAGS := -I. -I$(HB_INC_COMPILE) +CFLAGS := -q -tWM ifneq ($(HB_BUILD_WARN),no) CFLAGS += -w -w-sig- -Q @@ -33,18 +33,15 @@ ifeq ($(HB_BUILD_DEBUG),yes) endif LD := bcc32.exe -LDFLAGS = -O2 LD_OUT := -e # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LIBLIST += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) - # It's probably not necessary in native Windows but I need it # for my Linux box because -L seems to not work with WINE -LINKLIBS = $(foreach lib,$(LIBLIST),$(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT)) -LDFLAGS = $(LINKPATHS) +LDFLAGS += $(LINKPATHS) # create library rules AR := tlib.exe diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index 25426523d7..031e7f695b 100644 --- a/harbour/config/win/cygwin.cf +++ b/harbour/config/win/cygwin.cf @@ -15,8 +15,8 @@ LIB_EXT := .a CC := $(HB_CMP) CC_IN := -c CC_OUT := -o -CPPFLAGS = -I. -I$(HB_INC_COMPILE) -CFLAGS = +CPPFLAGS := -I. -I$(HB_INC_COMPILE) +CFLAGS := ifneq ($(HB_BUILD_WARN),no) CFLAGS += -Wall -W diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 1aa3784a70..315316a162 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -38,25 +38,24 @@ LD := $(HB_CCPREFIX)$(HB_CMP) LD_OUT := -o LINKPATHS = -L$(LIB_DIR) -LIBLIST = $(foreach lib,$(LIBS),-l$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),-l$(lib)) # Add the standard C main() entry ifeq ($(HB_MAIN),std) ifeq ($(findstring hbvm,$(LIBS)),hbvm) - LIBLIST += -lhbmainstd + LINKLIBS += -lhbmainstd endif endif -LDFLAGS := -# This library is needed for CharToOemBuff() and OemToCharBuff() support. -SYSLIBS := -luser32 -lgdi32 -lws2_32 +LINKLIBS += -luser32 -lgdi32 -lws2_32 + +LDFLAGS += $(LINKPATHS) + +RANLIB := $(HB_CCPREFIX)ranlib AR := $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) -RANLIB := $(HB_CCPREFIX)ranlib - AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) -LINKLIBS = $(LINKPATHS) $(LIBLIST) $(SYSLIBS) include $(TOP)$(ROOT)config/rules.cf