(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.115 and 1.128.2.1

version 1.115, 2004/09/27 18:33:44 version 1.128.2.1, 2005/09/28 02:07:30
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// 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.
   #//
   #// 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
Line 12 
Line 40 
  
 LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY LOCAL_DEFINES = -DPEGASUS_COMMON_INTERNAL -DPEGASUS_INTERNALONLY
  
   #LOCAL_DEFINES += -DPEGASUS_STRING_ENABLE_ICU
   #LOCAL_DEFINES += -DPEGASUS_STRING_NO_UTF8
   #LOCAL_DEFINES += -DPEGAUS_STRING_NO_THROW
   
 LIBRARY = pegcommon LIBRARY = pegcommon
  
 SOURCES = \ SOURCES = \
       CharSet.cpp \
       Atomic.cpp \
     AnonymousPipe.cpp \     AnonymousPipe.cpp \
     Array.cpp \     Array.cpp \
     AsyncOpNode.cpp \     AsyncOpNode.cpp \
Line 32 
Line 66 
     AcceptLanguages.cpp \     AcceptLanguages.cpp \
     ContentLanguages.cpp \     ContentLanguages.cpp \
     MessageLoader.cpp \     MessageLoader.cpp \
     CGIQueryString.cpp \  
     Char16.cpp \     Char16.cpp \
       Char16Inline.cpp \
     CIMClass.cpp \     CIMClass.cpp \
     CIMClassRep.cpp \     CIMClassRep.cpp \
     CIMDateTime.cpp \     CIMDateTime.cpp \
     CIMFlavor.cpp \     CIMFlavor.cpp \
     CIMIndication.cpp \  
     CIMInstance.cpp \     CIMInstance.cpp \
     CIMInstanceRep.cpp \     CIMInstanceRep.cpp \
     CIMMessage.cpp \     CIMMessage.cpp \
Line 47 
Line 80 
     CIMMethod.cpp \     CIMMethod.cpp \
     CIMMethodRep.cpp \     CIMMethodRep.cpp \
     CIMName.cpp \     CIMName.cpp \
       CIMNameInline.cpp \
     CIMObject.cpp \     CIMObject.cpp \
     CIMObjectRep.cpp \     CIMObjectRep.cpp \
     CIMObjectPath.cpp \     CIMObjectPath.cpp \
Line 71 
Line 105 
     CIMValue.cpp \     CIMValue.cpp \
     Config.cpp \     Config.cpp \
     DeclContext.cpp \     DeclContext.cpp \
     Destroyer.cpp \  
     Dir.cpp \     Dir.cpp \
     DQueue.cpp \     DQueue.cpp \
     DynamicLibrary.cpp \     DynamicLibrary.cpp \
Line 85 
Line 118 
     HTTPConnector.cpp  \     HTTPConnector.cpp  \
     HTTPMessage.cpp \     HTTPMessage.cpp \
     Indentor.cpp \     Indentor.cpp \
       IndicationFormatter.cpp \
     IPC.cpp \     IPC.cpp \
     Logger.cpp \     Logger.cpp \
     Memory.cpp \     Memory.cpp \
Line 97 
Line 131 
     OperationContext.cpp \     OperationContext.cpp \
     OperationContextInternal.cpp \     OperationContextInternal.cpp \
     OptionManager.cpp \     OptionManager.cpp \
     pegasus_socket.cpp \      Packer.cpp \
     Pair.cpp \     Pair.cpp \
     QueryExpression.cpp \  
     QueryExpressionRep.cpp \     QueryExpressionRep.cpp \
     Queue.cpp \     Queue.cpp \
     Resolver.cpp \     Resolver.cpp \
Line 112 
Line 145 
     StatisticalData.cpp \     StatisticalData.cpp \
     Stopwatch.cpp \     Stopwatch.cpp \
     String.cpp \     String.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 \
     Tracer.cpp \     Tracer.cpp \
Line 136 
Line 171 
   SOURCES += $(SOURCES_SLP)   SOURCES += $(SOURCES_SLP)
 endif endif
  
   
 ifeq ($(OS),linux) ifeq ($(OS),linux)
   EXTRA_LIBRARIES += -lcrypt   EXTRA_LIBRARIES += -lcrypt
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
Line 177 
Line 211 
   endif   endif
 endif endif
  
   # Note that PEGASUS_WINDOWS_SDK_HOME only needs to be specified if using VC6.
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib     SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib
   endif   endif
     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 endif
  
 include $(ROOT)/mak/library.mak include $(ROOT)/mak/library.mak
 include $(ROOT)/mak/install.mak  
 # DO NOT DELETE # DO NOT DELETE


Legend:
Removed from v.1.115  
changed lines
  Added in v.1.128.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2