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

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

version 1.91, 2008/12/01 17:48:58 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
   
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
   PEGASUS_LIBRARIES += \
      libJMPIProviderManager
   PEGASUS_JARS += \
      JMPIImpl
   endif
   
   ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
   PEGASUS_LIBRARIES += \
      libInteropProvider
   endif
  
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
Line 142 
Line 157 
    libDefaultProviderManager \    libDefaultProviderManager \
    libCIMxmlIndicationHandler    libCIMxmlIndicationHandler
  
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
      PEGASUS_LIBRARY_LINKS += \
          libJMPIProviderManager
   endif
   
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
 PEGASUS_LIBRARY_LINKS += \ PEGASUS_LIBRARY_LINKS += \
    libsnmpIndicationHandler    libsnmpIndicationHandler
Line 230 
Line 250 
    PG_InterOpSchema20.mof \    PG_InterOpSchema20.mof \
    PG_ProviderModule20.mof    PG_ProviderModule20.mof
  
   ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
      INTEROP_MOF_FILES += \
         PG_CIMXMLCommunicationMechanism20.mof \
         PG_Namespace20.mof\
         PG_ServerProfile20.mof
   endif
   
 MANAGEDSYSTEM_MOF_FILES = \ MANAGEDSYSTEM_MOF_FILES = \
    PG_ComputerSystem20.mof \    PG_ComputerSystem20.mof \
    PG_ComputerSystem20R.mof \    PG_ComputerSystem20R.mof \
Line 283 
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);)
Line 336 
Line 370 
  
 stage_PegasusDocFiles: FORCE stage_PegasusDocFiles: FORCE
         $(foreach i, $(PEGASUS_DOC_FILES), $(COPY) $(ROOT)/doc/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)         $(foreach i, $(PEGASUS_DOC_FILES), $(COPY) $(ROOT)/doc/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)
           $(COPY) $(ROOT)/OpenPegasusNOTICE.txt \
               $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/OpenPegasusNOTICE.txt
  
 setpermissions_PegasusDocFiles: FORCE setpermissions_PegasusDocFiles: FORCE
         $(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)         $(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)
Line 401 
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 414 
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 522 
Line 560 
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
 endif endif
  
   
 create_ConfigProductDirectoriesInclude: FORCE create_ConfigProductDirectoriesInclude: FORCE
 ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         @$(ECHO-E) "#ifndef Config_Product_Directory_Structure_h" \         @$(ECHO-E) "#ifndef Config_Product_Directory_Structure_h" \
Line 592 
Line 629 
         @$(foreach i, $(PEGASUS_DOC_FILES), \         @$(foreach i, $(PEGASUS_DOC_FILES), \
              $(ECHO-E) "ls -l $(PEGASUS_DOC_DIR)/$(i)" \              $(ECHO-E) "ls -l $(PEGASUS_DOC_DIR)/$(i)" \
                  >> $(PEGASUS_HOME)/PegasusVerifyInstall;)                  >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
           @$(ECHO-E) "ls -l $(PEGASUS_DOC_DIR)/OpenPegasusNOTICE.txt" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS LIBRARIES FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS LIBRARIES FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_LIBRARIES), $(ECHO-E) \         @$(foreach i, $(PEGASUS_LIBRARIES), $(ECHO-E) \
Line 1075 
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 1091 
Line 1137 
         @$(foreach i, $(PEGASUS_DOC_FILES), \         @$(foreach i, $(PEGASUS_DOC_FILES), \
             $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\             $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\
             "$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             "$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_DOC_DIR)/OpenPegasusNOTICE.txt" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
             $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)

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