(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.46.2.30 and 1.161

version 1.46.2.30, 2001/09/01 23:20:11 version 1.161, 2007/08/01 02:09:59
Line 1 
Line 1 
   #//%2006////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// 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
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF 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
  
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL  ifdef PEGASUS_HAS_SSL
       ifdef OPENSSL_HOME
           SYS_INCLUDES += -I$(OPENSSL_HOME)/include
        endif
   endif
   LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY
  
 LIBRARY = pegcommon LIBRARY = pegcommon
  
 NEW_SOURCES = \  ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
     Monitor.cpp \    LIBRARIES = ILEWrapperUtils
     HTTPAcceptor.cpp \  endif
     HTTPConnection.cpp \  
     HTTPConnector.cpp  \  
     HTTPMessage.cpp  
  
 SOURCES = \  ##
     $(NEW_SOURCES) \  ## CAUTION: the source files are divided evenly (more or less) between SOURCES1
     OptionManager.cpp \  ## and SOURCES2. This avoids a command line buffer overflow on Windows 2000
     Socket.cpp \  ## (see bug #2754 for details). As a precaution, limit SOURCES1 and SOURCES2
     CIMStatusCode.cpp \  ## to 75 source files each.
     CIMMessage.cpp \  ##
     Message.cpp \  
     MessageQueue.cpp \  SOURCES1 = \
     CIMObject.cpp \      Executor.cpp \
       CIMError.cpp \
       PropertyAccessor.cpp \
       Once.cpp \
       Time.cpp \
       Threads.cpp \
       TSDKey.cpp \
       Semaphore.cpp \
       ReadWriteSem.cpp \
       Condition.cpp \
       AnonymousPipe.cpp \
     Array.cpp \     Array.cpp \
     Channel.cpp \      AsyncOpNode.cpp \
     Char16.cpp \      AtomicInt.cpp \
     Config.cpp \      AuthenticationInfoRep.cpp \
       AutoStreamer.cpp \
       Base64.cpp \
       BinaryStreamer.cpp \
       Buffer.cpp \
       CharSet.cpp \
       LanguageParser.cpp \
       AcceptLanguageList.cpp \
       ContentLanguageList.cpp \
       LanguageTag.cpp \
       MessageLoader.cpp \
       Char16Inline.cpp \
     CIMClass.cpp \     CIMClass.cpp \
     CIMClassRep.cpp \     CIMClassRep.cpp \
     CIMDateTime.cpp \     CIMDateTime.cpp \
     CIMFlavor.cpp \     CIMFlavor.cpp \
     CIMInstance.cpp \     CIMInstance.cpp \
     CIMInstanceRep.cpp \     CIMInstanceRep.cpp \
       CIMMessage.cpp \
       CIMMessageSerializer.cpp \
       CIMMessageDeserializer.cpp \
     CIMMethod.cpp \     CIMMethod.cpp \
     CIMMethodRep.cpp \     CIMMethodRep.cpp \
     CIMName.cpp \     CIMName.cpp \
       CIMNameInline.cpp \
       CIMObject.cpp \
       CIMObjectRep.cpp \
       CIMObjectPath.cpp \
       Cimom.cpp \
       CimomMessage.cpp \
     CIMParameter.cpp \     CIMParameter.cpp \
     CIMParameterRep.cpp \     CIMParameterRep.cpp \
       CIMParamValue.cpp \
       CIMParamValueRep.cpp \
     CIMProperty.cpp \     CIMProperty.cpp \
       CIMPropertyList.cpp \
     CIMPropertyRep.cpp \     CIMPropertyRep.cpp \
     CIMQualifier.cpp \     CIMQualifier.cpp \
     CIMQualifierDecl.cpp \     CIMQualifierDecl.cpp \
Line 47 
Line 112 
     CIMQualifierList.cpp \     CIMQualifierList.cpp \
     CIMQualifierNames.cpp \     CIMQualifierNames.cpp \
     CIMQualifierRep.cpp \     CIMQualifierRep.cpp \
     CIMReference.cpp \  
     CIMScope.cpp \     CIMScope.cpp \
       CIMStatusCode.cpp \
     CIMType.cpp \     CIMType.cpp \
     CIMValue.cpp \     CIMValue.cpp \
     CIMIndication.cpp \      CIMValueInline.cpp \
     CIMOMHandle.cpp \      Config.cpp \
     DeclContext.cpp \     DeclContext.cpp \
     Destroyer.cpp \  
     Dir.cpp \     Dir.cpp \
       List.cpp \
       AsyncQueue.cpp \
       IDFactory.cpp \
       AuditLogger.cpp \
       Magic.cpp
   
   SOURCES2 = \
       DynamicLibrary.cpp \
     Exception.cpp \     Exception.cpp \
       InternalException.cpp \
     FileSystem.cpp \     FileSystem.cpp \
     Formatter.cpp \     Formatter.cpp \
     HashTable.cpp \     HashTable.cpp \
       HTTPAcceptor.cpp \
       HTTPConnection.cpp \
       HTTPConnector.cpp  \
       HTTPMessage.cpp \
     Indentor.cpp \     Indentor.cpp \
       IndicationFormatter.cpp \
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
       Message.cpp \
       MessageQueue.cpp \
       MessageQueueService.cpp \
       ModuleController.cpp \
       Monitor.cpp \
       Mutex.cpp \
       ObjectNormalizer.cpp \
       OperationContext.cpp \
       OperationContextInternal.cpp \
       OptionManager.cpp \
       Packer.cpp \
     Pair.cpp \     Pair.cpp \
     Queue.cpp \      QueryExpressionRep.cpp \
     TraceFileHandler.cpp \      Resolver.cpp \
     Tracer.cpp \      ResponseHandler.cpp \
     Selector.cpp \      ResponseHandlerRep.cpp \
     Service.cpp \  
     Sharable.cpp \     Sharable.cpp \
       Signal.cpp \
       Socket.cpp \
       SpinLock.cpp \
     Stack.cpp \     Stack.cpp \
       StatisticalData.cpp \
     Stopwatch.cpp \     Stopwatch.cpp \
     String.cpp \     String.cpp \
       StringInline.cpp \
     System.cpp \     System.cpp \
     TCPChannel.cpp \  
     TimeValue.cpp \     TimeValue.cpp \
       SSLContext.cpp \
       SSLContextManager.cpp \
       TLS.cpp \
       TraceFileHandler.cpp \
       Tracer.cpp \
       Thread.cpp \
       ThreadPool.cpp \
     Union.cpp \     Union.cpp \
     XmlParser.cpp \     XmlParser.cpp \
     XmlReader.cpp \     XmlReader.cpp \
       XmlStreamer.cpp \
     XmlWriter.cpp \     XmlWriter.cpp \
     CGIQueryString.cpp      MofWriter.cpp \
       CommonUTF.cpp \
       Constants.cpp \
       HostAddress.cpp \
       HostLocator.cpp
  
 ##  ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
 ## Took these out again. They broke the NT build.    SOURCES2 += PaseCcsid.cpp
 ##  endif
 ifdef PEGASUS_CONCURRENT  
 SOURCES +=  IPC.cpp DQueue.cpp Thread.cpp MT_MessageQueue.cpp  SOURCES_SLP = Attribute.cpp \
       CIMServerDescription.cpp
   
   SOURCES_SECURITY_ZOS = MustStayCleanzOS.c
   ifeq ($(PEGASUS_ENABLE_SLP),true)
     SOURCES2 += $(SOURCES_SLP)
   endif
   
   ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
     SOURCES2 += LoadAndClearWord_HPUX_PARISC_ACC.s
   endif
   
   SOURCES = $(SOURCES1) $(SOURCES2)
   
   ifdef PEGASUS_HAS_SSL
     ifeq ($(OS_TYPE),windows)
       SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
     else
       ifdef OPENSSL_HOME
         EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib
       endif
       EXTRA_LIBRARIES += -lssl -lcrypto
     endif
   endif
   
   ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
     ifdef PEGASUS_ZOS_SECURITY
       SOURCES += $(SOURCES_SECURITY_ZOS)
     endif
 endif endif
  
 SYS_LIBS = ws2_32.lib advapi32.lib  ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
     AIX_LIB_PRIORITY=-20
   endif
   
   ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
     AIX_LIB_PRIORITY=-20
   endif
   
   # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6.
   ifeq ($(OS_TYPE),windows)
     SYS_LIBS += ws2_32.lib advapi32.lib netapi32.lib
     ifdef PEGASUS_WINDOWS_SDK_HOME
       FLAGS += -DPEGASUS_WINDOWS_SDK_HOME
       SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib
     else
        ifneq ($(CL_MAJOR_VERSION), 12)
       SYS_LIBS += secur32.lib
        endif
     endif
   endif
  
 include $(ROOT)/mak/library.mak include $(ROOT)/mak/library.mak
   # DO NOT DELETE

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