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

Diff for /pegasus/Makefile.Release between version 1.53 and 1.66

version 1.53, 2006/01/25 21:51:24 version 1.66, 2007/06/22 17:45:50
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 94 
Line 96 
    libpeghandlerservice \    libpeghandlerservice \
    libpegindicationservice \    libpegindicationservice \
    libpeglistener \    libpeglistener \
      libpegpmservice \
    libpegprm \    libpegprm \
    libpegprovider \    libpegprovider \
    libpegprovidermanager \    libpegprovidermanager \
Line 121 
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 138 
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 155 
Line 168 
    cimauth \    cimauth \
    cimconfig \    cimconfig \
    cimserver \    cimserver \
    cimuser \  
    cimprovagt \    cimprovagt \
    cimservera \    cimservera \
      cimreparchive \
    repupgrade    repupgrade
  
 PEGASUS_USER_CMDS = \ PEGASUS_USER_CMDS = \
    cimmof \    cimmof \
    cimmofl \    cimmofl \
    cimprovider \    cimprovider \
      cimsub \
    osinfo \    osinfo \
    wbemexec    wbemexec
  
Line 190 
Line 204 
 PEGASUS_UNIX_MAN_USER_PAGES = \ PEGASUS_UNIX_MAN_USER_PAGES = \
    cimmof.1 \    cimmof.1 \
    cimprovider.1 \    cimprovider.1 \
      cimsub.1 \
    osinfo.1 \    osinfo.1 \
    wbemexec.1    wbemexec.1
  
 PEGASUS_UNIX_MAN_ADMIN_PAGES = \ PEGASUS_UNIX_MAN_ADMIN_PAGES = \
    cimauth.8 \    cimauth.8 \
    cimconfig.8 \    cimconfig.8 \
      cimreparchive.8 \
    cimserver.8    cimserver.8
  
 PEGASUS_DOC_FILES = \ PEGASUS_DOC_FILES = \
Line 683 
Line 699 
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)/etc/init.d         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)/etc/init.d
         $(COPY) $(ROOT)/rpm/preamble-tog-pegasus.rc $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus         $(COPY) $(ROOT)/rpm/preamble-tog-pegasus.rc $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
         @$(ECHO-E) "CIMSERVER_BIN=$(PEGASUS_SBIN_DIR)/cimserver" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus         @$(ECHO-E) "CIMSERVER_BIN=$(PEGASUS_SBIN_DIR)/cimserver" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
           @$(ECHO-E) "PEGASUS_SCRIPT_DIR=$(PEGASUS_SCRIPT_DIR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
           @$(ECHO-E) "PEGASUS_SSL_CONF_FILE=$(PEGASUS_PEM_DIR)/ssl.cnf" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
           @$(ECHO-E) "PEGASUS_SSL_CERT_FILE=$(PEGASUS_SSL_CERT_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
           @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
           @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
 endif endif
  
Line 765 
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              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define CIMSERVER_LOCK_FILE"  \          @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_LOCK_FILE"  \
              "\""$(CIMSERVER_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
           @$(ECHO-E) "# undef PEGASUS_CIMSERVER_START_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 845 
Line 884 
         @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \         @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \
              "\""$(PEGASUS_REPOSITORY_DIR)"\"" \              "\""$(PEGASUS_REPOSITORY_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
           @$(ECHO-E) "# undef PEGASUS_PREV_REPOSITORY_DIR" \
                >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_PREV_REPOSITORY_DIR"  \
                "\""$(PEGASUS_PREV_REPOSITORY_DIR)"\"" \
                >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PROVIDER_LIB_DIR" \         @$(ECHO-E) "# undef PEGASUS_PROVIDER_LIB_DIR" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_PROVIDER_LIB_DIR"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_LIB_DIR"  \
Line 1013 
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 1045 
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 1209 
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.53  
changed lines
  Added in v.1.66
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2