diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3a52407cb2..67c73a8fed 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-12 12:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/gtxwc/Makefile + * source/rtl/gtcrs/Makefile + * source/rtl/gttrm/Makefile + * source/rtl/gtsln/Makefile + * source/rtl/gtwvt/Makefile + + Indentation. + 2009-08-12 11:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/instsh.cf ! Fixed '-' prefix usage in non-*nix shells, so now make diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile index ea23b9920c..1aa53d68f4 100644 --- a/harbour/source/rtl/gtcrs/Makefile +++ b/harbour/source/rtl/gtcrs/Makefile @@ -12,53 +12,53 @@ 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 -endif -endif + 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 + endif + endif endif ifeq ($(HB_WITHOUT_GTCRS),yes) -HB_INC_CURSES := + HB_INC_CURSES := endif ifeq ($(HB_ARCHITECTURE),os2) -HB_INC_CURSES := + HB_INC_CURSES := endif HB_INC_CURSES_OK += $(foreach d, $(HB_INC_CURSES), $(if $(wildcard $(d)/curses.h),$(d),)) HB_INC_CURSES_OK := $(strip $(HB_INC_CURSES_OK)) ifeq ($(HB_INC_CURSES_OK),) -ifeq ($(HB_COMPILER),djgpp) -HB_INC_CURSES_OK += $(foreach d, $(subst ;, ,$(PATH)), $(if $(wildcard $(d)/../include/curses.h),$(d)/../include,)) -HB_INC_CURSES_OK := $(strip $(HB_INC_CURSES_OK)) -endif + ifeq ($(HB_COMPILER),djgpp) + HB_INC_CURSES_OK += $(foreach d, $(subst ;, ,$(PATH)), $(if $(wildcard $(d)/../include/curses.h),$(d)/../include,)) + HB_INC_CURSES_OK := $(strip $(HB_INC_CURSES_OK)) + endif endif ifneq ($(HB_INC_CURSES_OK),) HB_INC_GPM_OK := ifneq ($(HB_GPM_MOUSE),no) -ifneq ($(HB_COMMERCE),yes) -HB_INC_GPM := /usr/include /usr/local/include -HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) -endif + ifneq ($(HB_COMMERCE),yes) + HB_INC_GPM := /usr/include /usr/local/include + HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) + endif endif ifeq ($(HB_GT_CRS_BCEHACK),yes) - HB_USER_CFLAGS += -DHB_GT_CRS_BCEHACK + HB_USER_CFLAGS += -DHB_GT_CRS_BCEHACK endif ifneq ($(strip $(HB_INC_GPM_OK)),) - HB_USER_CFLAGS += -DHAVE_GPM_H -ifeq ($(HB_GPM_NOICE_DISABLE),yes) - HB_USER_CFLAGS += -DHB_GPM_NOICE_DISABLE -endif + HB_USER_CFLAGS += -DHAVE_GPM_H + ifeq ($(HB_GPM_NOICE_DISABLE),yes) + HB_USER_CFLAGS += -DHB_GPM_NOICE_DISABLE + endif endif ifeq ($(HB_NCURSES_194),yes) - HB_USER_CFLAGS += -DHB_NCURSES_194 + HB_USER_CFLAGS += -DHB_NCURSES_194 endif HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURSES_OK), -I$(d)) diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile index 68372ad1fe..aaff28a210 100644 --- a/harbour/source/rtl/gtsln/Makefile +++ b/harbour/source/rtl/gtsln/Makefile @@ -14,22 +14,22 @@ C_SOURCES := \ 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) -endif -endif + 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) + endif + endif endif ifeq ($(HB_WITHOUT_GTSLN),yes) -HB_INC_SLANG := + HB_INC_SLANG := endif ifeq ($(HB_COMMERCE),yes) -HB_INC_SLANG := + HB_INC_SLANG := endif HB_INC_SLANG_OK += $(foreach d, $(HB_INC_SLANG), $(if $(wildcard $(d)/slang.h),$(d),)) @@ -38,17 +38,17 @@ ifneq ($(strip $(HB_INC_SLANG_OK)),) HB_INC_GPM_OK := ifneq ($(HB_GPM_MOUSE),no) -ifneq ($(HB_COMMERCE),yes) -HB_INC_GPM := /usr/include /usr/local/include -HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) -endif + ifneq ($(HB_COMMERCE),yes) + HB_INC_GPM := /usr/include /usr/local/include + HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) + endif endif ifneq ($(strip $(HB_INC_GPM_OK)),) - HB_USER_CFLAGS += -DHAVE_GPM_H -ifeq ($(HB_GPM_NOICE_DISABLE),yes) - HB_USER_CFLAGS += -DHB_GPM_NOICE_DISABLE -endif + HB_USER_CFLAGS += -DHAVE_GPM_H + ifeq ($(HB_GPM_NOICE_DISABLE),yes) + HB_USER_CFLAGS += -DHB_GPM_NOICE_DISABLE + endif endif HB_USER_CFLAGS += $(foreach d, $(HB_INC_SLANG_OK), -I$(d)) diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile index fa57eb5427..44de6ffe7b 100644 --- a/harbour/source/rtl/gttrm/Makefile +++ b/harbour/source/rtl/gttrm/Makefile @@ -35,17 +35,17 @@ ifeq ($(HB_WITH_GTTRM),yes) HB_INC_GPM_OK := ifneq ($(HB_GPM_MOUSE),no) -ifneq ($(HB_COMMERCE),yes) -HB_INC_GPM := /usr/include /usr/local/include -HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) -endif + ifneq ($(HB_COMMERCE),yes) + HB_INC_GPM := /usr/include /usr/local/include + HB_INC_GPM_OK += $(foreach d, $(HB_INC_GPM), $(if $(wildcard $(d)/gpm.h),$(d),)) + endif endif ifneq ($(strip $(HB_INC_GPM_OK)),) - HB_USER_CFLAGS += -DHAVE_GPM_H -ifeq ($(HB_GPM_NOICE_DISABLE),yes) - HB_USER_CFLAGS += -DHB_GPM_NOICE_DISABLE -endif + HB_USER_CFLAGS += -DHAVE_GPM_H + ifeq ($(HB_GPM_NOICE_DISABLE),yes) + HB_USER_CFLAGS += -DHB_GPM_NOICE_DISABLE + endif endif include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/source/rtl/gtwvt/Makefile b/harbour/source/rtl/gtwvt/Makefile index e46e7e4a04..5251053fc7 100644 --- a/harbour/source/rtl/gtwvt/Makefile +++ b/harbour/source/rtl/gtwvt/Makefile @@ -10,10 +10,10 @@ LIBNAME := gtwvt HB_WITH_GTWVT := no ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_GTWVT := yes + HB_WITH_GTWVT := yes endif ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_GTWVT := yes + HB_WITH_GTWVT := yes endif ifeq ($(HB_WITH_GTWVT),yes) diff --git a/harbour/source/rtl/gtxwc/Makefile b/harbour/source/rtl/gtxwc/Makefile index 18b5acd4a9..5ac2e4797d 100644 --- a/harbour/source/rtl/gtxwc/Makefile +++ b/harbour/source/rtl/gtxwc/Makefile @@ -12,13 +12,13 @@ C_SOURCES := \ gtxwc.c \ ifeq ($(HB_INC_X11),) -ifeq ($(HB_XBUILD),) -HB_INC_X11 := /usr/include -endif + ifeq ($(HB_XBUILD),) + HB_INC_X11 := /usr/include + endif endif ifeq ($(HB_WITHOUT_GTXWC),yes) -HB_INC_X11 := + HB_INC_X11 := endif HB_INC_X11_OK += $(foreach d, $(HB_INC_X11), $(if $(wildcard $(d)/X11/Xlib.h),$(d),))