diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fd8c9c66ff..5009a36041 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,65 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-30 10:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/gtwvg/Makefile + * contrib/hbapollo/Makefile + * contrib/hbbtree/Makefile + * contrib/hbclipsm/Makefile + * contrib/hbct/Makefile + * contrib/hbfbird/Makefile + * contrib/hbfimage/Makefile + * contrib/hbgd/Makefile + * contrib/hbhpdf/Makefile + * contrib/hbmisc/Makefile + * contrib/hbmsql/Makefile + * contrib/hbmysql/Makefile + * contrib/hbmzip/Makefile + * contrib/hbnf/Makefile + * contrib/hbodbc/Makefile + * contrib/hbpgsql/Makefile + * contrib/hbsqlit2/Makefile + * contrib/hbsqlit3/Makefile + * contrib/hbtip/Makefile + * contrib/hbtpathy/Makefile + * contrib/hbvpdf/Makefile + * contrib/hbw32/Makefile + * contrib/hbw32ddr/Makefile + * contrib/hbwhat32/Makefile + * contrib/rddado/Makefile + * contrib/rddads/Makefile + ! CFLAGS -> C_USR + * var = var + x -> var += x + ! Added header install rules for all places where such + headers are defined. I wonder why isn't this the default + in our GNU-make system. + * few other minor cleanups. + + * contrib/rddads/Makefile + * Experimenting with HB_INC_ADS implementation in GNU-make system. + HB_INC_ADS can now used to enable to rddads builds. + In GNU-make HB_INC_ADS can contain a list of possible places + where headers may be found. GNU-make will validate these and + if the headers were found in any of these places, rddads will + be built. For Linux there are some default dirs which will + always be checked. + 'HB_WITHOUT_ADS' and 'ACE_DIRS' is not longer used. + ; Please test. If this works out okay, we can use this method + for the rest of 3rd party dependent contribs. + + * contrib/rddads/Makefile + % Don't define WIN32 in GNU-makefiles for w32. + + * contrib/hbmisc/Makefile + ! Don't include non-existing 'test' dir in make. + + * contrib/gtwvg/Makefile + * contrib/gtwvg/common.mak + ! Not installing private .h file to common include dir. + + * contrib/hbw32ddr/w32_ddrw.cpp + ! Fixed one GCC warning. (Some remain) + 2008-06-28 11:37 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/gtwvg/gtwvg.c * contrib/gtwvg/gtwvg.h diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index b2222ad542..5b3eba85a0 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -11,9 +11,6 @@ C_SOURCES=\ wvgcore.c \ wvgutils.c \ -C_HEADERS=\ - gtwvg.h \ - PRG_SOURCES=\ wvgclass.prg \ wvgpaint.prg \ @@ -24,6 +21,11 @@ PRG_HEADERS=\ LIBNAME=gtwvg +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif diff --git a/harbour/contrib/gtwvg/common.mak b/harbour/contrib/gtwvg/common.mak index 9fd950603c..a6f4f303fe 100644 --- a/harbour/contrib/gtwvg/common.mak +++ b/harbour/contrib/gtwvg/common.mak @@ -6,9 +6,6 @@ LIBNAME = $(LIBPREF)gtwvg LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT) -C_HEADERS=\ - gtwvg.h \ - PRG_HEADERS=\ hbgtwvg.ch \ wvtwin.ch \ diff --git a/harbour/contrib/hbapollo/Makefile b/harbour/contrib/hbapollo/Makefile index 1cb3b5855c..221f89cf1d 100644 --- a/harbour/contrib/hbapollo/Makefile +++ b/harbour/contrib/hbapollo/Makefile @@ -17,6 +17,11 @@ PRG_HEADERS=\ LIBNAME=hbapollo +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif diff --git a/harbour/contrib/hbbtree/Makefile b/harbour/contrib/hbbtree/Makefile index ca1d525b58..d884df4c31 100644 --- a/harbour/contrib/hbbtree/Makefile +++ b/harbour/contrib/hbbtree/Makefile @@ -18,4 +18,9 @@ PRG_HEADERS=\ LIBNAME=hbbtree +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbclipsm/Makefile b/harbour/contrib/hbclipsm/Makefile index eed1606d3a..f98e444ae0 100644 --- a/harbour/contrib/hbclipsm/Makefile +++ b/harbour/contrib/hbclipsm/Makefile @@ -21,4 +21,9 @@ PRG_HEADERS=\ LIBNAME=hbclipsm +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbct/Makefile b/harbour/contrib/hbct/Makefile index d92cbab35d..c5572111e2 100644 --- a/harbour/contrib/hbct/Makefile +++ b/harbour/contrib/hbct/Makefile @@ -110,4 +110,9 @@ PRG_HEADERS=\ LIBNAME=hbct +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile index e02727374c..aa6ce78092 100644 --- a/harbour/contrib/hbfbird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -4,7 +4,7 @@ ROOT = ../../ -CFLAGS += -I/opt/firebird/include +C_USR += -I/opt/firebird/include C_SOURCES=\ firebird.c \ diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index 5de61606a7..38e62abef9 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -15,4 +15,9 @@ PRG_HEADERS=\ LIBNAME=hbfimage +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index 4bec677917..cc177ae47d 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -20,11 +20,7 @@ PRG_SOURCES=\ LIBNAME=hbgd -ifeq ($(HB_COMPILER),mingw32) - CFLAGS := $(CFLAGS) -I/usr/include -else - CFLAGS := $(CFLAGS) -I/usr/include -endif +C_USR += -I/usr/include include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) @@ -32,4 +28,3 @@ include $(TOP)$(ROOT)config/lib.cf install:: $(INSTALL_RULE_HEADERS) - diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index b64e1dc426..45a0f3035a 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -14,7 +14,7 @@ PRG_SOURCES=\ LIBNAME=hbhpdf -CFLAGS := $(CFLAGS) -I/usr/include +C_USR += -I/usr/include include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) diff --git a/harbour/contrib/hbmisc/Makefile b/harbour/contrib/hbmisc/Makefile index cbedb356be..995d77010e 100644 --- a/harbour/contrib/hbmisc/Makefile +++ b/harbour/contrib/hbmisc/Makefile @@ -21,7 +21,4 @@ PRG_SOURCES=\ LIBNAME=hbmisc -DIRS=test - include $(TOP)$(ROOT)config/lib.cf -#include $(TOP)$(ROOT)config/dir.cf diff --git a/harbour/contrib/hbmsql/Makefile b/harbour/contrib/hbmsql/Makefile index 62a2a9b572..dec39fdb27 100644 --- a/harbour/contrib/hbmsql/Makefile +++ b/harbour/contrib/hbmsql/Makefile @@ -15,4 +15,9 @@ PRG_HEADERS=\ LIBNAME=hbmsql +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index 66e9352aac..af2f4d3666 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -16,8 +16,13 @@ PRG_HEADERS=\ LIBNAME=hbmysql -include $(TOP)$(ROOT)config/lib.cf - # a workaround of a problem with different include directories # for mysql header files between different unix distributions -CFLAGS := -I/usr/include/mysql -DBIG_JOINS=1 +C_USR += -I/usr/include/mysql -DBIG_JOINS=1 + +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) +include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbmzip/Makefile b/harbour/contrib/hbmzip/Makefile index 260f6e4f32..5525da4754 100644 --- a/harbour/contrib/hbmzip/Makefile +++ b/harbour/contrib/hbmzip/Makefile @@ -15,4 +15,9 @@ PRG_HEADERS=\ LIBNAME=hbmzip +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbnf/Makefile b/harbour/contrib/hbnf/Makefile index 534c8a4990..eafd3705bb 100644 --- a/harbour/contrib/hbnf/Makefile +++ b/harbour/contrib/hbnf/Makefile @@ -152,4 +152,9 @@ PRG_HEADERS=\ LIBNAME=hbnf +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index f0d0e3abb0..c7aa03e2e4 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -19,7 +19,12 @@ PRG_HEADERS=\ LIBNAME=hbodbc +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif endif diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index 95cf3f4950..d48b4497e6 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -16,8 +16,13 @@ PRG_HEADERS=\ LIBNAME=hbpgsql -include $(TOP)$(ROOT)config/lib.cf - PG_DIRS = /usr/local/pgsql/include /usr/local/pgsql/include/libpq \ /usr/include/pgsql /usr/include/postgresql /postgres/include -CFLAGS += $(foreach d, $(PG_DIRS), $(if $(wildcard $(d)/libpq-fe.h),-I$(d),)) +C_USR += $(foreach d, $(PG_DIRS), $(if $(wildcard $(d)/libpq-fe.h),-I$(d),)) + +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) +include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbsqlit2/Makefile b/harbour/contrib/hbsqlit2/Makefile index c787e8b320..ed7bba5e52 100644 --- a/harbour/contrib/hbsqlit2/Makefile +++ b/harbour/contrib/hbsqlit2/Makefile @@ -43,4 +43,9 @@ PRG_HEADERS=\ LIBNAME=hbsqlit2 +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index 1639db16a4..79b2f06f54 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -12,4 +12,9 @@ PRG_HEADERS=\ LIBNAME=hbsqlit3 +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile index 21c09236c9..834cc1b304 100644 --- a/harbour/contrib/hbtip/Makefile +++ b/harbour/contrib/hbtip/Makefile @@ -35,6 +35,11 @@ PRG_HEADERS= \ LIBNAME=hbtip +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index 0694bcfdf0..4f56c725db 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -33,6 +33,11 @@ PRG_HEADERS=\ LIBNAME=hbtpathy +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif diff --git a/harbour/contrib/hbvpdf/Makefile b/harbour/contrib/hbvpdf/Makefile index 7d85c4bdcf..c0eb072af1 100644 --- a/harbour/contrib/hbvpdf/Makefile +++ b/harbour/contrib/hbvpdf/Makefile @@ -14,4 +14,9 @@ PRG_HEADERS=\ LIBNAME=hbvpdf +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf + +install:: + $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbw32/Makefile b/harbour/contrib/hbw32/Makefile index d59fa42a12..0341556a12 100644 --- a/harbour/contrib/hbw32/Makefile +++ b/harbour/contrib/hbw32/Makefile @@ -24,7 +24,12 @@ PRG_HEADERS = \ LIBNAME=hbw32 +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif endif diff --git a/harbour/contrib/hbw32ddr/Makefile b/harbour/contrib/hbw32ddr/Makefile index 90ef254627..00dd1d6203 100644 --- a/harbour/contrib/hbw32ddr/Makefile +++ b/harbour/contrib/hbw32ddr/Makefile @@ -18,6 +18,6 @@ LIBNAME=hbw32ddr include $(TOP)$(ROOT)config/lib.cf -CFLAGS := $(CFLAGS) -I. +C_USR += -I. endif diff --git a/harbour/contrib/hbw32ddr/w32_ddrw.cpp b/harbour/contrib/hbw32ddr/w32_ddrw.cpp index 41f8eedddc..ed3d8a9d62 100644 --- a/harbour/contrib/hbw32ddr/w32_ddrw.cpp +++ b/harbour/contrib/hbw32ddr/w32_ddrw.cpp @@ -763,7 +763,7 @@ HB_FUNC( DD_MSGBOX ) else m2 = deftitle; - MessageBox( hb_dd_g_DDHwnd, m1, m2, NULL); + MessageBox( hb_dd_g_DDHwnd, m1, m2, 0 ); } //------------------------------------------------------------------// diff --git a/harbour/contrib/hbwhat32/Makefile b/harbour/contrib/hbwhat32/Makefile index 2ff5d2befe..0588c89918 100644 --- a/harbour/contrib/hbwhat32/Makefile +++ b/harbour/contrib/hbwhat32/Makefile @@ -85,8 +85,13 @@ LIBNAME=hbwhat32 # This lib needs xhb headers to compile, and this is # the hack to help Harbour find them. -PRG_USR := $(PRG_USR) -I../../../xhb +PRG_USR += -I../../../xhb +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile index 8c9efcc589..46258edd57 100644 --- a/harbour/contrib/rddado/Makefile +++ b/harbour/contrib/rddado/Makefile @@ -15,6 +15,11 @@ PRG_HEADERS=\ LIBNAME=rddado +include $(TOP)$(ROOT)config/header.cf +INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf +install:: + $(INSTALL_RULE_HEADERS) + endif diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile index 7abc63f0cd..94003f35b6 100644 --- a/harbour/contrib/rddads/Makefile +++ b/harbour/contrib/rddads/Makefile @@ -2,7 +2,15 @@ # $Id$ # -ifneq ($(HB_WITHOUT_ADS),yes) +ifeq ($(HB_ARCHITECTURE),linux) +HB_INC_ADS = /usr/local/ads/acesdk $(HOME)/ads/acesdk +endif + +HB_INC_ADS_OK += $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),)) + +ifneq ($(HB_INC_ADS_OK),) + +C_USR += $(foreach d, $(HB_INC_ADS_OK), -I$(d)) ROOT = ../../ @@ -16,15 +24,6 @@ PRG_HEADERS=\ LIBNAME=rddads -ifeq ($(HB_ARCHITECTURE),w32) - C_USR += -DWIN32 -endif - -ifeq ($(ACE_DIRS),) -export ACE_DIRS = /usr/local $(HOME) -C_USR += $(foreach d, $(ACE_DIRS), $(if $(wildcard $(d)/ads/acesdk/ace.h),-I$(d)/ads/acesdk,)) -endif - include $(TOP)$(ROOT)config/header.cf INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.cf