From b41df4d1adc29b90470a0a14947ea03fc16365b8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 10 Aug 2009 22:41:41 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 14 ++++++++++++++ harbour/config/bin.cf | 19 ++++++++++++++++++- harbour/config/bsd/gcc.cf | 8 ++++---- harbour/config/darwin/gcc.cf | 8 ++++---- harbour/config/hpux/gcc.cf | 6 +++--- harbour/config/linux/gcc.cf | 6 +++--- harbour/config/linux/icc.cf | 6 +++--- harbour/config/linux/sunpro.cf | 6 +++--- harbour/config/sunos/gcc.cf | 6 +++--- harbour/config/sunos/sunpro.cf | 6 +++--- 10 files changed, 58 insertions(+), 27 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2606f7f9b9..6a9076df16 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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. diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf index e50afdcf66..2c6f130945 100644 --- a/harbour/config/bin.cf +++ b/harbour/config/bin.cf @@ -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 diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 17403aefb4..2db705709b 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -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 diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 3d1359a0a0..eac0b26c11 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -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 diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 90e42d7214..fd6752c8f6 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -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 diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 03db94dbcc..856edd5635 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -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 diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf index 7d54651e4c..6eb0c2adc8 100644 --- a/harbour/config/linux/icc.cf +++ b/harbour/config/linux/icc.cf @@ -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 diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf index 8eecf0104d..f037b6c52a 100644 --- a/harbour/config/linux/sunpro.cf +++ b/harbour/config/linux/sunpro.cf @@ -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 diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index 75f01ce67a..49e0b854d5 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -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 diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf index 06a784af0f..68301d1e10 100644 --- a/harbour/config/sunos/sunpro.cf +++ b/harbour/config/sunos/sunpro.cf @@ -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