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

2009-08-26 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/rtl/gtxwc/Makefile
  * source/rtl/gtcrs/Makefile
  * source/rtl/gtsln/Makefile
    + Changed to use HB_HAS_* values instead of doing autodetection
      locally.

  * source/rtl/gttrm/Makefile
    + Indenting.

  * config/global.mk
    + Added HB_LDFLAGS variable. Not yet used.
This commit is contained in:
Viktor Szakats
2009-08-26 16:55:12 +00:00
parent 5495d2978a
commit f61ee664b2
6 changed files with 55 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -17,6 +17,19 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-26 18:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/gtxwc/Makefile
* source/rtl/gtcrs/Makefile
* source/rtl/gtsln/Makefile
+ Changed to use HB_HAS_* values instead of doing autodetection
locally.
* source/rtl/gttrm/Makefile
+ Indenting.
* config/global.mk
+ Added HB_LDFLAGS variable. Not yet used.
2009-08-26 18:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/gtcrs/Makefile
* source/rtl/gttrm/Makefile
@@ -80,7 +93,7 @@
tuned after testing.
; TODO: Remove reliance on legacy settings in our own codebase.
; TODO: Start using HB_HAS_* values for dynamic lib syslib list assembly
and in GT Makefiles.
and in GT Makefiles. [DONE]
* contrib/hbtip/hbtipssl/Makefile
* contrib/hbtip/Makefile

1
harbour/config/global.mk
View File

@@ -987,6 +987,7 @@ endif
# Notice that even single lib/bin builds will currently
# result in recursive runs, see rule 'descend'. [vszakats]
HB_CFLAGS :=
HB_LDFLAGS :=
HB_PRGFLAGS :=
HB_CROSS_BUILD :=

56
harbour/source/rtl/gtcrs/Makefile
View File

@@ -11,50 +11,24 @@ LIBNAME := gtcrs
C_SOURCES := \
gtcrs.c \
ifeq ($(HB_INC_CURSES),)
ifeq ($(HB_XBUILD),)
ifeq ($(HB_NCURSES_194),yes)
HB_INC_CURSES := /usr/include/ncur194
else
HB_INC_CURSES := /usr/include /usr/local/include /sw/include /opt/local/include
ifneq ($(HB_HAS_CURSES),)
HB_CFLAGS += $(foreach d,$(HB_HAS_CURSES),-I$(d))
ifeq ($(HB_GT_CRS_BCEHACK),yes)
HB_CFLAGS += -DHB_GT_CRS_BCEHACK
endif
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
endif
endif
endif
ifeq ($(HB_WITHOUT_GTCRS),yes)
HB_INC_CURSES :=
endif
ifeq ($(HB_PLATFORM),os2)
HB_INC_CURSES :=
endif
HB_INC_CURSES_OK := $(strip $(foreach d, $(HB_INC_CURSES), $(if $(wildcard $(d)/curses.h),$(d),)))
ifeq ($(HB_INC_CURSES_OK),)
ifeq ($(HB_COMPILER),djgpp)
HB_INC_CURSES_OK := $(strip $(foreach d, $(subst ;, ,$(PATH)), $(if $(wildcard $(d)/../include/curses.h),$(d)/../include,)))
ifeq ($(HB_NCURSES_194),yes)
HB_CFLAGS += -DHB_NCURSES_194
endif
endif
ifneq ($(HB_INC_CURSES_OK),)
ifeq ($(HB_GT_CRS_BCEHACK),yes)
HB_CFLAGS += -DHB_GT_CRS_BCEHACK
endif
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
endif
endif
ifeq ($(HB_NCURSES_194),yes)
HB_CFLAGS += -DHB_NCURSES_194
endif
HB_CFLAGS += $(foreach d,$(HB_INC_CURSES_OK),-I$(d))
include $(TOP)$(ROOT)config/lib.mk
include $(TOP)$(ROOT)config/lib.mk
else
include $(TOP)$(ROOT)config/none.mk
include $(TOP)$(ROOT)config/none.mk
endif

46
harbour/source/rtl/gtsln/Makefile
View File

@@ -13,40 +13,22 @@ C_SOURCES := \
kbsln.c \
mousesln.c \
ifeq ($(HB_INC_SLANG),)
ifeq ($(HB_XBUILD),)
ifeq ($(HB_LOCAL_SLN),yes)
HB_INC_SLANG := /usr/local/include /usr/local/include/slang
LDFLAGS := -L/usr/local/lib $(LDFLAGS)
else
HB_INC_SLANG := /usr/include /usr/include/slang /usr/local/include /usr/local/include/slang /sw/include /sw/include/slang /opt/local/include /opt/local/include/slang
LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(LDFLAGS)
# TODO: Add these to lib path list
# LDFLAGS := -L/usr/local/lib $(LDFLAGS)
# LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(LDFLAGS)
ifneq ($(HB_HAS_CURSES),)
HB_CFLAGS += $(foreach d,$(HB_HAS_CURSES),-I$(d))
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
endif
endif
endif
ifeq ($(HB_WITHOUT_GTSLN),yes)
HB_INC_SLANG :=
endif
ifeq ($(HB_COMMERCE),yes)
HB_INC_SLANG :=
endif
HB_INC_SLANG_OK := $(foreach d, $(HB_INC_SLANG), $(if $(wildcard $(d)/slang.h),$(d),))
ifneq ($(strip $(HB_INC_SLANG_OK)),)
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
endif
endif
HB_CFLAGS += $(foreach d,$(HB_INC_SLANG_OK),-I$(d))
include $(TOP)$(ROOT)config/lib.mk
include $(TOP)$(ROOT)config/lib.mk
else
include $(TOP)$(ROOT)config/none.mk
include $(TOP)$(ROOT)config/none.mk
endif

15
harbour/source/rtl/gttrm/Makefile
View File

@@ -33,15 +33,14 @@ endif
ifeq ($(HB_WITH_GTTRM),yes)
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
ifeq ($(HB_GPM_NOICE_DISABLE),yes)
HB_CFLAGS += -DHB_GPM_NOICE_DISABLE
endif
endif
endif
include $(TOP)$(ROOT)config/lib.mk
include $(TOP)$(ROOT)config/lib.mk
else
include $(TOP)$(ROOT)config/none.mk
include $(TOP)$(ROOT)config/none.mk
endif

21
harbour/source/rtl/gtxwc/Makefile
View File

@@ -11,24 +11,11 @@ LIBNAME := gtxwc
C_SOURCES := \
gtxwc.c \
ifeq ($(HB_INC_X11),)
ifeq ($(HB_XBUILD),)
HB_INC_X11 := /usr/include
endif
endif
ifneq ($(HB_HAS_X11),)
ifeq ($(HB_WITHOUT_GTXWC),yes)
HB_INC_X11 :=
endif
HB_INC_X11_OK := $(foreach d, $(HB_INC_X11), $(if $(wildcard $(d)/X11/Xlib.h),$(d),))
ifneq ($(strip $(HB_INC_X11_OK)),)
HB_CFLAGS += $(foreach d,$(HB_INC_X11_OK),-I$(d))
include $(TOP)$(ROOT)config/lib.mk
HB_CFLAGS += $(foreach d,$(HB_HAS_X11),-I$(d))
include $(TOP)$(ROOT)config/lib.mk
else
include $(TOP)$(ROOT)config/none.mk
include $(TOP)$(ROOT)config/none.mk
endif