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

Diff for /pegasus/Makefile.Release between version 1.108 and 1.113

version 1.108, 2013/02/08 08:53:37 version 1.113, 2014/12/12 01:10:21
Line 82 
Line 82 
 PEGASUS_LIBRARIES = \ PEGASUS_LIBRARIES = \
    libCIMxmlIndicationHandler \    libCIMxmlIndicationHandler \
    libFileListenerDestination \    libFileListenerDestination \
      libcimrsserver    \
    libConfigSettingProvider \    libConfigSettingProvider \
    libNamespaceProvider \    libNamespaceProvider \
    libProviderRegistrationProvider \    libProviderRegistrationProvider \
Line 121 
Line 122 
       libCIMQueryCapabilitiesProvider       libCIMQueryCapabilitiesProvider
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_FQL),true)
      PEGASUS_LIBRARIES += libpegfql
   endif
   
 ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true) ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libcmpiCppImpl    libcmpiCppImpl
Line 128 
Line 133 
    libCMPIProviderManager    libCMPIProviderManager
 endif endif
  
   
 PEGASUS_JARS = PEGASUS_JARS =
 JAR_SUFFIX = .jar JAR_SUFFIX = .jar
  
Line 143 
Line 149 
    libInteropProvider    libInteropProvider
 endif endif
  
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
       libsnmpIndicationHandler       libsnmpIndicationHandler
 endif endif
Line 153 
Line 159 
     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 176 
Line 187 
        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 216 
Line 227 
    cimprovider \    cimprovider \
    cimsub \    cimsub \
    osinfo \    osinfo \
    wbemexec     wbemexec \
      cimcli
  
 PEGASUS_GENERATED_SCRIPTS = \ PEGASUS_GENERATED_SCRIPTS = \
    genOpenPegasusSSLCerts    genOpenPegasusSSLCerts
Line 236 
Line 248 
    cimprovider.1 \    cimprovider.1 \
    cimsub.1 \    cimsub.1 \
    osinfo.1 \    osinfo.1 \
    wbemexec.1     wbemexec.1 \
      cimcli.1
  
 PEGASUS_UNIX_MAN_ADMIN_PAGES = \ PEGASUS_UNIX_MAN_ADMIN_PAGES = \
    cimauth.8 \    cimauth.8 \
Line 502 
Line 515 
         @$(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 814 
Line 827 
         @$(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 825 
Line 838 
         @$(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

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