From dd756dc5cfe69c73c9cf87fc8635145ef984d394 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 1 Sep 2009 19:05:19 +0000 Subject: [PATCH] 2009-09-01 21:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/lib.mk * harbour/config/bin.mk * harbour/config/header.mk * harbour/config/dyn.mk * harbour/config/doc.mk * harbour/config/instsh.mk ! rewritten install rules so now they work without any problem when more then one target .mk file is included, i.e. lib.mk and header.mk * harbour/source/pp/Makefile * harbour/source/dynlib/mt/Makefile * harbour/source/dynlib/Makefile * harbour/contrib/hbmysql/Makefile * harbour/contrib/hbct/Makefile * harbour/contrib/xhb/Makefile * harbour/contrib/hbodbc/Makefile * harbour/contrib/hbtpathy/Makefile * harbour/contrib/hbsqlit3/Makefile * harbour/contrib/hbmzip/Makefile * harbour/contrib/hbblat/Makefile * harbour/contrib/hbqt/Makefile * harbour/contrib/hbxbp/Makefile * harbour/contrib/xpp/Makefile * harbour/contrib/hbnf/Makefile * harbour/contrib/hbcurl/Makefile * harbour/contrib/gtqtc/Makefile * harbour/contrib/rddsql/sddmy/Makefile * harbour/contrib/rddsql/sddpg/Makefile * harbour/contrib/rddsql/sddfb/Makefile * harbour/contrib/rddsql/sddodbc/Makefile * harbour/contrib/hbhpdf/Makefile * harbour/contrib/rddado/Makefile * harbour/contrib/gtwvg/Makefile * harbour/contrib/hbpgsql/Makefile * harbour/contrib/hbclipsm/Makefile * harbour/contrib/rddads/Makefile * harbour/contrib/hbfimage/Makefile * harbour/contrib/hbgd/Makefile * harbour/contrib/hbtip/Makefile * harbour/contrib/hbwin/Makefile * harbour/contrib/hbvpdf/Makefile * harbour/contrib/hbbtree/Makefile * harbour/contrib/hbssl/Makefile * harbour/external/libhpdf/Makefile * removed not longer necessary workaround for overwritten by different targets INSTALL_RULE Possible TODO: clean up some other rules in config .mk files to remove hacks from pp and dynlib Makefile(s). Above modifications should fully resolve the problems with repeated install actions and also build problems with some more restrictive POSIX SHELLs. --- harbour/ChangeLog | 54 +++++++++++++++++++++++++ harbour/config/bin.mk | 9 ++++- harbour/config/doc.mk | 8 +++- harbour/config/dyn.mk | 7 +++- harbour/config/header.mk | 7 +++- harbour/config/instsh.mk | 2 + harbour/config/lib.mk | 11 ++++- harbour/contrib/gtqtc/Makefile | 4 -- harbour/contrib/gtwvg/Makefile | 4 -- harbour/contrib/hbblat/Makefile | 4 -- harbour/contrib/hbbtree/Makefile | 4 -- harbour/contrib/hbclipsm/Makefile | 4 -- harbour/contrib/hbct/Makefile | 4 -- harbour/contrib/hbcurl/Makefile | 4 -- harbour/contrib/hbfimage/Makefile | 4 -- harbour/contrib/hbgd/Makefile | 4 -- harbour/contrib/hbhpdf/Makefile | 4 -- harbour/contrib/hbmysql/Makefile | 4 -- harbour/contrib/hbmzip/Makefile | 4 -- harbour/contrib/hbnf/Makefile | 4 -- harbour/contrib/hbodbc/Makefile | 4 -- harbour/contrib/hbpgsql/Makefile | 4 -- harbour/contrib/hbqt/Makefile | 4 -- harbour/contrib/hbsqlit3/Makefile | 4 -- harbour/contrib/hbssl/Makefile | 4 -- harbour/contrib/hbtip/Makefile | 4 -- harbour/contrib/hbtpathy/Makefile | 4 -- harbour/contrib/hbvpdf/Makefile | 4 -- harbour/contrib/hbwin/Makefile | 3 -- harbour/contrib/hbxbp/Makefile | 4 -- harbour/contrib/rddado/Makefile | 4 -- harbour/contrib/rddads/Makefile | 4 -- harbour/contrib/rddsql/sddfb/Makefile | 1 - harbour/contrib/rddsql/sddmy/Makefile | 8 ---- harbour/contrib/rddsql/sddodbc/Makefile | 8 ---- harbour/contrib/rddsql/sddpg/Makefile | 8 ---- harbour/contrib/xhb/Makefile | 4 -- harbour/contrib/xpp/Makefile | 4 -- harbour/external/libhpdf/Makefile | 4 -- harbour/source/dynlib/Makefile | 18 +++------ harbour/source/dynlib/mt/Makefile | 18 +++------ harbour/source/pp/Makefile | 6 --- 42 files changed, 105 insertions(+), 171 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b680ef0562..977499aa0d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,60 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-01 21:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/lib.mk + * harbour/config/bin.mk + * harbour/config/header.mk + * harbour/config/dyn.mk + * harbour/config/doc.mk + * harbour/config/instsh.mk + ! rewritten install rules so now they work without any problem when + more then one target .mk file is included, i.e. lib.mk and header.mk + + * harbour/source/pp/Makefile + * harbour/source/dynlib/mt/Makefile + * harbour/source/dynlib/Makefile + * harbour/contrib/hbmysql/Makefile + * harbour/contrib/hbct/Makefile + * harbour/contrib/xhb/Makefile + * harbour/contrib/hbodbc/Makefile + * harbour/contrib/hbtpathy/Makefile + * harbour/contrib/hbsqlit3/Makefile + * harbour/contrib/hbmzip/Makefile + * harbour/contrib/hbblat/Makefile + * harbour/contrib/hbqt/Makefile + * harbour/contrib/hbxbp/Makefile + * harbour/contrib/xpp/Makefile + * harbour/contrib/hbnf/Makefile + * harbour/contrib/hbcurl/Makefile + * harbour/contrib/gtqtc/Makefile + * harbour/contrib/rddsql/sddmy/Makefile + * harbour/contrib/rddsql/sddpg/Makefile + * harbour/contrib/rddsql/sddfb/Makefile + * harbour/contrib/rddsql/sddodbc/Makefile + * harbour/contrib/hbhpdf/Makefile + * harbour/contrib/rddado/Makefile + * harbour/contrib/gtwvg/Makefile + * harbour/contrib/hbpgsql/Makefile + * harbour/contrib/hbclipsm/Makefile + * harbour/contrib/rddads/Makefile + * harbour/contrib/hbfimage/Makefile + * harbour/contrib/hbgd/Makefile + * harbour/contrib/hbtip/Makefile + * harbour/contrib/hbwin/Makefile + * harbour/contrib/hbvpdf/Makefile + * harbour/contrib/hbbtree/Makefile + * harbour/contrib/hbssl/Makefile + * harbour/external/libhpdf/Makefile + * removed not longer necessary workaround for overwritten by different + targets INSTALL_RULE + Possible TODO: clean up some other rules in config .mk files to remove + hacks from pp and dynlib Makefile(s). + + Above modifications should fully resolve the problems with repeated + install actions and also build problems with some more restrictive + POSIX SHELLs. + 2009-09-01 16:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbcomp.h * harbour/include/hbcompdf.h diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk index 03b4e42982..f85dab8ed7 100644 --- a/harbour/config/bin.mk +++ b/harbour/config/bin.mk @@ -96,8 +96,15 @@ $(BIN_NAME) : $(ALL_OBJS) INSTALL_FILES := $(BIN_FILE) INSTALL_DIR := $(HB_BIN_INSTALL) +include $(TOP)$(ROOT)config/instsh.mk +INSTALL_RULE_BIN := $(INSTALL_RULE) -include $(TOP)$(ROOT)config/install.mk +ifneq ($(INSTALL_RULE_BIN),) + +install:: first + $(INSTALL_RULE_BIN) + +endif endif endif diff --git a/harbour/config/doc.mk b/harbour/config/doc.mk index c6f1f8394c..7b143c983f 100644 --- a/harbour/config/doc.mk +++ b/harbour/config/doc.mk @@ -15,8 +15,14 @@ install:: else INSTALL_FILES := $(DOC_FILES) INSTALL_DIR := $(HB_DOC_INSTALL)$(DOC_SUBDIR) +include $(TOP)$(ROOT)config/instsh.mk +INSTALL_RULE_DOC := $(INSTALL_RULE) +ifneq ($(INSTALL_RULE_DOC),) +install:: first + $(INSTALL_RULE_DOC) + +endif -include $(TOP)$(ROOT)config/install.mk endif endif endif diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk index b7912625d4..f8dbab761f 100644 --- a/harbour/config/dyn.mk +++ b/harbour/config/dyn.mk @@ -49,8 +49,13 @@ $(DYN_NAME) : $(ALL_OBJS) INSTALL_FILES := $(DYN_FILE) INSTALL_DIR := $(HB_DYN_INSTALL) +include $(TOP)$(ROOT)config/instsh.mk +INSTALL_RULE_DYN := $(INSTALL_RULE) +ifneq ($(INSTALL_RULE_DYN),) +install:: first + $(INSTALL_RULE_DYN) -include $(TOP)$(ROOT)config/install.mk +endif endif endif diff --git a/harbour/config/header.mk b/harbour/config/header.mk index e258629a7e..af52e786d7 100644 --- a/harbour/config/header.mk +++ b/harbour/config/header.mk @@ -15,9 +15,14 @@ install:: else INSTALL_FILES := $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS) INSTALL_DIR := $(HB_INC_INSTALL) +include $(TOP)$(ROOT)config/instsh.mk +INSTALL_RULE_HEADERS := $(INSTALL_RULE) +ifneq ($(INSTALL_RULE_HEADERS),) +install:: first + $(INSTALL_RULE_HEADERS) -include $(TOP)$(ROOT)config/install.mk endif endif endif +endif diff --git a/harbour/config/instsh.mk b/harbour/config/instsh.mk index 580d649a83..8a14a3e5bb 100644 --- a/harbour/config/instsh.mk +++ b/harbour/config/instsh.mk @@ -2,6 +2,8 @@ # $Id$ # +INSTALL_RULE := + ifneq ($(INSTALL_FILES),) # Empty install list ifeq ($(INSTALL_DIR),) # Empty install dir diff --git a/harbour/config/lib.mk b/harbour/config/lib.mk index fffb7aa257..949c7b4dfd 100644 --- a/harbour/config/lib.mk +++ b/harbour/config/lib.mk @@ -64,7 +64,16 @@ $(LIB_NAME) : $(ALL_OBJS) INSTALL_FILES := $(LIB_FILE) INSTALL_DIR := $(HB_LIB_INSTALL) -include $(TOP)$(ROOT)config/install.mk +include $(TOP)$(ROOT)config/instsh.mk +INSTALL_RULE_LIBS := $(INSTALL_RULE) + +ifneq ($(INSTALL_RULE_LIBS),) + +install:: first + $(INSTALL_RULE_LIBS) + +endif + endif endif diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile index c9620e3d4f..8a02f04ea5 100644 --- a/harbour/contrib/gtqtc/Makefile +++ b/harbour/contrib/gtqtc/Makefile @@ -59,12 +59,8 @@ ifneq ($(HB_HAS_QT),) include $(TOP)$(ROOT)contrib/hbqt/filelist.mk include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile index ab7fb349f2..16df2fa398 100644 --- a/harbour/contrib/gtwvg/Makefile +++ b/harbour/contrib/gtwvg/Makefile @@ -82,12 +82,8 @@ ifeq ($(HB_WITH_GTWVG),yes) HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/hbblat/Makefile b/harbour/contrib/hbblat/Makefile index ba143b7f2a..b484e4263e 100644 --- a/harbour/contrib/hbblat/Makefile +++ b/harbour/contrib/hbblat/Makefile @@ -20,12 +20,8 @@ PRG_HEADERS := \ hbblat.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk -install:: - $(INSTALL_RULE_HEADERS) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/hbbtree/Makefile b/harbour/contrib/hbbtree/Makefile index cb6913ffef..45a552c93a 100644 --- a/harbour/contrib/hbbtree/Makefile +++ b/harbour/contrib/hbbtree/Makefile @@ -19,8 +19,4 @@ PRG_HEADERS := \ LIBNAME := hbbtree include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbclipsm/Makefile b/harbour/contrib/hbclipsm/Makefile index b257dd8ec3..812387e597 100644 --- a/harbour/contrib/hbclipsm/Makefile +++ b/harbour/contrib/hbclipsm/Makefile @@ -23,8 +23,4 @@ PRG_HEADERS := \ LIBNAME := hbclipsm include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbct/Makefile b/harbour/contrib/hbct/Makefile index 84f83eb5b4..6089e1da93 100644 --- a/harbour/contrib/hbct/Makefile +++ b/harbour/contrib/hbct/Makefile @@ -120,8 +120,4 @@ PRG_HEADERS := \ ctvideo.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile index 6c33a89153..5a50340bd6 100644 --- a/harbour/contrib/hbcurl/Makefile +++ b/harbour/contrib/hbcurl/Makefile @@ -28,12 +28,8 @@ ifneq ($(HB_HAS_CURL),) HB_CFLAGS += $(foreach d,$(HB_HAS_CURL),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - ifneq ($(filter $(HB_PLATFORM),win wce),) DIRS += hbcurls include $(TOP)$(ROOT)config/dir.mk diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index 787c565309..feca0b7bed 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -31,12 +31,8 @@ ifneq ($(HB_HAS_FREEIMAGE),) HB_CFLAGS += $(foreach d,$(HB_HAS_FREEIMAGE),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk -install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile index 04fa5f2933..43b1a1f256 100644 --- a/harbour/contrib/hbgd/Makefile +++ b/harbour/contrib/hbgd/Makefile @@ -42,12 +42,8 @@ ifneq ($(HB_HAS_GD),) HB_CFLAGS += $(foreach d,$(HB_HAS_GD),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index fb8e0adf36..50f6428a78 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -31,12 +31,8 @@ ifneq ($(HB_HAS_LIBHARU),) HB_CFLAGS += $(foreach d,$(HB_HAS_LIBHARU),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index ea131516db..aa5b29a9e7 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -33,12 +33,8 @@ ifneq ($(HB_HAS_MYSQL),) HB_CFLAGS += $(foreach d,$(HB_HAS_MYSQL),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbmzip/Makefile b/harbour/contrib/hbmzip/Makefile index 9aff903f44..9a360ef6aa 100644 --- a/harbour/contrib/hbmzip/Makefile +++ b/harbour/contrib/hbmzip/Makefile @@ -16,8 +16,4 @@ PRG_HEADERS := \ hbmzip.ch include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbnf/Makefile b/harbour/contrib/hbnf/Makefile index 736103f3cc..ae4fd5ac67 100644 --- a/harbour/contrib/hbnf/Makefile +++ b/harbour/contrib/hbnf/Makefile @@ -153,8 +153,4 @@ PRG_HEADERS := \ ftmenuto.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile index d01950b748..7a497f7d7e 100644 --- a/harbour/contrib/hbodbc/Makefile +++ b/harbour/contrib/hbodbc/Makefile @@ -37,12 +37,8 @@ ifneq ($(HB_HAS_ODBC),) HB_CFLAGS += $(foreach d,$(HB_HAS_ODBC),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index 1160f4a838..9c37f2d434 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -33,12 +33,8 @@ ifneq ($(HB_HAS_PGSQL),) HB_CFLAGS += $(foreach d,$(HB_HAS_PGSQL),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile index 55b916d6fc..67ff2f4f61 100644 --- a/harbour/contrib/hbqt/Makefile +++ b/harbour/contrib/hbqt/Makefile @@ -55,12 +55,8 @@ ifneq ($(HB_HAS_QT),) include $(TOP)$(ROOT)contrib/hbqt/filelist.mk include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index b7b54430ac..9aca32821d 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -31,12 +31,8 @@ ifneq ($(HB_HAS_SQLITE3),) HB_CFLAGS += $(foreach d,$(HB_HAS_SQLITE3),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile index 77ff35337f..f2ec11b3ef 100644 --- a/harbour/contrib/hbssl/Makefile +++ b/harbour/contrib/hbssl/Makefile @@ -39,12 +39,8 @@ ifneq ($(HB_HAS_OPENSSL),) endif include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - ifneq ($(filter $(HB_PLATFORM),win wce),) DIRS += hbssls include $(TOP)$(ROOT)config/dir.mk diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile index 58e3c97d86..bcb1114bbd 100644 --- a/harbour/contrib/hbtip/Makefile +++ b/harbour/contrib/hbtip/Makefile @@ -38,7 +38,6 @@ PRG_HEADERS := \ ifneq ($(HB_PLATFORM),dos) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk ifneq ($(HB_HAS_OPENSSL),) @@ -46,9 +45,6 @@ ifneq ($(HB_PLATFORM),dos) include $(TOP)$(ROOT)config/dir.mk endif - install:: - $(INSTALL_RULE_HEADERS) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index 55e1af6400..44ae07ed60 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -22,8 +22,4 @@ PRG_HEADERS := \ telepath.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbvpdf/Makefile b/harbour/contrib/hbvpdf/Makefile index 0c5190f81f..9a305a52e3 100644 --- a/harbour/contrib/hbvpdf/Makefile +++ b/harbour/contrib/hbvpdf/Makefile @@ -15,8 +15,4 @@ PRG_HEADERS := \ hbvpdf.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile index fcd939750e..63fcf356d6 100644 --- a/harbour/contrib/hbwin/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -49,11 +49,8 @@ PRG_HEADERS := \ ifneq ($(filter $(HB_PLATFORM),win wce),) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile index 34f4fca7c5..f40abed94c 100644 --- a/harbour/contrib/hbxbp/Makefile +++ b/harbour/contrib/hbxbp/Makefile @@ -57,12 +57,8 @@ ifeq ($(filter $(HB_PLATFORM),dos os2),) HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile index d0db7a0c2d..b7da6758e8 100644 --- a/harbour/contrib/rddado/Makefile +++ b/harbour/contrib/rddado/Makefile @@ -17,12 +17,8 @@ PRG_HEADERS := \ adordd.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk -install:: - $(INSTALL_RULE_HEADERS) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile index 2c620ed55a..42ce4cb18c 100644 --- a/harbour/contrib/rddads/Makefile +++ b/harbour/contrib/rddads/Makefile @@ -32,12 +32,8 @@ ifneq ($(HB_HAS_ADS),) HB_CFLAGS += $(foreach d,$(HB_HAS_ADS),-I$(d)) include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/rddsql/sddfb/Makefile index 97c36ccc9e..ea4daea9bb 100644 --- a/harbour/contrib/rddsql/sddfb/Makefile +++ b/harbour/contrib/rddsql/sddfb/Makefile @@ -22,7 +22,6 @@ include $(TOP)$(ROOT)config/detfun.mk ifneq ($(HB_HAS_FIREBIRD),) HB_CFLAGS += $(foreach d,$(HB_HAS_FIREBIRD),-I$(d)) - include $(TOP)$(ROOT)config/lib.mk else HB_SKIP_REASON := $(_DET_RES_TEXT) diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/rddsql/sddmy/Makefile index a92e31f218..a6efa4237d 100644 --- a/harbour/contrib/rddsql/sddmy/Makefile +++ b/harbour/contrib/rddsql/sddmy/Makefile @@ -21,16 +21,8 @@ _DET_INC_HEAD := /mysql.h include $(TOP)$(ROOT)config/detfun.mk ifneq ($(HB_HAS_MYSQL),) - HB_CFLAGS += $(foreach d,$(HB_HAS_MYSQL),-I$(d)) - - include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile index 208ec0a224..d4d335a1b4 100644 --- a/harbour/contrib/rddsql/sddodbc/Makefile +++ b/harbour/contrib/rddsql/sddodbc/Makefile @@ -25,16 +25,8 @@ _DET_INC_HEAD := /sql.h include $(TOP)$(ROOT)config/detfun.mk ifneq ($(HB_HAS_ODBC),) - HB_CFLAGS += $(foreach d,$(HB_HAS_ODBC),-I$(d)) - - include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/rddsql/sddpg/Makefile index 49b7953dcc..1647ad0e5e 100644 --- a/harbour/contrib/rddsql/sddpg/Makefile +++ b/harbour/contrib/rddsql/sddpg/Makefile @@ -22,16 +22,8 @@ _DET_INC_HEAD := /libpq-fe.h include $(TOP)$(ROOT)config/detfun.mk ifneq ($(HB_HAS_PGSQL),) - HB_CFLAGS += $(foreach d,$(HB_HAS_PGSQL),-I$(d)) - - include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile index 2a25250b48..c7acbd179a 100644 --- a/harbour/contrib/xhb/Makefile +++ b/harbour/contrib/xhb/Makefile @@ -82,8 +82,4 @@ PRG_HEADERS := \ xhb.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/contrib/xpp/Makefile b/harbour/contrib/xpp/Makefile index 1fd2cdb503..959e97d0b9 100644 --- a/harbour/contrib/xpp/Makefile +++ b/harbour/contrib/xpp/Makefile @@ -35,8 +35,4 @@ PRG_HEADERS := \ xpp.ch \ include $(TOP)$(ROOT)config/header.mk -INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - -install:: - $(INSTALL_RULE_HEADERS) diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index c7c640e7fa..20f7c9c488 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -110,12 +110,8 @@ ifneq ($(HB_INC_LIBHARU),no) endif include $(TOP)$(ROOT)config/header.mk - INSTALL_RULE_HEADERS := $(INSTALL_RULE) include $(TOP)$(ROOT)config/lib.mk - install:: - $(INSTALL_RULE_HEADERS) - else HB_SKIP_REASON := $(_DET_RES_TEXT) include $(TOP)$(ROOT)config/none.mk diff --git a/harbour/source/dynlib/Makefile b/harbour/source/dynlib/Makefile index d15988a81b..25e44122e4 100644 --- a/harbour/source/dynlib/Makefile +++ b/harbour/source/dynlib/Makefile @@ -16,20 +16,14 @@ ifneq ($(DYNDIRLIST_BASE),) include $(TOP)$(ROOT)config/dyn.mk include $(TOP)$(ROOT)config/dir.mk - ifneq ($(INSTALL_RULE),) - - INSTALL_RULE_DYN := $(INSTALL_RULE) - + ifneq ($(INSTALL_RULE_DYN),) ifneq ($(HB_LIB_INSTALL),) - INSTALL_FILES := $(IMP_FILE) - INSTALL_DIR := $(HB_LIB_INSTALL) - HB_INSTALL_DEF := yes - include $(TOP)$(ROOT)config/install.mk + ifneq ($(IMP_FILE),) + INSTALL_FILES := $(IMP_FILE) + INSTALL_DIR := $(HB_LIB_INSTALL) + include $(TOP)$(ROOT)config/install.mk + endif endif - -install:: - $(INSTALL_RULE_DYN) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/source/dynlib/mt/Makefile b/harbour/source/dynlib/mt/Makefile index cec4e37da4..725c761933 100644 --- a/harbour/source/dynlib/mt/Makefile +++ b/harbour/source/dynlib/mt/Makefile @@ -13,20 +13,14 @@ ifneq ($(DYNDIRLIST_BASE),) include $(TOP)$(ROOT)config/dyn.mk - ifneq ($(INSTALL_RULE),) - - INSTALL_RULE_DYN := $(INSTALL_RULE) - + ifneq ($(INSTALL_RULE_DYN),) ifneq ($(HB_LIB_INSTALL),) - INSTALL_FILES := $(IMP_FILE) - INSTALL_DIR := $(HB_LIB_INSTALL) - HB_INSTALL_DEF := yes - include $(TOP)$(ROOT)config/install.mk + ifneq ($(IMP_FILE),) + INSTALL_FILES := $(IMP_FILE) + INSTALL_DIR := $(HB_LIB_INSTALL) + include $(TOP)$(ROOT)config/install.mk + endif endif - -install:: - $(INSTALL_RULE_DYN) - else include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile index 3945dc7b0c..60982c7809 100644 --- a/harbour/source/pp/Makefile +++ b/harbour/source/pp/Makefile @@ -22,8 +22,6 @@ include $(TOP)$(ROOT)config/lib.mk ifneq ($(HB_PLATFORM),) ifneq ($(HB_COMPILER),) -INSTALL_RULE_LIB := $(INSTALL_RULE) - HB_VERHEADER := $(TOP)$(ROOT)include/hbverbld.h BIN_FILE := $(BIN_DIR)/hbpp$(BIN_EXT) @@ -38,14 +36,10 @@ ifneq ($(HB_HOST_BUILD),lib) ifneq ($(HB_BIN_INSTALL),) INSTALL_FILES := $(BIN_DIR)/hbpp$(BIN_EXT) INSTALL_DIR := $(HB_BIN_INSTALL) - HB_INSTALL_DEF := yes include $(TOP)$(ROOT)config/install.mk endif endif -install:: - $(INSTALL_RULE_LIB) - clean:: $(if $(wildcard $(HB_VERHEADER)), -@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER)),)