(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.6 and 1.155.4.2

version 1.147.2.6, 2006/07/30 22:51:02 version 1.155.4.2, 2007/06/18 09:10:40
Line 27 
Line 27 
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION #// 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. #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #// #//
 #//==============================================================================  #//=============================================================================
 ROOT = ../../.. ROOT = ../../..
  
 DIR = Pegasus/Common DIR = Pegasus/Common
Line 52 
Line 52 
 ## ##
  
 SOURCES1 = \ SOURCES1 = \
       Executor.cpp \
       CIMError.cpp \
       PropertyAccessor.cpp \
     Once.cpp \     Once.cpp \
     Time.cpp \     Time.cpp \
     Threads.cpp \     Threads.cpp \
Line 117 
Line 120 
     List.cpp \     List.cpp \
     AsyncQueue.cpp \     AsyncQueue.cpp \
     IDFactory.cpp \     IDFactory.cpp \
       AuditLogger.cpp \
     Magic.cpp     Magic.cpp
  
 SOURCES2 = \ SOURCES2 = \
Line 174 
Line 178 
     XmlStreamer.cpp \     XmlStreamer.cpp \
     XmlWriter.cpp \     XmlWriter.cpp \
     MofWriter.cpp \     MofWriter.cpp \
     CommonUTF.cpp      CommonUTF.cpp \
       Constants.cpp \
       HostAddress.cpp \
       HostLocator.cpp
  
 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 200 
Line 208 
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
   endif   endif
     ifdef PEGASUS_ZOS_SECURITY
       SOURCES += $(SOURCES_SECURITY_ZOS)
     endif
 endif endif
  
  
Line 229 
Line 240 
 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 = 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

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