diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 55e8639feb..e3662a6548 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,38 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-11 00:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/bsd/gcc.cf + * config/wce/msvcarm.cf + * config/wce/mingwarm.cf + * config/wce/poccarm.cf + * config/darwin/gcc.cf + * config/hpux/gcc.cf + * config/dos/watcom.cf + * config/dos/djgpp.cf + * config/win/watcom.cf + * config/win/icc.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/sunpro.cf + * config/instsh.cf + * config/dirsh.cf + * config/os2/watcom.cf + * config/os2/gcc.cf + * config/sunos/gcc.cf + * config/sunos/sunpro.cf + % Removed spaces before $(foreach) parameters. A space is + automatically added by GNU Make, so it's not needed. May + save a little bytes here and there and command look more + tidy (source looks a little bit clumsier though). + 2009-08-11 00:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rdd/Makefile * config/global.cf diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 2db705709b..e25e04c399 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -37,7 +37,7 @@ LINKPATHS += -L$(LIB_DIR) LINKLIBS += -Wl,--start-group -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index eac0b26c11..1e2debcd35 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -49,7 +49,7 @@ LD_OUT := -o LINKPATHS += -L$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/dirsh.cf b/harbour/config/dirsh.cf index 314d8620c8..250c99aedf 100644 --- a/harbour/config/dirsh.cf +++ b/harbour/config/dirsh.cf @@ -48,7 +48,7 @@ $(MK_OS) -C $(file) $@ endef -DIR_RULE = $(foreach file, $(DIRS_OS), $(dir_mk)) +DIR_RULE = $(foreach file,$(DIRS_OS),$(dir_mk)) endif diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index a1ba558216..e842c4c2dd 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -36,7 +36,7 @@ LDLIBS = -lm LINKPATHS += -L$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every echo command will be separated by LF @@ -49,7 +49,7 @@ endef # in commmand line define create_library @echo. CREATE $(LIB_DIR)/$@ > __lib__.tmp -$(foreach file, $(^F), $(lib_object)) +$(foreach file,$(^F),$(lib_object)) @echo. SAVE >> __lib__.tmp @echo. END >> __lib__.tmp $(AR) $(ARFLAGS) -M < __lib__.tmp @@ -63,10 +63,10 @@ endef define link_exe_file @echo. $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$(BIN_DIR)/$@ > __link__.tmp -$(foreach file, $(^F), $(link_file)) -$(foreach file, $(LINKPATHS), $(link_file)) +$(foreach file,$(^F),$(link_file)) +$(foreach file,$(LINKPATHS),$(link_file)) @echo. -Wl,--start-group >> __link__.tmp -$(foreach file, $(LINKLIBS), $(link_file)) +$(foreach file,$(LINKLIBS),$(link_file)) @echo. -Wl,--end-group >> __link__.tmp @echo. $(LDLIBS) >> __link__.tmp -$(LD) @__link__.tmp diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index d0d0067ed9..a0c620219e 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -85,8 +85,8 @@ endef define link_exe_file @echo $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp -$(foreach file, $(^F), $(link_file)) -$(foreach lib, $(LINKLIBS), $(link_lib)) +$(foreach file,$(^F),$(link_file)) +$(foreach lib,$(LINKLIBS),$(link_lib)) -$(LD) @__link__.tmp endef @@ -102,7 +102,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) endif -LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) @@ -114,7 +114,7 @@ endef define create_library @echo $(LIB_DIR)/$@ > __lib__.tmp -$(foreach file, $(^F), $(lib_object)) +$(foreach file,$(^F),$(lib_object)) $(AR) $(ARFLAGS) @__lib__.tmp endef diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index fd6752c8f6..88eef122b7 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -43,7 +43,7 @@ LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf index 869c863b6e..1b895a74af 100644 --- a/harbour/config/instsh.cf +++ b/harbour/config/instsh.cf @@ -69,7 +69,7 @@ $(CMDPREF)$(CP) $(file) $(INSTALL_DIR_OS) endef -INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file)) +INSTALL_RULE = $(foreach file,$(INSTALL_FILES_OS),$(inst_file)) endif @@ -77,7 +77,7 @@ ifeq ($(HB_SHELL),dos) define inst_file_all $(MDP) $(INSTALL_DIR_OS) -$(foreach file, $(INSTALL_FILES_OS), $(inst_file)) +$(foreach file,$(INSTALL_FILES_OS),$(inst_file)) endef diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 856edd5635..fdfe88eddb 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -55,7 +55,7 @@ LINKPATHS += -L$(LIB_DIR) # untill we don't clean them LINKLIBS += -Wl,--start-group -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 6eb0c2adc8..de8009eeac 100644 --- a/harbour/config/linux/icc.cf +++ b/harbour/config/linux/icc.cf @@ -49,7 +49,7 @@ LINKPATHS += -L$(LIB_DIR) # untill we don't clean them LINKLIBS += -Wl,--start-group -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library and other RTLs ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index f037b6c52a..61d17ff3b6 100644 --- a/harbour/config/linux/sunpro.cf +++ b/harbour/config/linux/sunpro.cf @@ -55,7 +55,7 @@ LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf index 2434fd42a1..453d39b7b5 100644 --- a/harbour/config/linux/watcom.cf +++ b/harbour/config/linux/watcom.cf @@ -69,7 +69,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) endif -LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) LDFILES = $(subst $(space),$(comma) ,$(^F)) LDLIBS = $(subst $(space),$(comma) ,$(strip $(LINKLIBS))) @@ -85,6 +85,6 @@ endif 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)) +AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file)) include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index bc1f31f793..ad782b0cac 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -46,7 +46,7 @@ endif # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) #LINKLIBS += -Wl,-( -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf index 8a52364d6f..b1acb4df2a 100644 --- a/harbour/config/os2/watcom.cf +++ b/harbour/config/os2/watcom.cf @@ -72,14 +72,14 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) endif -LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) LDFILES = $(subst $(space),$(comma) ,$(^F)) LDLIBS = $(subst $(space),$(comma) ,$(strip $(LINKLIBS))) LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES) $(if $(LDLIBS), LIB $(LDLIBS),) ifeq ($(HB_SHELL),sh) -create_library = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file, $(^F), -+$(file)) +create_library = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file)) else # maximum size of command line in OS2 is limited to 1024 characters # the trick with divided 'wordlist' is workaround for it: diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 49e0b854d5..5ef1ec583a 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -42,7 +42,7 @@ LD_OUT := -o # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf index 68301d1e10..f51e4c880c 100644 --- a/harbour/config/sunos/sunpro.cf +++ b/harbour/config/sunos/sunpro.cf @@ -65,7 +65,7 @@ LD_OUT := -o$(subst x,x, ) # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # Add the specified GT driver library ifeq ($(findstring hbrtl,$(LIBS)),hbrtl) diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index fd02e43deb..bf0bff911c 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -40,7 +40,7 @@ LIBLIST = # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LIBLIST += $(foreach lib, $(LIBS), -l$(lib)) +LIBLIST += $(foreach lib,$(LIBS),-l$(lib)) SYSLIBS := -lwininet -lws2 diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf index 4bcf4c12f5..5edb8a9f9e 100644 --- a/harbour/config/wce/msvcarm.cf +++ b/harbour/config/wce/msvcarm.cf @@ -56,7 +56,7 @@ LINKPATHS += /manifest:no endif LINKPATHS += /libpath:$(LIB_DIR) # Add all libraries specified in LIBS. -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = /nologo $(LINKPATHS) diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf index 8e6710e4f9..fa512c3956 100644 --- a/harbour/config/wce/poccarm.cf +++ b/harbour/config/wce/poccarm.cf @@ -42,7 +42,7 @@ LD_OUT := -OUT: # Add all libraries specified in LIBS. LINKPATHS += -LIBPATH:$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib LDFLAGS += /SUBSYSTEM:WINDOWS diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 3ff5f04329..1aaaf35726 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -38,11 +38,11 @@ LD_OUT := -e # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LIBLIST += $(foreach lib, $(LIBS),$(lib)$(LIB_EXT)) +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,$(LIBLIST),$(LIB_DIR)/$(lib)) LDFLAGS = $(LINKPATHS) @@ -60,7 +60,7 @@ endef define create_library @if exist __lib__.tmp del __lib__.tmp -$(foreach file, $(^F), $(lib_object)) +$(foreach file,$(^F),$(lib_object)) @echo -+>> __lib__.tmp $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp endef @@ -69,7 +69,7 @@ AR_RULE = $(create_library) else # sh -AROBJS = $(foreach file, $(^F), -+$(file)) +AROBJS = $(foreach file,$(^F),-+$(file)) AR_RULE = $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS) endif diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf index b4cd3d0016..7ddbb066ea 100644 --- a/harbour/config/win/cygwin.cf +++ b/harbour/config/win/cygwin.cf @@ -41,7 +41,7 @@ LINKPATHS += -L$(LIB_DIR) # cyclic dependencies, but I think it is not really necessary if the # libraries are kept in proper order. # LINKLIBS += -Wl,-( -LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) +LINKLIBS += $(foreach lib,$(LIBS),-l$(lib)) # This library is needed for CharToOemBuff() and OemToCharBuff() support. LINKLIBS += -luser32 -lgdi32 -lws2_32 diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf index 0e46615181..ed4de19250 100644 --- a/harbour/config/win/icc.cf +++ b/harbour/config/win/icc.cf @@ -41,7 +41,7 @@ LD_OUT := -Fe # Add all libraries specified in LIBS. LINKPATHS += /link /libpath:$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index c012eaee39..06d21ecf2d 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -42,7 +42,7 @@ LIBLIST = # Add all libraries specified in LIBS. LINKPATHS += -L$(LIB_DIR) -LIBLIST += $(foreach lib, $(LIBS),-l$(lib)) +LIBLIST += $(foreach lib,$(LIBS),-l$(lib)) # Add the standard C main() entry ifeq ($(HB_MAIN),std) diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf index 889a5f9949..05b05b53a7 100644 --- a/harbour/config/win/msvc.cf +++ b/harbour/config/win/msvc.cf @@ -51,7 +51,7 @@ LD_OUT := /out: # Add all libraries specified in LIBS. LINKPATHS += /libpath:$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = /nologo $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf index b8f55fb519..ac96411640 100644 --- a/harbour/config/win/pocc.cf +++ b/harbour/config/win/pocc.cf @@ -39,7 +39,7 @@ LD_OUT := -OUT: # Add all libraries specified in LIBS. LINKPATHS += -LIBPATH:$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib LDFLAGS += /SUBSYSTEM:CONSOLE diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf index bc860da5e0..d4318bef1e 100644 --- a/harbour/config/win/watcom.cf +++ b/harbour/config/win/watcom.cf @@ -79,8 +79,8 @@ endef define link_exe_file @echo $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp -$(foreach file, $(^F), $(link_file)) -$(foreach lib, $(LINKLIBS), $(link_lib)) +$(foreach file,$(^F),$(link_file)) +$(foreach lib,$(LINKLIBS),$(link_lib)) @echo LIB ws2_32.lib >> __link__.tmp -$(LD) @__link__.tmp endef @@ -91,7 +91,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) LDFLAGS := DEBUG ALL $(LDFLAGS) endif -LINKLIBS = $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)) +LINKLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) @@ -103,7 +103,7 @@ endef define create_library @echo $(LIB_DIR)/$@ > __lib__.tmp -$(foreach file, $(^F), $(lib_object)) +$(foreach file,$(^F),$(lib_object)) $(AR) $(ARFLAGS) @__lib__.tmp endef diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf index 32643e0582..cff60bad8e 100644 --- a/harbour/config/win/xcc.cf +++ b/harbour/config/win/xcc.cf @@ -33,7 +33,7 @@ LD_OUT := -OUT: # Add all libraries specified in LIBS. LINKPATHS += -LIBPATH:$(LIB_DIR) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT)) LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib