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

Diff for /pegasus/Makefile.Release between version 1.97 and 1.98

version 1.97, 2009/05/11 04:46:17 version 1.98, 2009/07/28 14:10:24
Line 125 
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
  
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
Line 143 
Line 152 
    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 284 
Line 298 
 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 404 
Line 425 
         $(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 417 
Line 439 
         $(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 1080 
Line 1103 
         @$(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)

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