(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.147.2.3 and 1.177.2.4

version 1.147.2.3, 2006/07/28 21:28:57 version 1.177.2.4, 2009/09/03 14:25:35
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
  
 # SSL support  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
   FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE      ifdef OPENSSL_HOME
   SYS_INCLUDES += -I$(OPENSSL_HOME)/include   SYS_INCLUDES += -I$(OPENSSL_HOME)/include
 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)
       LIBRARIES = ILEWrapperUtils
   endif
   
 ## ##
 ## CAUTION: the source files are divided evenly (more or less) between SOURCES1 ## CAUTION: the source files are divided evenly (more or less) between SOURCES1
 ## and SOURCES2. This avoids a command line buffer overflow on Windows 2000 ## and SOURCES2. This avoids a command line buffer overflow on Windows 2000
Line 52 
Line 61 
 ## ##
  
 SOURCES1 = \ SOURCES1 = \
       Print.cpp \
       Executor.cpp \
       CIMError.cpp \
       PropertyAccessor.cpp \
       Once.cpp \
     Time.cpp \     Time.cpp \
     Threads.cpp \     Threads.cpp \
     TSDKey.cpp \     TSDKey.cpp \
     Semaphore.cpp \     Semaphore.cpp \
     ReadWriteSem.cpp \     ReadWriteSem.cpp \
     TSD.cpp \  
     Condition.cpp \     Condition.cpp \
     AnonymousPipe.cpp \     AnonymousPipe.cpp \
     Array.cpp \     Array.cpp \
Line 82 
Line 95 
     CIMInstance.cpp \     CIMInstance.cpp \
     CIMInstanceRep.cpp \     CIMInstanceRep.cpp \
     CIMMessage.cpp \     CIMMessage.cpp \
     CIMMessageSerializer.cpp \  
     CIMMessageDeserializer.cpp \  
     CIMMethod.cpp \     CIMMethod.cpp \
     CIMMethodRep.cpp \     CIMMethodRep.cpp \
     CIMName.cpp \     CIMName.cpp \
Line 117 
Line 128 
     List.cpp \     List.cpp \
     AsyncQueue.cpp \     AsyncQueue.cpp \
     IDFactory.cpp \     IDFactory.cpp \
       AuditLogger.cpp \
     Magic.cpp     Magic.cpp
  
 SOURCES2 = \ SOURCES2 = \
Line 125 
Line 137 
     InternalException.cpp \     InternalException.cpp \
     FileSystem.cpp \     FileSystem.cpp \
     Formatter.cpp \     Formatter.cpp \
       Guid.cpp \
     HashTable.cpp \     HashTable.cpp \
     HTTPAcceptor.cpp \     HTTPAcceptor.cpp \
     HTTPConnection.cpp \     HTTPConnection.cpp \
     HTTPConnector.cpp  \     HTTPConnector.cpp  \
     HTTPMessage.cpp \     HTTPMessage.cpp \
     Indentor.cpp \  
     IndicationFormatter.cpp \     IndicationFormatter.cpp \
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
Line 158 
Line 170 
     StatisticalData.cpp \     StatisticalData.cpp \
     Stopwatch.cpp \     Stopwatch.cpp \
     String.cpp \     String.cpp \
       StringConversion.cpp \
     StringInline.cpp \     StringInline.cpp \
     System.cpp \     System.cpp \
     TimeValue.cpp \     TimeValue.cpp \
Line 165 
Line 178 
     SSLContextManager.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 \
     Union.cpp \     Union.cpp \
       XmlGenerator.cpp \
     XmlParser.cpp \     XmlParser.cpp \
     XmlReader.cpp \     XmlReader.cpp \
     XmlStreamer.cpp \     XmlStreamer.cpp \
     XmlWriter.cpp \     XmlWriter.cpp \
     MofWriter.cpp \     MofWriter.cpp \
     CommonUTF.cpp      CommonUTF.cpp \
       Constants.cpp \
       HostAddress.cpp \
       HostLocator.cpp \
       BinaryCodec.cpp \
       CIMBuffer.cpp \
       VersionUtil.cpp
   
   ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
       SOURCES2 += PaseCcsid.cpp
   endif
  
 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 186 
Line 214 
   SOURCES2 += LoadAndClearWord_HPUX_PARISC_ACC.s   SOURCES2 += LoadAndClearWord_HPUX_PARISC_ACC.s
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),true)
       SOURCES2 += CIMBinMsgSerializer.cpp
       SOURCES2 += CIMBinMsgDeserializer.cpp
   else
       SOURCES2 += CIMMessageSerializer.cpp
       SOURCES2 += CIMMessageDeserializer.cpp
   endif
   
 SOURCES = $(SOURCES1) $(SOURCES2) SOURCES = $(SOURCES1) $(SOURCES2)
  
 ifeq ($(OS),linux)  
   EXTRA_LIBRARIES += -lcrypt  
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto      ifeq ($(OS_TYPE),windows)
           SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
       else
           ifeq ($(OS_TYPE), vms)
               EXTRA_LIBRARIES += -L$(OPENSSL_LIB) \
                   -lssl$$libssl_shr32 -lssl$$libcrypto_shr32
           else
               ifdef OPENSSL_HOME
                   EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib
   endif   endif
               EXTRA_LIBRARIES += -lssl -lcrypto
 endif endif
   
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  
   ifdef PEGASUS_HAS_SSL  
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto  
   endif   endif
 endif endif
  
   ifeq ($(OS_TYPE),vms)
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)      ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),false)
 AIX_LIB_PRIORITY=-20          SYS_LIBS += tcpip$$library:tcpip$$lib/lib
   ifdef PEGASUS_HAS_SSL          LIBRARIES = vms/include=(vms_crtl_init)
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto          LINK_OPT1 = COLLECT=crtl_init,lib$$initializdz,lib$$initializd_,
           LINK_OPT2 = lib$$initialize,lib$$initialize$$
           LINKER_OPTIONS = $(LINK_OPT1)$(LINK_OPT2)
   endif   endif
 endif endif
  
 ifeq ($(OS),HPUX)  ifeq ($(OS),zos)
   ifdef PEGASUS_HAS_SSL      ifdef PEGASUS_ZOS_SECURITY
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto          SOURCES += $(SOURCES_SECURITY_ZOS)
   endif   endif
       SOURCES2 += Audit_zOS_SMF.cpp \
           PegasusAssertZOS.cpp
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)  ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
   ifdef PEGASUS_HAS_SSL      AIX_LIB_PRIORITY=-20
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto  
   endif  
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
   ifdef PEGASUS_HAS_SSL      AIX_LIB_PRIORITY=-20
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto  
   endif  
 endif endif
  
 # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6. # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6.
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  ifeq ($(OS_TYPE),windows)
   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib      SYS_LIBS += ole32.lib ws2_32.lib advapi32.lib netapi32.lib
   ifdef PEGASUS_HAS_SSL  
     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib  
   endif  
   ifdef PEGASUS_WINDOWS_SDK_HOME   ifdef PEGASUS_WINDOWS_SDK_HOME
     FLAGS += -DPEGASUS_WINDOWS_SDK_HOME     FLAGS += -DPEGASUS_WINDOWS_SDK_HOME
     SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib     SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib
Line 243 
Line 279 
   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.147.2.3  
changed lines
  Added in v.1.177.2.4
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2