diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index 088513b2b..d0f229344 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -67,6 +67,7 @@ # OBJS_IOC ioc system object files to build and install # USR_INCLUDES include directories # BIN_INSTALLS binaries to install +# LIB_INSTALLS library binaries to install # RCS win32 resource files for building libraries and prods # PROD_RCS win32 resource files for building prods # LIB_RCS win32 resource files for building libraries @@ -221,6 +222,14 @@ BIN_INSTALLS+=$(BIN_INSTALLS_DEFAULT) endif endif +ifneq ($(strip $(LIB_INSTALLS_$(OS_CLASS))),) +LIB_INSTALLS+=$(subst -nil-,,$(LIB_INSTALLS_$(OS_CLASS))) +else +ifdef LIB_INSTALLS_DEFAULT +LIB_INSTALLS+=$(LIB_INSTALLS_DEFAULT) +endif +endif + ifneq ($(strip $(PROD_OBJS_$(OS_CLASS))),) PROD_OBJS+=$(subst -nil-,,$(PROD_OBJS_$(OS_CLASS))) else diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 737eaf30a..18cad0455 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -135,6 +135,10 @@ ifdef BIN_INSTALLS buildInstall : binInstalls endif +ifdef LIB_INSTALLS +buildInstall : libInstalls +endif + clean:: @echo "Cleaning" @$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\ @@ -304,6 +308,10 @@ binInstalls: $(BIN_INSTALLS) @echo "Installing $(^F)" @$(INSTALL) -d -m 555 $^ $(INSTALL_BIN) +libInstalls: $(LIB_INSTALLS) + @echo "Installing $(^F)" + @$(INSTALL) -d -m 555 $^ $(INSTALL_LIB) + $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/% @echo "Installing os-specific script $@" @$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN) @@ -400,7 +408,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: % .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc .PRECIOUS: $(COMMON_INC) -.PHONY: all inc build install clean rebuild buildInstall binInstalls +.PHONY: all inc build install clean rebuild buildInstall binInstalls libInstalls endif # BASE_RULES_BUILD # EOF RULES_BUILD