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

Diff for /pegasus/Makefile.Release between version 1.60 and 1.67

version 1.60, 2006/11/29 21:40:26 version 1.67, 2007/07/25 01:23:29
Line 124 
Line 124 
    libcmpiCppImpl    libcmpiCppImpl
 endif endif
  
   ifdef PEGASUS_USE_NET_SNMP
      PEGASUS_LIBRARIES += \
         libsnmpIndicationHandler
   endif
   
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libNTPProviderSecurity    libNTPProviderSecurity
Line 141 
Line 146 
    libCMPIProviderManager    libCMPIProviderManager
 endif endif
  
   ifdef PEGASUS_USE_NET_SNMP
   PEGASUS_LIBRARY_LINKS += \
      libsnmpIndicationHandler
   endif
   
 PEGASUS_PROVIDERS = \ PEGASUS_PROVIDERS = \
    libComputerSystemProvider \    libComputerSystemProvider \
    libOSProvider \    libOSProvider \
Line 161 
Line 171 
    cimprovagt \    cimprovagt \
    cimservera \    cimservera \
    cimreparchive \    cimreparchive \
    repupgrade \     repupgrade
    cimsub  
  
 PEGASUS_USER_CMDS = \ PEGASUS_USER_CMDS = \
    cimmof \    cimmof \
    cimmofl \    cimmofl \
    cimprovider \    cimprovider \
      cimsub \
    osinfo \    osinfo \
    wbemexec    wbemexec
  
Line 776 
Line 786 
         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \
              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef CIMSERVER_LOCK_FILE" \          @$(ECHO-E) "# undef PEGASUS_CIMSERVER_START_LOCK_FILE" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_LOCK_FILE"  \
                "\""$(PEGASUS_CIMSERVER_START_LOCK_FILE)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# undef PEGASUS_PLANNED_CONFIG_FILE_PATH" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_PLANNED_CONFIG_FILE_PATH"  \
                "\""$(PEGASUS_PLANNED_CONFIG_FILE_PATH)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# undef PEGASUS_CURRENT_CONFIG_FILE_PATH" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CURRENT_CONFIG_FILE_PATH"  \
                "\""$(PEGASUS_CURRENT_CONFIG_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define CIMSERVER_LOCK_FILE"  \          @$(ECHO-E) "# undef PEGASUS_CIMSERVER_START_FILE" \
              "\""$(CIMSERVER_LOCK_FILE)"\"" \               >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_FILE"  \
                "\""$(PEGASUS_CIMSERVER_START_FILE)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \
                "\""$(PEGASUS_REPOSITORY_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
Line 1029 
Line 1057 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.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-buildRequires.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_USE_NET_SNMP
           @$(ECHO-E) "BuildRequires:      net-snmp-devel" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# End of section " \
               "pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_USE_NET_SNMP
           @$(ECHO-E) "Requires:           net-snmp" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# End of section " \
               "pegasus/rpm/tog-specfiles/tog-pegasus-requires.spec" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-desc.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(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)
Line 1061 
Line 1114 
         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \
              "$(PEGASUS_CIMSERVER_START_FILE)"  \              "$(PEGASUS_CIMSERVER_START_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global CIMSERVER_LOCK_FILE" \          @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_LOCK_FILE" \
              "$(CIMSERVER_LOCK_FILE)"  \               "$(PEGASUS_CIMSERVER_START_LOCK_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1084 
Line 1137 
              "\044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION"\              "\044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) \         @$(ECHO-E) \
              "%global PEGASUS_RPM_HOME \044RPM_BUILD_ROOT/build/tog-pegasus"\               "%global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1225 
Line 1278 
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \          @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVER_USR)," \
              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr(1555,$(CIMSERVER_USR),$(CIMSERVER_GRP))" \         @$(ECHO-E) "%dir %attr(1555,$(CIMSERVER_USR),$(CIMSERVER_GRP))" \

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