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

Diff for /pegasus/Makefile.Release between version 1.104 and 1.111

version 1.104, 2010/09/13 10:40:03 version 1.111, 2013/12/16 09:37:26
Line 81 
Line 81 
  
 PEGASUS_LIBRARIES = \ PEGASUS_LIBRARIES = \
    libCIMxmlIndicationHandler \    libCIMxmlIndicationHandler \
      libFileListenerDestination \
      libcimrsserver    \
    libConfigSettingProvider \    libConfigSettingProvider \
    libNamespaceProvider \    libNamespaceProvider \
    libProviderRegistrationProvider \    libProviderRegistrationProvider \
Line 88 
Line 90 
    libpegauthentication \    libpegauthentication \
    libpegclient \    libpegclient \
    libpegcliutils \    libpegcliutils \
      libpeghandler \
    libpeggeneral \    libpeggeneral \
    libpegcommon \    libpegcommon \
    libpegcompiler \    libpegcompiler \
Line 141 
Line 144 
    libInteropProvider    libInteropProvider
 endif endif
  
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
       libsnmpIndicationHandler       libsnmpIndicationHandler
 endif endif
Line 151 
Line 154 
     libpegwsmserver     libpegwsmserver
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_WSMAN),true)
   PEGASUS_LIBRARIES += \
       libpegwebserver
   endif
   
 ifeq ($(PEGASUS_ENABLE_SLP), true) ifeq ($(PEGASUS_ENABLE_SLP), true)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
     libpegslp \     libpegslp \
Line 174 
Line 182 
        libJMPIProviderManager        libJMPIProviderManager
 endif endif
  
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
 PEGASUS_LIBRARY_LINKS += \ PEGASUS_LIBRARY_LINKS += \
    libsnmpIndicationHandler    libsnmpIndicationHandler
 endif endif
Line 500 
Line 508 
         @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus         @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus         @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_FLAVOR=$(PEGASUS_FLAVOR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus         @$(ECHO-E) "PEGASUS_FLAVOR=$(PEGASUS_FLAVOR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus          $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc | $(TAIL) -n+29 >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
 endif endif
  
 setpermissions_PegasusSystemFiles: FORCE setpermissions_PegasusSystemFiles: FORCE
Line 812 
Line 820 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-buildRequires.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-buildRequires.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
         @$(ECHO-E) "BuildRequires:      net-snmp-devel" \         @$(ECHO-E) "BuildRequires:      net-snmp-devel" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 endif endif
Line 823 
Line 831 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
         @$(ECHO-E) "Requires:           net-snmp" \         @$(ECHO-E) "Requires:           net-snmp" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 endif endif
Line 838 
Line 846 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch-for-32bit-provider-support.spec \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_ARCH_LIB %{_lib}" >> \         @$(ECHO-E) "%global PEGASUS_ARCH_LIB %{_lib}" >> \
             $(PEGASUS_RPM_SPEC_FILE_PATH)             $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \         @$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \
Line 1133 
Line 1144 
         @$(ECHO-E) "%dir %attr(1755,$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))"\         @$(ECHO-E) "%dir %attr(1755,$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))"\
              "$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \              "$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(INSTALL_USR),$(INSTALL_GRP))" \          @$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))" \
              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\         @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
Line 1182 
Line 1193 
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/*$(LIB_SUFFIX)" \            "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%if %{PEGASUS_32BIT_PROVIDER_SUPPORT}"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir /usr/lib/Pegasus" \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir /usr/lib/Pegasus/providers" \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir /usr/lib/Pegasus/providerManagers" \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
              "/usr/lib/*$(LIB_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
              "/usr/lib/Pegasus/providerManagers/*$(LIB_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "/usr/lib/libpegclient.so"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "/usr/lib/libpegcommon.so"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "/usr/lib/libpegprovider.so"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "/usr/lib/libDefaultProviderManager.so" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "/usr/lib/Pegasus/providerManagers/libCMPIProviderManager.so" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%endif"  >> $(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))" \

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