Shared library rule changes made to allow make -j option to work on win32.

This commit is contained in:
Janet B. Anderson
2008-09-22 21:21:10 +00:00
parent 65c2e51849
commit c0dd8a788b
+11 -6
View File
@@ -268,17 +268,13 @@ endif # RANLIB
$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
$(DLL_LINK_LIBNAME):$(SHRLIB_PREFIX)%.lib:
@$(RM) $@
$(LINK.shrlib)
$(MT_DLL_COMMAND)
$(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
ifneq ($(OS_CLASS),WIN32)
$(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
@$(RM) $@
$(LINK.shrlib)
$(MT_DLL_COMMAND)
endif
$(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
@@ -438,6 +434,15 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
@echo "Installing $@"
@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
ifeq ($(OS_CLASS),WIN32)
ifeq ($(SHARED_LIBRARIES),YES)
$(LIB_PREFIX)%$(LIB_SUFFIX) $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
@$(RM) $@
$(LINK.shrlib)
$(MT_DLL_COMMAND)
endif
endif
-include $(CONFIG)/RULES_EXPAND
.PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc