fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-11 00:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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).
This commit is contained in:
Viktor Szakats
2009-08-10 22:56:37 +00:00
parent 97e239dc73
commit 8f8f068644
27 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
harbour/ChangeLog
View File

@@ -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

2
harbour/config/bsd/gcc.cf
View File

@@ -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)

2
harbour/config/darwin/gcc.cf
View File

@@ -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)

2
harbour/config/dirsh.cf
View File

@@ -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

10
harbour/config/dos/djgpp.cf
View File

@@ -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

8
harbour/config/dos/watcom.cf
View File

@@ -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

2
harbour/config/hpux/gcc.cf
View File

@@ -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)

4
harbour/config/instsh.cf
View File

@@ -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

2
harbour/config/linux/gcc.cf
View File

@@ -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)

2
harbour/config/linux/icc.cf
View File

@@ -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)

2
harbour/config/linux/sunpro.cf
View File

@@ -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)

4
harbour/config/linux/watcom.cf
View File

@@ -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

2
harbour/config/os2/gcc.cf
View File

@@ -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)

4
harbour/config/os2/watcom.cf
View File

@@ -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:

2
harbour/config/sunos/gcc.cf
View File

@@ -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)

2
harbour/config/sunos/sunpro.cf
View File

@@ -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)

2
harbour/config/wce/mingwarm.cf
View File

@@ -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

2
harbour/config/wce/msvcarm.cf
View File

@@ -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)

2
harbour/config/wce/poccarm.cf
View File

@@ -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

8
harbour/config/win/bcc.cf
View File

@@ -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<path> 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

2
harbour/config/win/cygwin.cf
View File

@@ -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

2
harbour/config/win/icc.cf
View File

@@ -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

2
harbour/config/win/mingw.cf
View File

@@ -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)

2
harbour/config/win/msvc.cf
View File

@@ -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

2
harbour/config/win/pocc.cf
View File

@@ -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

8
harbour/config/win/watcom.cf
View File

@@ -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

2
harbour/config/win/xcc.cf
View File

@@ -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