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

2009-09-01 21:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* 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.
This commit is contained in:
Przemyslaw Czerpak
2009-09-01 19:05:19 +00:00
parent e9f9cbf958
commit dd756dc5cf
42 changed files with 105 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
harbour/ChangeLog
View File

@@ -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

9
harbour/config/bin.mk
View File

@@ -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

8
harbour/config/doc.mk
View File

@@ -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

7
harbour/config/dyn.mk
View File

@@ -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

7
harbour/config/header.mk
View File

@@ -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

2
harbour/config/instsh.mk
View File

@@ -2,6 +2,8 @@
# $Id$
#
INSTALL_RULE :=
ifneq ($(INSTALL_FILES),) # Empty install list
ifeq ($(INSTALL_DIR),) # Empty install dir

11
harbour/config/lib.mk
View File

@@ -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

4
harbour/contrib/gtqtc/Makefile
View File

@@ -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

4
harbour/contrib/gtwvg/Makefile
View File

@@ -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

4
harbour/contrib/hbblat/Makefile
View File

@@ -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

4
harbour/contrib/hbbtree/Makefile
View File

@@ -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)

4
harbour/contrib/hbclipsm/Makefile
View File

@@ -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)

4
harbour/contrib/hbct/Makefile
View File

@@ -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)

4
harbour/contrib/hbcurl/Makefile
View File

@@ -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

4
harbour/contrib/hbfimage/Makefile
View File

@@ -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

4
harbour/contrib/hbgd/Makefile
View File

@@ -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

4
harbour/contrib/hbhpdf/Makefile
View File

@@ -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

4
harbour/contrib/hbmysql/Makefile
View File

@@ -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

4
harbour/contrib/hbmzip/Makefile
View File

@@ -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)

4
harbour/contrib/hbnf/Makefile
View File

@@ -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)

4
harbour/contrib/hbodbc/Makefile
View File

@@ -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

4
harbour/contrib/hbpgsql/Makefile
View File

@@ -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

4
harbour/contrib/hbqt/Makefile
View File

@@ -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

4
harbour/contrib/hbsqlit3/Makefile
View File

@@ -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

4
harbour/contrib/hbssl/Makefile
View File

@@ -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

4
harbour/contrib/hbtip/Makefile
View File

@@ -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

4
harbour/contrib/hbtpathy/Makefile
View File

@@ -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)

4
harbour/contrib/hbvpdf/Makefile
View File

@@ -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)

3
harbour/contrib/hbwin/Makefile
View File

@@ -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

4
harbour/contrib/hbxbp/Makefile
View File

@@ -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

4
harbour/contrib/rddado/Makefile
View File

@@ -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

4
harbour/contrib/rddads/Makefile
View File

@@ -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

1
harbour/contrib/rddsql/sddfb/Makefile
View File

@@ -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)

8
harbour/contrib/rddsql/sddmy/Makefile
View File

@@ -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

8
harbour/contrib/rddsql/sddodbc/Makefile
View File

@@ -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

8
harbour/contrib/rddsql/sddpg/Makefile
View File

@@ -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

4
harbour/contrib/xhb/Makefile
View File

@@ -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)

4
harbour/contrib/xpp/Makefile
View File

@@ -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)

4
harbour/external/libhpdf/Makefile vendored
View File

@@ -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

18
harbour/source/dynlib/Makefile
View File

@@ -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

18
harbour/source/dynlib/mt/Makefile
View File

@@ -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

6
harbour/source/pp/Makefile
View File

@@ -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)),)