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

version 1.174, 2008/11/18 19:56:40 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
Line 63 
Line 61 
 ## ##
  
 SOURCES1 = \ SOURCES1 = \
       Print.cpp \
     Executor.cpp \     Executor.cpp \
     CIMError.cpp \     CIMError.cpp \
     PropertyAccessor.cpp \     PropertyAccessor.cpp \
Line 138 
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 \
Line 193 
Line 193 
     CommonUTF.cpp \     CommonUTF.cpp \
     Constants.cpp \     Constants.cpp \
     HostAddress.cpp \     HostAddress.cpp \
     HostLocator.cpp      HostLocator.cpp \
       BinaryCodec.cpp \
       CIMBuffer.cpp \
       VersionUtil.cpp
  
 ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX) ifeq ($(PEGASUS_PLATFORM),PASE_ISERIES_IBMCXX)
     SOURCES2 += PaseCcsid.cpp     SOURCES2 += PaseCcsid.cpp
Line 211 
Line 214 
     SOURCES2 += LoadAndClearWord_HPUX_PARISC_ACC.s     SOURCES2 += LoadAndClearWord_HPUX_PARISC_ACC.s
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_INTERNAL_BINARY_PROTOCOL),true)  ifeq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),true)
     SOURCES2 += CIMBuffer.cpp  
     SOURCES2 += CIMBinMsgSerializer.cpp     SOURCES2 += CIMBinMsgSerializer.cpp
     SOURCES2 += CIMBinMsgDeserializer.cpp     SOURCES2 += CIMBinMsgDeserializer.cpp
 else else
Line 266 
Line 268 
  
 # 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 ($(OS_TYPE),windows) 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_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


Legend:
Removed from v.1.174  
changed lines
  Added in v.1.177.2.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2