(file) Return to Makefile.Release CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.Release between version 1.85 and 1.86

version 1.85, 2008/05/02 21:05:28 version 1.86, 2008/05/06 19:12:00
Line 144 
Line 144 
    libDefaultProviderManager \    libDefaultProviderManager \
    libCIMxmlIndicationHandler    libCIMxmlIndicationHandler
  
 ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER  
 PEGASUS_PROVIDER_MANAGER_LINKS += \  
    libCMPIProviderManager  
 endif  
   
   
   
   
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
 PEGASUS_LIBRARY_LINKS += \ PEGASUS_LIBRARY_LINKS += \
    libsnmpIndicationHandler    libsnmpIndicationHandler
Line 314 
Line 306 
  
 stage_PegasusProviderManagerLibraryDirectoryFiles: FORCE stage_PegasusProviderManagerLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
         $(foreach i, $(PEGASUS_PROVIDER_MANAGER_LINKS), $(MAKE) --directory=${ROOT} -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)          $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
  
 setpermissions_PegasusProviderManagerLibraryDirectoryFiles: FORCE setpermissions_PegasusProviderManagerLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
Line 632 
Line 624 
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), $(ECHO-E) \
              "ls -l $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              "ls -l $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER MANAGER FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX)" \              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(foreach i, $(PEGASUS_PROVIDER_MANAGER_LINKS), $(ECHO-E) \          @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER FILES\"" \
Line 972 
Line 966 
             $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   # Create Symbolic Links for Packaged Provider Managers"\
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
               "   ln -sf $(i)$(LIB_SUFFIX)\
               $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_postSectionToSpecFile_createLog: FORCE _append_postSectionToSpecFile_createLog: FORCE
         @$(ECHO-E) "   echo \`date\` > %PEGASUS_INSTALL_LOG 2>&1" \         @$(ECHO-E) "   echo \`date\` > %PEGASUS_INSTALL_LOG 2>&1" \
Line 1051 
Line 1053 
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2) " \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\         @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\
               "$(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)               "$(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1099 
Line 1103 
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \            "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
Line 1115 
Line 1122 
         @$(foreach i, $(PEGASUS_PROVIDERS), \         @$(foreach i, $(PEGASUS_PROVIDERS), \
             $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), \
               $(ECHO-E) "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 include $(ROOT)/mak/commands.mak include $(ROOT)/mak/commands.mak

Legend:
Removed from v.1.85  
changed lines
  Added in v.1.86
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2