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

* config/bin.cf
    * Minor formatting to liblist template.

  * config/bsd/gcc.cf
  * config/darwin/gcc.cf
  * config/hpux/gcc.cf
  * config/linux/gcc.cf
  * config/linux/icc.cf
  * config/linux/sunpro.cf
  * config/sunos/gcc.cf
  * config/sunos/sunpro.cf
    % Using LIBS var to check for libs rather than HB_GT_LIBS.
This commit is contained in:
Viktor Szakats
2009-08-10 22:41:41 +00:00
parent 98f2456d09
commit b41df4d1ad
10 changed files with 58 additions and 27 deletions

View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-11 00:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/bin.cf
* Minor formatting to liblist template.
* config/bsd/gcc.cf
* config/darwin/gcc.cf
* config/hpux/gcc.cf
* config/linux/gcc.cf
* config/linux/icc.cf
* config/linux/sunpro.cf
* config/sunos/gcc.cf
* config/sunos/sunpro.cf
% Using LIBS var to check for libs rather than HB_GT_LIBS.
2009-08-11 00:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/bin.cf
+ Harbour binary core liblists are now formed centrally.

View File

@@ -8,7 +8,24 @@ ifneq ($(HB_ARCHITECTURE),)
ifneq ($(HB_COMPILER),)
# Assemble template lib list to help create a few common variations
HB_LIBS_TPL = hbextern hbdebug $(_HB_VM) hbrtl hblang hbcpage $(HB_GT_LIBS) $(_HB_RDD) hbrtl $(_HB_VM) hbmacro hbcplr hbpp hbcommon
# (have to use '=' operator here)
HB_LIBS_TPL = \
hbextern \
hbdebug \
$(_HB_VM) \
hbrtl \
hblang \
hbcpage \
$(HB_GT_LIBS) \
$(_HB_RDD) \
hbrtl \
$(_HB_VM) \
hbmacro \
hbcplr \
hbpp \
hbcommon
ifeq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
ifeq ($(findstring -DHB_POSIX_REGEX, $(HB_USER_CFLAGS)),)
HB_LIBS_TPL += hbpcre

View File

@@ -47,19 +47,19 @@ ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
# In BSD, slang still needs curses :(
ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifeq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
LINKPATHS += -L/usr/X11R6/lib

View File

@@ -59,19 +59,19 @@ ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
# In BSD, slang still needs curses :(
ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifeq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
LINKPATHS += -L/usr/X11R6/lib

View File

@@ -52,13 +52,13 @@ ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
LINKPATHS += -L/usr/X11R6/lib

View File

@@ -64,13 +64,13 @@ ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
LINKPATHS += -L/usr/X11R6/lib

View File

@@ -58,13 +58,13 @@ ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
LINKPATHS += -L/usr/X11R6/lib

View File

@@ -64,13 +64,13 @@ ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := ncurses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
LINKPATHS += -L/usr/X11R6/lib
endif

View File

@@ -51,13 +51,13 @@ ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := curses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
LINKPATHS += -L/usr/X11R6/lib

View File

@@ -74,13 +74,13 @@ ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(HB_CRS_LIB),)
HB_CRS_LIB := curses
endif
ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),)
ifneq ($(findstring gtcrs, $(LIBS)),)
LINKLIBS += -l$(HB_CRS_LIB)
endif
ifneq ($(findstring gtsln, $(HB_GT_LIBS)),)
ifneq ($(findstring gtsln, $(LIBS)),)
LINKLIBS += -lslang
endif
ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),)
ifneq ($(findstring gtxwc, $(LIBS)),)
LINKLIBS += -lX11
LINKPATHS += -L/usr/X11R6/lib
endif