diff --git a/config/RULES.Host b/config/RULES.Host index edab6f88a..ca856dafd 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -30,9 +30,6 @@ vpath %.h $(USER_VPATH) vpath %.c $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. vpath %.cc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. vpath %.rc $(USER_VPATH) ../os/$(ARCH_CLASS) ../os/generic .. -# This prevents base/src/include/*.h from being installed. Why?? -#vpath %.h ../os/$(ARCH_CLASS) ../os/generic .. -vpath %.h $(USER_VPATH) # check for add-on CFLAGS and CXXFLAGS # @@ -330,6 +327,8 @@ endif # LIBRARY all:: install +build:: inc + build:: $(LIBTARGETS) $(PROD) $(TESTPROD) $(INSTALLS) \ $(MENUS) $(RECTYPES) $(BPTS) ifdef DBDEXPAND @@ -340,7 +339,7 @@ inc:: $(INSTALL_INC) $(INSTALL_OSINC) rebuild:: clean install -install:: inc buildInstall +install:: buildInstall buildInstall :: build $(TARGETS) \ $(INSTALL_SCRIPTS) $(INSTALL_PROD) \ diff --git a/config/RULES.Vx b/config/RULES.Vx index d77adadc9..0481c3253 100644 --- a/config/RULES.Vx +++ b/config/RULES.Vx @@ -45,6 +45,8 @@ endif all:: install +build:: inc + rebuild:: clean install pre_build:: @@ -57,7 +59,7 @@ endif inc:: $(INSTALL_INC) $(INSTALL_OSINC) -install:: inc buildInstall +install:: buildInstall buildInstall :: build $(INSTALL_INCREC)\ $(INSTALL_LIBS) $(INSTALL_LIBS_CXX) \ diff --git a/config/RULES_DIRS b/config/RULES_DIRS index b8999592e..22ddb2419 100644 --- a/config/RULES_DIRS +++ b/config/RULES_DIRS @@ -4,10 +4,11 @@ ARCHS += $(BUILD_ARCHS) host cross -ACTIONS += clean inc depends buildInstall +ACTIONS += clean inc depends build install buildInstall dirPart = $(word 1, $(subst $(DIVIDER), ,$@)) -actionArchPart = $(subst $(dirPart)$(DIVIDER), ,$@) +actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \ + $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@)))) dirActionArchTargets = $(foreach dir, $(DIRS), \ $(foreach action, $(ACTIONS) install,\ @@ -27,12 +28,10 @@ installArchTargets = $(foreach action, install,\ $(foreach arch, $(ARCHS), \ $(action)$(DIVIDER)$(arch))) -all install :: inc buildInstall +all install :: buildInstall rebuild:: clean all -$(ARCHS) $(installArchTargets) :: inc - $(DIRS) $(dirActionTargets) $(dirArchTargets)$(dirActionArchTargets) :: $(MAKE) -C $(dirPart) $(actionArchPart)