(file) Return to Makefile CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Makefile between version 1.163.4.2 and 1.183.2.2

version 1.163.4.2, 2008/02/27 01:48:15 version 1.183.2.2, 2011/10/11 18:18:08
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// 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
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//=============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 ROOT = ../../.. ROOT = ../../..
  
 DIR = Pegasus/Common DIR = Pegasus/Common
  
   HAS_PAM_DEPENDENCY=true
   HAS_ICU_DEPENDENCY=true
   
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
Line 39 
Line 40 
         SYS_INCLUDES += -I$(OPENSSL_HOME)/include         SYS_INCLUDES += -I$(OPENSSL_HOME)/include
      endif      endif
 endif endif
   
 LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY
  
   ifeq ($(OS_TYPE),vms)
       STATIC=1
   endif
   
 LIBRARY = pegcommon LIBRARY = pegcommon
  
 ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX) ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
Line 55 
Line 61 
 ## ##
  
 SOURCES1 = \ SOURCES1 = \
       SCMO.cpp \
       SCMOXmlWriter.cpp \
       SCMOClassCache.cpp \
       SCMOStreamer.cpp \
       Print.cpp \
     Executor.cpp \     Executor.cpp \
     CIMError.cpp \  
     PropertyAccessor.cpp \  
     Once.cpp \     Once.cpp \
     Time.cpp \     Time.cpp \
     Threads.cpp \     Threads.cpp \
Line 70 
Line 79 
     AsyncOpNode.cpp \     AsyncOpNode.cpp \
     AtomicInt.cpp \     AtomicInt.cpp \
     AuthenticationInfoRep.cpp \     AuthenticationInfoRep.cpp \
     AutoStreamer.cpp \  
     Base64.cpp \     Base64.cpp \
     BinaryStreamer.cpp \  
     Buffer.cpp \     Buffer.cpp \
     CharSet.cpp \     CharSet.cpp \
     LanguageParser.cpp \     LanguageParser.cpp \
Line 88 
Line 95 
     CIMInstance.cpp \     CIMInstance.cpp \
     CIMInstanceRep.cpp \     CIMInstanceRep.cpp \
     CIMMessage.cpp \     CIMMessage.cpp \
     CIMMessageSerializer.cpp \      CIMResponseData.cpp \
     CIMMessageDeserializer.cpp \  
     CIMMethod.cpp \     CIMMethod.cpp \
     CIMMethodRep.cpp \     CIMMethodRep.cpp \
     CIMName.cpp \     CIMName.cpp \
Line 127 
Line 133 
     Magic.cpp     Magic.cpp
  
 SOURCES2 = \ SOURCES2 = \
     DynamicLibrary.cpp \  
     Exception.cpp \     Exception.cpp \
     InternalException.cpp \     InternalException.cpp \
     FileSystem.cpp \     FileSystem.cpp \
Line 137 
Line 142 
     HTTPConnection.cpp \     HTTPConnection.cpp \
     HTTPConnector.cpp  \     HTTPConnector.cpp  \
     HTTPMessage.cpp \     HTTPMessage.cpp \
     Indentor.cpp \  
     IndicationFormatter.cpp \  
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
     Message.cpp \     Message.cpp \
Line 150 
Line 153 
     ObjectNormalizer.cpp \     ObjectNormalizer.cpp \
     OperationContext.cpp \     OperationContext.cpp \
     OperationContextInternal.cpp \     OperationContextInternal.cpp \
     OptionManager.cpp \  
     Packer.cpp \  
     Pair.cpp \     Pair.cpp \
     QueryExpressionRep.cpp \     QueryExpressionRep.cpp \
     Resolver.cpp \     Resolver.cpp \
Line 159 
Line 160 
     ResponseHandlerRep.cpp \     ResponseHandlerRep.cpp \
     Sharable.cpp \     Sharable.cpp \
     Signal.cpp \     Signal.cpp \
     SoapUtils.cpp \  
     SoapReader.cpp \  
     SoapWriter.cpp \  
     Socket.cpp \     Socket.cpp \
     SpinLock.cpp \     SpinLock.cpp \
     Stack.cpp \     Stack.cpp \
     StatisticalData.cpp \     StatisticalData.cpp \
     Stopwatch.cpp \  
     String.cpp \     String.cpp \
     StringConversion.cpp \     StringConversion.cpp \
     StringInline.cpp \     StringInline.cpp \
     System.cpp \     System.cpp \
     TimeValue.cpp \     TimeValue.cpp \
     SSLContext.cpp \     SSLContext.cpp \
     SSLContextManager.cpp \  
     TLS.cpp \     TLS.cpp \
     TraceFileHandler.cpp \     TraceFileHandler.cpp \
       TraceLogHandler.cpp \
       TraceMemoryHandler.cpp \
     Tracer.cpp \     Tracer.cpp \
     Thread.cpp \     Thread.cpp \
     ThreadPool.cpp \     ThreadPool.cpp \
     Union.cpp \     Union.cpp \
       XmlGenerator.cpp \
     XmlParser.cpp \     XmlParser.cpp \
     XmlReader.cpp \     XmlReader.cpp \
     XmlStreamer.cpp \  
     XmlWriter.cpp \     XmlWriter.cpp \
     MofWriter.cpp \  
     CommonUTF.cpp \     CommonUTF.cpp \
     Constants.cpp \     Constants.cpp \
     HostAddress.cpp \     HostAddress.cpp \
     HostLocator.cpp      HostLocator.cpp \
           NumericArg.cpp \
       BinaryCodec.cpp \
       CIMBuffer.cpp \
       CIMInternalXmlEncoder.cpp \
       SCMOInternalXmlEncoder.cpp \
       AsyncRequestExecutor.cpp \
       CIMBinMsgSerializer.cpp \
       CIMBinMsgDeserializer.cpp \
       IndicationRouter.cpp
  
 ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX) ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
   SOURCES2 += PaseCcsid.cpp   SOURCES2 += PaseCcsid.cpp
Line 197 
Line 203 
 SOURCES_SLP = Attribute.cpp \ SOURCES_SLP = Attribute.cpp \
     CIMServerDescription.cpp     CIMServerDescription.cpp
  
 SOURCES_SECURITY_ZOS = MustStayCleanzOS.c  
 ifeq ($(PEGASUS_ENABLE_SLP),true) ifeq ($(PEGASUS_ENABLE_SLP),true)
   SOURCES2 += $(SOURCES_SLP)   SOURCES2 += $(SOURCES_SLP)
 endif endif
Line 212 
Line 217 
   ifeq ($(OS_TYPE),windows)   ifeq ($(OS_TYPE),windows)
     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
   else   else
           ifeq ($(OS_TYPE), vms)
               EXTRA_LIBRARIES += -L$(OPENSSL_LIB) \
                   -lssl$$libssl_shr32 -lssl$$libcrypto_shr32
           else
     ifdef OPENSSL_HOME     ifdef OPENSSL_HOME
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib
     endif     endif
     EXTRA_LIBRARIES += -lssl -lcrypto     EXTRA_LIBRARIES += -lssl -lcrypto
   endif   endif
 endif endif
   endif
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  ifeq ($(OS_TYPE),vms)
   ifdef PEGASUS_ZOS_SECURITY      ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),false)
     SOURCES += $(SOURCES_SECURITY_ZOS)          SYS_LIBS += tcpip$$library:tcpip$$lib/lib
           LIBRARIES = vms/include=(vms_crtl_init)
           LINK_OPT1 = COLLECT=crtl_init,lib$$initializdz,lib$$initializd_,
           LINK_OPT2 = lib$$initialize,lib$$initialize$$
           LINKER_OPTIONS = $(LINK_OPT1)$(LINK_OPT2)
   endif   endif
   SOURCES2 += Audit_zOS_SMF.cpp  endif
   
   ifeq ($(OS),zos)
       SOURCES2 += Audit_zOS_SMF.cpp \
           PegasusAssertZOS.cpp
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX) ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
Line 247 
Line 265 
   endif   endif
 endif endif
  
 include $(ROOT)/mak/library.mak  include $(ROOT)/mak/dynamic-library.mak
 # DO NOT DELETE # DO NOT DELETE

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