Added LIB_INSTALLS, libraries to install.

This commit is contained in:
Janet B. Anderson
2005-01-25 16:58:29 +00:00
parent cd4b7ba067
commit bf69293239
2 changed files with 18 additions and 1 deletions

View File

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

View File

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