From fbc91bbb3301da23d9a948964a6db32f880210d5 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 23 Aug 2007 00:56:18 +0000 Subject: [PATCH] 2007-08-23 02:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/darwin/gcc.cf * harbour/config/darwin/global.cf * harbour/config/hpux/gcc.cf * harbour/config/hpux/global.cf * harbour/config/dos/owatcom.cf * harbour/config/dos/watcom.cf * harbour/config/dos/bcc16.cf * harbour/config/dos/global.cf * harbour/config/dos/rsx32.cf * harbour/config/dos/djgpp.cf * harbour/config/linux/owatcom.cf * harbour/config/linux/gcc.cf * harbour/config/linux/global.cf * harbour/config/os2/gcc.cf * harbour/config/os2/icc.cf * harbour/config/os2/global.cf * harbour/config/sunos/global.cf * harbour/config/bsd/gcc.cf * harbour/config/bsd/global.cf * harbour/config/w32/msvc.cf * harbour/config/w32/owatcom.cf * harbour/config/w32/watcom.cf * harbour/config/w32/bcc32.cf * harbour/config/w32/gcc.cf * harbour/config/w32/xcc.cf * harbour/config/w32/rsxnt.cf * harbour/config/w32/global.cf * harbour/config/w32/mingw32.cf + added support for linking with all GT libraries - please test * harbour/makefile.gc * removed system screen libraries - they are set by make_gcc.sh * harbour/bin/pack_src.sh + added HBDOT * harbour/harbour.spec * harbour/make_tgz.sh * replaced PP with HBDOT --- harbour/ChangeLog | 41 +++++++++++++++++ harbour/bin/pack_src.sh | 4 ++ harbour/config/bsd/gcc.cf | 45 +++++++++---------- harbour/config/bsd/global.cf | 25 +++++++---- harbour/config/darwin/gcc.cf | 49 +++++++------------- harbour/config/darwin/global.cf | 22 ++++++--- harbour/config/dos/bcc16.cf | 17 ++----- harbour/config/dos/djgpp.cf | 12 +---- harbour/config/dos/global.cf | 10 ++++- harbour/config/dos/owatcom.cf | 13 +----- harbour/config/dos/rsx32.cf | 20 +-------- harbour/config/dos/watcom.cf | 3 +- harbour/config/hpux/gcc.cf | 41 +++++------------ harbour/config/hpux/global.cf | 24 +++++----- harbour/config/linux/gcc.cf | 39 ++++------------ harbour/config/linux/global.cf | 19 ++++---- harbour/config/linux/owatcom.cf | 9 +--- harbour/config/os2/gcc.cf | 10 +---- harbour/config/os2/global.cf | 5 ++- harbour/config/os2/icc.cf | 12 ++--- harbour/config/sunos/global.cf | 24 +++++----- harbour/config/w32/bcc32.cf | 12 ++--- harbour/config/w32/gcc.cf | 12 +---- harbour/config/w32/global.cf | 12 ++++- harbour/config/w32/mingw32.cf | 12 +---- harbour/config/w32/msvc.cf | 12 +---- harbour/config/w32/owatcom.cf | 13 +----- harbour/config/w32/rsxnt.cf | 12 +---- harbour/config/w32/watcom.cf | 13 +----- harbour/config/w32/xcc.cf | 12 +---- harbour/harbour.spec | 80 +++------------------------------ harbour/make_tgz.sh | 12 +---- harbour/makefile.gc | 28 ------------ 33 files changed, 240 insertions(+), 434 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bad90f689b..0799a04ccc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,47 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-08-23 02:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/darwin/gcc.cf + * harbour/config/darwin/global.cf + * harbour/config/hpux/gcc.cf + * harbour/config/hpux/global.cf + * harbour/config/dos/owatcom.cf + * harbour/config/dos/watcom.cf + * harbour/config/dos/bcc16.cf + * harbour/config/dos/global.cf + * harbour/config/dos/rsx32.cf + * harbour/config/dos/djgpp.cf + * harbour/config/linux/owatcom.cf + * harbour/config/linux/gcc.cf + * harbour/config/linux/global.cf + * harbour/config/os2/gcc.cf + * harbour/config/os2/icc.cf + * harbour/config/os2/global.cf + * harbour/config/sunos/global.cf + * harbour/config/bsd/gcc.cf + * harbour/config/bsd/global.cf + * harbour/config/w32/msvc.cf + * harbour/config/w32/owatcom.cf + * harbour/config/w32/watcom.cf + * harbour/config/w32/bcc32.cf + * harbour/config/w32/gcc.cf + * harbour/config/w32/xcc.cf + * harbour/config/w32/rsxnt.cf + * harbour/config/w32/global.cf + * harbour/config/w32/mingw32.cf + + added support for linking with all GT libraries - please test + + * harbour/makefile.gc + * removed system screen libraries - they are set by make_gcc.sh + + * harbour/bin/pack_src.sh + + added HBDOT + + * harbour/harbour.spec + * harbour/make_tgz.sh + * replaced PP with HBDOT + 2007-08-22 22:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/makefile.bc * harbour/makefile.vc diff --git a/harbour/bin/pack_src.sh b/harbour/bin/pack_src.sh index 1836580009..131a03e981 100755 --- a/harbour/bin/pack_src.sh +++ b/harbour/bin/pack_src.sh @@ -297,6 +297,10 @@ $hb_collect utils/hbpptest/*.prg $hb_collect utils/hbrun/Makefile $hb_collect utils/hbrun/*.prg +# UTILS\HBDOT +$hb_collect utils/hbdot/Makefile +$hb_collect utils/hbdot/*.prg + # UTILS\HBTEST $hb_collect utils/hbtest/Makefile $hb_collect utils/hbtest/*.ch diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 8aaacf3961..e73a1efa8c 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -40,44 +40,39 @@ endif # Add the specified GT driver library and other RTLs ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) +# screen driver libraries +ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) +LINKLIBS += -lncurses +endif + +ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) +LINKLIBS += -lslang +# In BSD, slang still needs curses :( +ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),) +LINKLIBS += -lncurses endif endif -# HB_SCREEN_LIB: empty, or one of ncurses, slang -ifeq ($(HB_GT_LIB),gtcrs) -HB_SCREEN_LIB:=ncurses -else -ifeq ($(HB_GT_LIB),gtsln) -HB_SCREEN_LIB:=slang -else -ifeq ($(HB_GT_LIB),gtalleg) -HB_GTALLEG:=yes +ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) LINKLIBS += `allegro-config --static` endif -endif -endif -ifeq ($(HB_GT_LIB),gtxvt) -LINKLIBS += -lX11 -LINKPATHS += -L/usr/X11R6/lib -else -ifeq ($(HB_GT_LIB),gtxwc) +ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 +#LINKPATHS += -L/usr/X11R6/lib64 LINKPATHS += -L/usr/X11R6/lib endif + +# HB_GPM_MOUSE: use gpm mouse driver +# Actually, there is no gpm on BSD. +ifeq ($(HB_GPM_MOUSE),yes) +LINKLIBS += -lgpm endif -ifneq ($(HB_SCREEN_LIB),) LINKPATHS += -L/usr/local/lib -LINKLIBS += -l$(HB_SCREEN_LIB) -endif endif diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf index 7fb17df279..02e8c00db8 100644 --- a/harbour/config/bsd/global.cf +++ b/harbour/config/bsd/global.cf @@ -4,31 +4,40 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ - gtcrs \ gtpca \ gtstd \ gttrm \ +ifneq ($(HB_WITHOUT_GTCRS),yes) + HB_GT_LIST += gtcrs +endif ifeq ($(HB_COMMERCE),yes) - HB_GPM_MOUSE = no + HB_GPM_MOUSE = no else ifneq ($(HB_WITHOUT_GTSLN),yes) - HB_GT_LIBS += gtsln + HB_GT_LIST += gtsln endif endif +ifneq ($(HB_WITHOUT_X11),yes) + HB_GT_LIST += gtxwc +endif +ifeq ($(HB_GTALLEG),yes) + HB_GT_LIST += gtalleg +endif + +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd + HB_GT_LIB = gtstd endif MAKE = gmake -ARCH_DIR = $(HB_ARCH)/ - +ARCH_DIR = $(HB_ARCH) MK = $(MAKE) - RM = rm -f RD = rm -f -r CP = cp -f diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index af215f5514..eedef2751b 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -54,47 +54,30 @@ endif # Add the specified GT driver library and other RTLs ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) +# screen driver libraries +ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) +LINKLIBS += -lncurses +endif + +ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) +LINKLIBS += -lslang +# In BSD, slang still needs curses :( +ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),) +LINKLIBS += -lncurses endif endif -# HB_SCREEN_LIB: empty, or one of ncurses, slang -ifeq ($(HB_GT_LIB),gtcrs) -HB_SCREEN_LIB:=ncurses -else -ifeq ($(HB_GT_LIB),gtsln) -HB_SCREEN_LIB:=slang -else -ifeq ($(HB_GT_LIB),gtalleg) -HB_GTALLEG:=yes +ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) LINKLIBS += `allegro-config --static` endif -endif -endif -ifeq ($(HB_GT_LIB),gtxvt) +ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 -LINKPATHS +=-L/usr/X11R6/lib -else -ifeq ($(HB_GT_LIB),gtxwc) -LINKLIBS += -lX11 -LINKPATHS +=-L/usr/X11R6/lib -endif -endif - -ifneq ($(HB_SCREEN_LIB),) -LINKLIBS += -l$(HB_SCREEN_LIB) -endif - -# In BSD, slang still needs curses :( -ifeq ($(HB_GT_LIB),gtsln) -LINKLIBS += -lncurses +#LINKPATHS += -L/usr/X11R6/lib64 +LINKPATHS += -L/usr/X11R6/lib endif # HB_GPM_MOUSE: use gpm mouse driver diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf index 0ede76ce12..bbfd0c220c 100644 --- a/harbour/config/darwin/global.cf +++ b/harbour/config/darwin/global.cf @@ -4,28 +4,38 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ - gtcrs \ gtpca \ gtstd \ gttrm \ +ifneq ($(HB_WITHOUT_GTCRS),yes) + HB_GT_LIST += gtcrs +endif ifeq ($(HB_COMMERCE),yes) - HB_GPM_MOUSE = no + HB_GPM_MOUSE = no else ifneq ($(HB_WITHOUT_GTSLN),yes) - HB_GT_LIBS += gtsln + HB_GT_LIST += gtsln endif endif +ifneq ($(HB_WITHOUT_X11),yes) + HB_GT_LIST += gtxwc +endif +ifeq ($(HB_GTALLEG),yes) + HB_GT_LIST += gtalleg +endif + +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd + HB_GT_LIB = gtstd endif ARCH_DIR = $(HB_ARCH) MK = $(MAKE) - RM = rm -f RD = rm -f -r CP = cp -f diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf index 2629395143..d3cd7f7ee7 100644 --- a/harbour/config/dos/bcc16.cf +++ b/harbour/config/dos/bcc16.cf @@ -64,21 +64,12 @@ LD_RULE = $(link_exe_file) # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)$(LIB_EXT) +ifeq ($(HB_LIB_COMPILE),) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)$(LIB_EXT)) +else +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) endif endif -endif - -# HB_SCREEN_LIB: empty, or one of ncurses, slang -# HB_SCREEN_LIB=ncurses -# HB_SCREEN_LIB=slang - -ifneq ($(HB_SCREEN_LIB),) -LINKLIBS += $(HB_SCREEN_LIB) -endif #Note: The empty line below HAVE TO exist! define lib_object diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 0ea7ebcae3..9d3a5e5831 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -40,16 +40,8 @@ endif # Add the specified GT driver library and other RTLs ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) -endif -endif - +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) endif # NOTE: The empty line directly before 'endef' HAVE TO exist! diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf index 238c31c4b1..7d2b47e94a 100644 --- a/harbour/config/dos/global.cf +++ b/harbour/config/dos/global.cf @@ -6,14 +6,22 @@ ifndef MK all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ gtpca \ gtstd \ gtdos \ + # gtcrs \ # gtsln \ +ifeq ($(HB_GTALLEG),yes) + HB_GT_LIST += gtalleg +endif + +# verify if GT drivers exist +#HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) +HB_GT_LIBS := $(HB_GT_LIST) ifeq ($(HB_GT_LIB),) HB_GT_LIB = gtdos diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf index c0bda3cc59..c920c22c06 100644 --- a/harbour/config/dos/owatcom.cf +++ b/harbour/config/dos/owatcom.cf @@ -82,18 +82,9 @@ endif ifeq ($(findstring rtl,$(LIBS)),rtl) ifeq ($(HB_LIB_COMPILE),) - GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB) + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)) else - GTLIBS := $(HB_LIB_COMPILE)/$(HB_GT_LIB) - endif - ifneq ($(HB_GT_DEFAULT),) - ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT) - else - GTLIBS += $(HB_LIB_COMPILE)/$(HB_GT_DEFAULT) - endif - endif + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) endif GTLIBS := $(subst /,\,$(GTLIBS)) endif diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf index 67a4b50bd5..0511d06d4d 100644 --- a/harbour/config/dos/rsx32.cf +++ b/harbour/config/dos/rsx32.cf @@ -44,24 +44,8 @@ endif # Add the specified GT driver library and other RTLs ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) -endif -endif - -endif - -# HB_SCREEN_LIB: empty, or one of ncurses, slang -# HB_SCREEN_LIB=ncurses -# HB_SCREEN_LIB=slang - -ifneq ($(HB_SCREEN_LIB),) -LINKLIBS += -l$(HB_SCREEN_LIB) +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) endif # The -) option could be appropriate to link against libraries with diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index e6c9783634..e16bc59ab3 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -56,8 +56,7 @@ ifeq ($(findstring rdd,$(LIBS)),rdd) RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(subst /,\,$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv))) endif -GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB) -GTLIBS := $(subst /,\,$(GTLIBS)) +GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(subst /,\,$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt))) LD_RULE = $(link_exe_file) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index dbdbaa4e97..bec6c2654f 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -43,42 +43,23 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) +# screen driver libraries +ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) +LINKLIBS += -lncurses endif +ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) +LINKLIBS += -lslang endif - -# HB_SCREEN_LIB: empty, or one of curses, slang -ifeq ($(HB_GT_LIB),gtcrs) -HB_SCREEN_LIB:=curses -else -ifeq ($(HB_GT_LIB),gtsln) -HB_SCREEN_LIB:=slang -else -ifeq ($(HB_GT_LIB),gtalleg) -HB_GTALLEG:=yes +ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) LINKLIBS += `allegro-config --static` endif -endif -endif - -ifneq ($(HB_SCREEN_LIB),) -LINKLIBS += -l$(HB_SCREEN_LIB) -endif - -ifeq ($(HB_GT_LIB),gtxvt) +ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 -LINKPATHS +=-L/usr/X11R6/lib -else -ifeq ($(HB_GT_LIB),gtxwc) -LINKLIBS += -lX11 -LINKPATHS +=-L/usr/X11R6/lib -endif +#LINKPATHS += -L/usr/X11R6/lib64 +LINKPATHS += -L/usr/X11R6/lib endif # HB_GPM_MOUSE: use gpm mouse driver diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf index 9c3d24d4c7..aa0018e8c2 100644 --- a/harbour/config/hpux/global.cf +++ b/harbour/config/hpux/global.cf @@ -4,33 +4,37 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ - gtcrs \ gtpca \ gtstd \ gttrm \ +ifneq ($(HB_WITHOUT_GTCRS),yes) + HB_GT_LIST += gtcrs +endif ifeq ($(HB_COMMERCE),yes) - HB_GPM_MOUSE = no + HB_GPM_MOUSE = no else ifneq ($(HB_WITHOUT_GTSLN),yes) - HB_GT_LIBS += gtsln + HB_GT_LIST += gtsln endif endif ifneq ($(HB_WITHOUT_X11),yes) -# HB_GT_LIBS += gtxvt -# HB_GT_LIBS += gtxwc +# HB_GT_LIST += gtxwc endif ifeq ($(HB_GTALLEG),yes) - HB_GT_LIBS += gtalleg + HB_GT_LIST += gtalleg endif +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) + ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd + HB_GT_LIB = gtstd endif -ARCH_DIR = $(HB_ARCH)/ +ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -39,9 +43,9 @@ MV = mv -f MD = mkdir MDP = mkdir -p + dirbase:: @[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR) clean:: -$(RD) $(ARCH_DIR) - diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 6b2a4fb668..3d2aa14882 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -54,44 +54,23 @@ endif # Add the specified GT driver library and other RTLs ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) +# screen driver libraries +ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) +LINKLIBS += -lncurses endif +ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) +LINKLIBS += -lslang endif - -# HB_SCREEN_LIB: empty, or one of ncurses, slang -ifeq ($(HB_GT_LIB),gtcrs) -HB_SCREEN_LIB:=ncurses -else -ifeq ($(HB_GT_LIB),gtsln) -HB_SCREEN_LIB:=slang -else -ifeq ($(HB_GT_LIB),gtalleg) -HB_GTALLEG:=yes +ifneq ($(findstring gtalleg, $(HB_GT_LIBS)),) LINKLIBS += `allegro-config --static` endif -endif -endif - -ifeq ($(HB_GT_LIB),gtxvt) +ifneq ($(findstring gtxwc, $(HB_GT_LIBS)),) LINKLIBS += -lX11 #LINKPATHS += -L/usr/X11R6/lib64 LINKPATHS += -L/usr/X11R6/lib -else -ifeq ($(HB_GT_LIB),gtxwc) -LINKLIBS += -lX11 -#LINKPATHS += -L/usr/X11R6/lib64 -LINKPATHS += -L/usr/X11R6/lib -endif -endif - -ifneq ($(HB_SCREEN_LIB),) -LINKLIBS += -l$(HB_SCREEN_LIB) endif # HB_GPM_MOUSE: use gpm mouse driver diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf index 35d7532f5c..bbfd0c220c 100644 --- a/harbour/config/linux/global.cf +++ b/harbour/config/linux/global.cf @@ -4,33 +4,37 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ - gtcrs \ gtpca \ gtstd \ gttrm \ +ifneq ($(HB_WITHOUT_GTCRS),yes) + HB_GT_LIST += gtcrs +endif ifeq ($(HB_COMMERCE),yes) HB_GPM_MOUSE = no else ifneq ($(HB_WITHOUT_GTSLN),yes) - HB_GT_LIBS += gtsln + HB_GT_LIST += gtsln endif endif ifneq ($(HB_WITHOUT_X11),yes) - HB_GT_LIBS += gtxvt - HB_GT_LIBS += gtxwc + HB_GT_LIST += gtxwc endif ifeq ($(HB_GTALLEG),yes) - HB_GT_LIBS += gtalleg + HB_GT_LIST += gtalleg endif +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) + ifeq ($(HB_GT_LIB),) HB_GT_LIB = gtstd endif -ARCH_DIR = $(HB_ARCH)/ +ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -45,4 +49,3 @@ dirbase:: clean:: -$(RD) $(ARCH_DIR) - diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf index dccb108a3b..fab71d756e 100644 --- a/harbour/config/linux/owatcom.cf +++ b/harbour/config/linux/owatcom.cf @@ -56,14 +56,9 @@ endif ifeq ($(findstring rtl,$(LIBS)),rtl) ifeq ($(HB_LIB_COMPILE),) - GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB) + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)) else - GTLIBS := $(HB_LIB_COMPILE)/$(HB_GT_LIB) - endif - ifneq ($(HB_GT_DEFAULT),) - ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) - GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT) - endif + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) endif endif diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 7eaabf07e5..b467fe3844 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -61,15 +61,9 @@ LINKLIBS += -l$(HB_GT_LIB) LINKPATHS += -L$(TOP)$(ROOT)source/rtl/gtos2/$(HB_ARCH) LINKLIBS += -lgtos2 else -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) -endif -endif +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) endif endif diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf index b4d995be2c..bb87ae3640 100644 --- a/harbour/config/os2/global.cf +++ b/harbour/config/os2/global.cf @@ -4,12 +4,15 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ gtos2 \ gtpca \ gtstd \ +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) + ifeq ($(HB_GT_LIB),) HB_GT_LIB = gtos2 endif diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf index ee3475e619..bbf430adfb 100644 --- a/harbour/config/os2/icc.cf +++ b/harbour/config/os2/icc.cf @@ -52,15 +52,11 @@ ifeq ($(HB_GT_LIB),os2pm) LINKLIBS += $(TOP)$(ROOT)contrib/hgf/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT) LINKLIBS += $(TOP)$(ROOT)source/rtl/gtos2/$(HB_ARCH)/gtos2.lib else -LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) +ifeq ($(HB_LIB_COMPILE),) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)$(LIB_EXT)) +else +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) endif -endif - endif endif endif diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf index 9c3d24d4c7..aa0018e8c2 100644 --- a/harbour/config/sunos/global.cf +++ b/harbour/config/sunos/global.cf @@ -4,33 +4,37 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ - gtcrs \ gtpca \ gtstd \ gttrm \ +ifneq ($(HB_WITHOUT_GTCRS),yes) + HB_GT_LIST += gtcrs +endif ifeq ($(HB_COMMERCE),yes) - HB_GPM_MOUSE = no + HB_GPM_MOUSE = no else ifneq ($(HB_WITHOUT_GTSLN),yes) - HB_GT_LIBS += gtsln + HB_GT_LIST += gtsln endif endif ifneq ($(HB_WITHOUT_X11),yes) -# HB_GT_LIBS += gtxvt -# HB_GT_LIBS += gtxwc +# HB_GT_LIST += gtxwc endif ifeq ($(HB_GTALLEG),yes) - HB_GT_LIBS += gtalleg + HB_GT_LIST += gtalleg endif +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) + ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd + HB_GT_LIB = gtstd endif -ARCH_DIR = $(HB_ARCH)/ +ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f RD = rm -f -r @@ -39,9 +43,9 @@ MV = mv -f MD = mkdir MDP = mkdir -p + dirbase:: @[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR) clean:: -$(RD) $(ARCH_DIR) - diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf index f7ef1d7412..405738e8b7 100644 --- a/harbour/config/w32/bcc32.cf +++ b/harbour/config/w32/bcc32.cf @@ -40,23 +40,19 @@ ifeq ($(findstring rdd,$(LIBS)),rdd) ifeq ($(HB_LIB_COMPILE),) LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)/source/rdd/$(drv)/$(HB_ARCH)/$(drv)$(LIB_EXT)) else -LINKPATHS += -L$(HB_LIB_COMPILE) LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT)) endif endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)$(LIB_EXT) +ifeq ($(HB_LIB_COMPILE),) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)$(LIB_EXT)) +else +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) endif endif -endif - # HB_SCREEN_LIB: empty, or one of ncurses, slang # HB_SCREEN_LIB=ncurses # HB_SCREEN_LIB=slang diff --git a/harbour/config/w32/gcc.cf b/harbour/config/w32/gcc.cf index 32f00a2a90..eaf294d919 100644 --- a/harbour/config/w32/gcc.cf +++ b/harbour/config/w32/gcc.cf @@ -44,16 +44,8 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) -endif -endif - +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) endif # HB_SCREEN_LIB: empty, or one of ncurses, slang diff --git a/harbour/config/w32/global.cf b/harbour/config/w32/global.cf index baa9bb13f0..2cc80ff835 100644 --- a/harbour/config/w32/global.cf +++ b/harbour/config/w32/global.cf @@ -4,18 +4,26 @@ all : first -HB_GT_LIBS=\ +HB_GT_LIST=\ gtcgi \ gtpca \ gtstd \ gtwin \ gtwvt \ gtgui \ + # gtcrs \ # gtsln \ +ifeq ($(HB_GTALLEG),yes) + HB_GT_LIST += gtalleg +endif + +# verify if GT drivers exist +HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) + ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtwin + HB_GT_LIB = gtwin endif ifeq ($(SHLVL),) # COMMAND.COM diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf index 9b1bd077f0..1c08cd4892 100644 --- a/harbour/config/w32/mingw32.cf +++ b/harbour/config/w32/mingw32.cf @@ -49,16 +49,8 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LDLIBS += -l$(HB_GT_LIB) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LDLIBS += -l$(HB_GT_DEFAULT) -endif -endif - +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LDLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) endif # HB_SCREEN_LIB: empty, or one of ncurses, slang diff --git a/harbour/config/w32/msvc.cf b/harbour/config/w32/msvc.cf index 83ace41113..a1e69736eb 100644 --- a/harbour/config/w32/msvc.cf +++ b/harbour/config/w32/msvc.cf @@ -36,16 +36,8 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += $(HB_GT_LIB)$(LIB_EXT) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += $(HB_GT_DEFAULT)$(LIB_EXT) -endif -endif - +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -LIBPATH:$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) endif LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/w32/owatcom.cf b/harbour/config/w32/owatcom.cf index e7021a6c44..396277bed5 100644 --- a/harbour/config/w32/owatcom.cf +++ b/harbour/config/w32/owatcom.cf @@ -80,18 +80,9 @@ endif ifeq ($(findstring rtl,$(LIBS)),rtl) ifeq ($(HB_LIB_COMPILE),) - GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB) + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)) else - GTLIBS := $(HB_LIB_COMPILE)/$(HB_GT_LIB) - endif - ifneq ($(HB_GT_DEFAULT),) - ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT) - else - GTLIBS += $(HB_LIB_COMPILE)/$(HB_GT_DEFAULT) - endif - endif + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) endif endif diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/w32/rsxnt.cf index ccaf7f4aed..f42a53b8c5 100644 --- a/harbour/config/w32/rsxnt.cf +++ b/harbour/config/w32/rsxnt.cf @@ -47,16 +47,8 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_LIB) - -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -LINKLIBS += -l$(HB_GT_DEFAULT) -endif -endif - +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) endif # HB_SCREEN_LIB: empty, or one of ncurses, slang diff --git a/harbour/config/w32/watcom.cf b/harbour/config/w32/watcom.cf index fea26592d6..0f2222564f 100644 --- a/harbour/config/w32/watcom.cf +++ b/harbour/config/w32/watcom.cf @@ -82,18 +82,9 @@ endif ifeq ($(findstring rtl,$(LIBS)),rtl) ifeq ($(HB_LIB_COMPILE),) - GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB) + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)) else - GTLIBS := $(HB_LIB_COMPILE)/$(HB_GT_LIB) - endif - ifneq ($(HB_GT_DEFAULT),) - ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) - ifeq ($(HB_LIB_COMPILE),) - GTLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT) - else - GTLIBS += $(HB_LIB_COMPILE)/$(HB_GT_DEFAULT) - endif - endif + GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt)) endif GTLIBS := $(subst /,\,$(GTLIBS)) endif diff --git a/harbour/config/w32/xcc.cf b/harbour/config/w32/xcc.cf index c7a801bda3..83ea7906a0 100644 --- a/harbour/config/w32/xcc.cf +++ b/harbour/config/w32/xcc.cf @@ -48,17 +48,9 @@ endif # Add the specified GT driver library ifeq ($(findstring rtl,$(LIBS)),rtl) ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH) -endif -LINKLIBS += $(HB_GT_LIB)$(LIB_EXT) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH) -endif -LINKLIBS += $(HB_GT_DEFAULT)$(LIB_EXT) -endif +LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -LIBPATH:$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)) endif +LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) endif LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib \ diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 11cf45f2fb..4446b13ac5 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -226,65 +226,6 @@ dos programas. üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ %{dname} ÉÚ ÄÅÒÅ×Á contrib. -###################################################################### -## PP -###################################################################### - -%package pp -Summary: Clipper/Harbour/xBase compatible Pre-Processor, DOT prompt and interpreter -Summary(pl): Kompatybilny z Clipper/Harbour/xBase Preprocesor i interpreter -Summary(ru): óÏ×ÍÅÓÔÉÍÙÊ Ó Clipper/Harbour/xBase ÐÒÅÐÒÏÃÅÓÓÏÒ É ÉÎÔÅÒÐÒÅÔÁÔÏÒ -License: GPL -Group: Development/Languages -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description pp -%{dname} is a Clipper compatible compiler. -This package provides %{dname} PP. It has 3 personalities which are tied -tightly together. -1. What is supposed to be 100% Clipper compatible Pre-Processor - (with some extensions). -2. DOT prompt, which suppose to allow most of Clipper syntax. -3. Finally, PP is a limited Clipper/Harbour/xBase Interpreter. Subject - to those same few limitations it can execute most of Harbour syntax. - You can write your own xBase scripts by adding to your .prg files - #!/usr/bin/pprun - -%description -l pl pp -%{dname} to kompatybilny z jêzykiem CA-Clipper kompilator. -Ten pakiet udostêpnia %{dname} PP, który daje trzy narzêdzia w jednym. -1. W 100% kompatybilny z Clipperem preprocesor (z pewnymi rozeszerzeniami) -2. ¦rodowisko DOT, w którym mo¿na u¿ywaæ wiêkszo¶ci sk³adni Clippera -3. PP to tak¿e nieco ograniczony interpreter Clippera. Z uwzglêdnieniem - wspomnianych kilku ograniczeñ potrafi on uruchomiæ wiêkszo¶æ sk³adni - Harbour. Mo¿esz napisaæ swój w³asny skrypt xBase dodaj±c do pliku .prg - #!/usr/bin/pprun - -%description -l pt_BR pp -%{dname} ‚ um compilador Clipper compativel. -Esse pacote provem o %{dname} PP. Ele tem 3 caracteristicas dependentes -uma da outra. -1. Que e supostamente ser um Pre-Processor 100% compativel com o Clipper - (com algumas extenssäes). -2. DOT prompt, que supostamente permite a maioria das syntaxes do Clipper. -3. Finalmente, PP ‚ um limitado Interpretador Clipper/Harbour/xBase . Sujeito - com algumas limita‡äes que pode executar a maioria da syntaxe do Harbour. - Voce pode escrever seus proprios scritps em .prg ao adicionar as seus arquivos - .prg #!/usr/bin/pprun - -%description -l ru pp -%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Clipper. -üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÐÒÅÐÒÏÃÅÓÓÏÒ %{dname}, ËÏÔÏÒÙÊ ÓÏÓÔÏÉÔ ÉÚ ÔÒÅÈ ÔÅÓÎÏ -Ó×ÑÚÁÎÎÙÈ ÞÁÓÔÅÊ. -1. 100%-ÓÏ×ÍÅÓÔÉÍÙÊ Ó Clipper ÐÒÅÐÒÏÃÅÓÓÏÒ (Ó ÎÅËÏÔÏÒÙÍÉ ÒÁÓÛÉÒÅÎÉÑÍÉ). -2. DOT Prompt, × ËÏÔÏÒÏÍ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÂÏÌØÛÉÎÓÔ×Ï ËÏÎÓÔÒÕËÃÉÊ Clipper. -3. ëÒÏÍÅ ÔÏÇÏ, PP - ÏÇÒÁÎÉÞÅÎÎÙÊ ÉÎÔÅÒÐÒÅÔÁÔÏÒ Clipper. úÁ ÉÓËÌÀÞÅÎÉÅÍ - ÎÅÓËÏÌØËÉÈ ÏÐÉÓÁÎÎÙÈ ÏÇÒÁÎÉÞÅÎÉÊ, ÏÎ ÍÏÖÅÔ ×ÙÐÏÌÎÑÔØ ÂÏÌØÛÉÎÓÔ×Ï - ËÏÎÓÔÒÕËÃÉÊ Harbour. íÏÖÎÏ ÓÏÚÄÁ×ÁÔØ ÓÏÂÓÔ×ÅÎÎÙÅ xBase-ÓËÒÉÐÔÙ ÐÕÔÅÍ - ÄÏÂÁ×ÌÅÎÉÑ × ÎÁÞÁÌÏ .prg-ÆÁÊÌÁ ÓÔÒÏËÉ: - #!/usr/bin/pprun - - ###################################################################### ## Preperation. ###################################################################### @@ -359,14 +300,6 @@ VERBOSE=YES DELTMP=YES EOF -# Create PP -pushd contrib/dot -$HB_BIN_INSTALL/%{hb_pref}mk pp -q0 -n -w %{?_with_pgsql:-lpq} %{?_with_gd:-lgd} -D_DEFAULT_INC_DIR=\"$_DEFAULT_INC_DIR\" -install -m755 -s pp $HB_BIN_INSTALL/pp -ln -s pp $HB_BIN_INSTALL/pprun -install -m644 rp_dot.ch $HB_INC_INSTALL/ -popd - # check if we should rebuild tools with shared libs if [ "%{!?_with_static:1}" ] then @@ -374,7 +307,7 @@ then export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} -lncurses %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11} %{?_with_pgsql4:/usr/lib/libpq.so.4} %{?_with_pgsql:-lpq} %{?_with_gd:-lgd}" export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" - for utl in hbmake hbrun hbpp hbdoc + for utl in hbmake hbrun hbdot hbpp hbdoc do pushd utils/${utl} rm -fR "./${HB_ARCHITECTURE}" @@ -550,6 +483,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/harbour-link #%{_bindir}/hbtest %{_bindir}/hbrun +%{_bindir}/hbdot %{_bindir}/hbpp %{_bindir}/hbmake %dir %{_includedir}/%{name} @@ -601,17 +535,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/*.so %{_libdir}/*.so -%files pp -%defattr(-,root,root,755) -%doc contrib/dot/pp.txt -%{_bindir}/pp -%{_bindir}/pprun - ###################################################################### ## Spec file Changelog. ###################################################################### %changelog +* Thu Aug 23 2007 Przemyslaw Czerpak ++ added hbdot +- removed PP package + * Fri Mar 23 2005 Przemyslaw Czerpak - removed bison and flex from dependences list diff --git a/harbour/make_tgz.sh b/harbour/make_tgz.sh index 82d98aa9e3..ad92c8e272 100755 --- a/harbour/make_tgz.sh +++ b/harbour/make_tgz.sh @@ -262,7 +262,7 @@ then export L_USR="-L${HB_LIB_INSTALL} -l${name} ${ADD_LIBS}" export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" - for utl in hbmake hbrun hbpp hbdoc hbtest + for utl in hbmake hbrun hbdot hbpp hbdoc hbtest do (cd "utils/${utl}" rm -fR "./${HB_ARCHITECTURE}" @@ -271,16 +271,6 @@ then done fi -# Create and install PP -(cd contrib/dot -export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\"" -$HB_BIN_INSTALL/${hb_pref}mk pp -n -w -strip pp${hb_exesuf} -$INSTALL -m755 pp${hb_exesuf} $HB_BIN_INSTALL/pp${hb_exesuf} -ln -s pp${hb_exesuf} $HB_BIN_INSTALL/pprun${hb_exesuf} -$INSTALL -m644 rp_dot.ch $HB_INC_INSTALL/ -rm -f pp${hb_exesuf}) - chmod 644 $HB_INC_INSTALL/* CURDIR=$(pwd) diff --git a/harbour/makefile.gc b/harbour/makefile.gc index d483d06cee..c182579419 100644 --- a/harbour/makefile.gc +++ b/harbour/makefile.gc @@ -170,34 +170,6 @@ HARBOURFLAGSDLL:= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL) LDFLAGS := $(L_USR) -Wl,--start-group $(STANDARD_STATIC_HBLIBS) -ifneq ($(HB_GT_DEFAULT),) -ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB)) -ifeq ($(HB_GT_DEFAULT),gtcrs) -LDFLAGS += -lncurses -else -ifeq ($(HB_GT_DEFAULT),gtsln) -LDFLAGS += -lslang -else -ifeq ($(HB_GT_DEFAULT),gtxwc) -LDFLAGS += -lX11 -L/usr/X11R6/lib -endif -endif -endif -endif -endif - -ifeq ($(HB_GT_LIB),gtcrs) -LDFLAGS += -lncurses -else -ifeq ($(HB_GT_LIB),gtsln) -LDFLAGS += -lslang -else -ifeq ($(HB_GT_LIB),gtxwc) -LDFLAGS += -lX11 -L/usr/X11R6/lib -endif -endif -endif - # HB_GPM_MOUSE: use gpm mouse driver ifeq ($(HB_GPM_MOUSE),yes) LDFLAGS += -lgpm