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

Diff for /pegasus/Makefile.Release between version 1.94.2.3 and 1.97.2.1

version 1.94.2.3, 2010/07/09 11:34:42 version 1.97.2.1, 2009/11/18 12:07:55
Line 88 
Line 88 
    libpegauthentication \    libpegauthentication \
    libpegclient \    libpegclient \
    libpegcliutils \    libpegcliutils \
      libpeggeneral \
    libpegcommon \    libpegcommon \
    libpegcompiler \    libpegcompiler \
    libpegconfig \    libpegconfig \
Line 124 
Line 125 
    libCMPIProviderManager    libCMPIProviderManager
 endif endif
  
   PEGASUS_JARS =
   JAR_SUFFIX = .jar
  
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
       libsnmpIndicationHandler     libJMPIProviderManager
   PEGASUS_JARS += \
      JMPIImpl
   endif
   
   ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
   PEGASUS_LIBRARIES += \
      libInteropProvider
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_SLP), true)  ifdef PEGASUS_USE_NET_SNMP
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
     libpegslp \        libsnmpIndicationHandler
     libpegslp_client  
 endif endif
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
Line 148 
Line 157 
    libDefaultProviderManager \    libDefaultProviderManager \
    libCIMxmlIndicationHandler    libCIMxmlIndicationHandler
  
 ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)  ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
 PEGASUS_LIBRARIES += \     PEGASUS_LIBRARY_LINKS += \
    libInteropProvider         libJMPIProviderManager
 endif endif
  
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
Line 258 
Line 267 
    PG_UnixProcess20.mof \    PG_UnixProcess20.mof \
    PG_UnixProcess20R.mof    PG_UnixProcess20R.mof
  
 ifeq ($(PEGASUS_ENABLE_SLP), true)  
    MANAGEDSYSTEM_MOF_FILES += \  
       PG_SLPProvider20R.mof  
 endif  
   
 prestage_verifyInstallEnabled: FORCE prestage_verifyInstallEnabled: FORCE
 ifndef PEGASUS_ENABLE_MAKE_INSTALL ifndef PEGASUS_ENABLE_MAKE_INSTALL
         @$(ECHO) "Makefile.Release is not enabled."         @$(ECHO) "Makefile.Release is not enabled."
Line 306 
Line 310 
 setpermissions_PegasusLocalAuthDirectory: FORCE setpermissions_PegasusLocalAuthDirectory: FORCE
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)
  
   stage_PegasusJarFiles: FORCE
           $(foreach i, $(PEGASUS_JARS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(JAR_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(JAR_SUFFIX);)
   
   setpermissions_PegasusJarFiles: FORCE
           $(foreach i, $(PEGASUS_JARS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(JAR_SUFFIX);)
   
   
 stage_PegasusLibraryDirectoryFiles: FORCE stage_PegasusLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)
         $(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)         $(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
 ifeq ($(PEGASUS_ENABLE_SLP), true)  
         $(COPY) $(PEGASUS_HOME)/lib/libpegslp_client$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/libpegslp_client$(LIB_SUFFIX)  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=libpegslp_client$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/libpegslp_client$(LIB_LINK_SUFFIX)  
 endif  
  
 setpermissions_PegasusLibraryDirectoryFiles: FORCE setpermissions_PegasusLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_LIBRARIES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_LIBRARIES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)
   
 stage_PegasusProviderLibraryDirectoryFiles: FORCE stage_PegasusProviderLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
         $(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
 ifeq ($(PEGASUS_ENABLE_SLP), true)  
         $(COPY) $(PEGASUS_HOME)/lib/libSLPProvider$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/libSLPProvider$(LIB_SUFFIX)  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=libSLPProvider$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/libSLPProvider$(LIB_LINK_SUFFIX)  
 endif  
  
 setpermissions_PegasusProviderLibraryDirectoryFiles: FORCE setpermissions_PegasusProviderLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
 ifeq ($(PEGASUS_ENABLE_SLP), true)  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/libSLPProvider$(LIB_SUFFIX)  
 endif  
  
 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);)
Line 438 
Line 437 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusMOFDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusMOFDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusSystemFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusSystemFiles
           $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusJarFiles
  
 setpermissions_PegasusFiles: FORCE setpermissions_PegasusFiles: FORCE
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusLibraryDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusLibraryDirectoryFiles
Line 451 
Line 451 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusMOFDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusMOFDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusSystemFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusSystemFiles
           $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusJarFiles
  
 stage_PegasusSystemFiles: FORCE stage_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux) ifeq ($(OS),linux)
Line 638 
Line 639 
         @$(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;)
 ifeq ($(PEGASUS_ENABLE_SLP), true)  
         @(ECHO-E) "ls -l $(PEGASUS_DEST_LIB_DIR)/libpegslp_client$(LIB_LINK_SUFFIX)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
 endif  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER MANAGER FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER MANAGER FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
Line 658 
Line 655 
         @$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \
              "ls -l $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              "ls -l $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
 ifeq ($(PEGASUS_ENABLE_SLP), true)  
         @(ECHO-E) "ls -l $(PEGASUS_PROVIDER_LIB_DIR)/libSLPProvider$(LIB_SUFFIX)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @(ECHO-E) "ls -l $(PEGASUS_PROVIDER_LIB_DIR)/libSLPProvider$(LIB_LINK_SUFFIX)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
 endif  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS ADMIN CMD FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS ADMIN CMD FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_ADMIN_CMDS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_ADMIN_CMDS), $(ECHO-E) \
Line 996 
Line 987 
             "   ln -sf $(i)$(LIB_SUFFIX)\             "   ln -sf $(i)$(LIB_SUFFIX)\
             $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) "   # Create Symbolic Links for SLP library and SLP Provider" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) " %if %{EXTERNAL_SLP_REQUESTED}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "   ln -sf    libpegslp_client$(LIB_SUFFIX)\  
             $(PEGASUS_DEST_LIB_DIR_2)/libpegslp_client$(LIB_LINK_SUFFIX)" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "   ln -sf    libSLPProvider$(LIB_SUFFIX)\  
             $(PEGASUS_PROVIDER_LIB_DIR_2)/libSLPProvider$(LIB_LINK_SUFFIX)" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) " %endif " >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_postSectionToSpecFile_createLog: FORCE _append_postSectionToSpecFile_createLog: FORCE
Line 1134 
Line 1114 
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \            "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%if %{JMPI_PROVIDER_REQUESTED}"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_DEST_LIB_DIR_2)/*$(JAR_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/libJMPIProviderManager$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%endif"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(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)
Line 1159 
Line 1146 
         @$(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);)
         @$(ECHO-E) " %if %{EXTERNAL_SLP_REQUESTED}"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/libpegslp_client$(LIB_LINK_SUFFIX)" \  
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/libSLPProvider$(LIB_LINK_SUFFIX)" \  
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%endif"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), \         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), \
             $(ECHO-E) "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(ECHO-E) "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

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