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

2009-07-15 18:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/win/mingw.cf
  * config/wce/mingwarm.cf
    % Optimized out LIB_DIR_OS_ vars.

  * config/dos/watcom.cf
  * config/win/watcom.cf
  * config/win/bcc.cf
  * config/linux/watcom.cf
  * config/os2/watcom.cf
    ! Minor: += -> = (after recent changes)
This commit is contained in:
Viktor Szakats
2009-07-15 16:53:53 +00:00
parent 8803ac29e6
commit 934ddf43b1
8 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-15 18:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/win/mingw.cf
* config/wce/mingwarm.cf
% Optimized out LIB_DIR_OS_ vars.
* config/dos/watcom.cf
* config/win/watcom.cf
* config/win/bcc.cf
* config/linux/watcom.cf
* config/os2/watcom.cf
! Minor: += -> = (after recent changes)
2009-07-15 18:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/pp/Makefile
* source/pp/hbpp.c

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

@@ -104,7 +104,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))
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)

2
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))
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)

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

@@ -90,7 +90,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))
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)

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

@@ -65,12 +65,7 @@ ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(HB_CCPREFIX)ranlib
ifeq ($(AR_RULE),)
ifeq ($(SHLVL),) # non-bash
LIB_DIR_OS_ = $(subst /,\,$(LIB_DIR))\$@
else
LIB_DIR_OS_ = $(LIB_DIR)/$@
endif
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_OS_)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
# our libs have a lot of cross referenced now and we have to group them
# until we won't have cleaned them
LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)

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

@@ -55,7 +55,7 @@ endif
# 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)

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

@@ -72,12 +72,7 @@ ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(HB_CCPREFIX)ranlib
ifeq ($(AR_RULE),)
ifeq ($(SHLVL),) # non-bash
LIB_DIR_OS_ = $(subst /,\,$(LIB_DIR))\$@
else
LIB_DIR_OS_ = $(LIB_DIR)/$@
endif
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_OS_)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
# our libs have a lot of cross referenced now and we have to group them
# until we won't have cleaned them
LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)

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

@@ -93,7 +93,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))
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)