(file) Return to config-linux.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config-linux.mak between version 1.39.2.1 and 1.40

version 1.39.2.1, 2006/02/10 16:09:05 version 1.40, 2006/01/19 05:36:42
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%2005////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// 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 copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 53 
Line 51 
  
 # Enable CMPI by default. # Enable CMPI by default.
 # #
 ifndef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER  PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true  
 endif  
  
 ######################################################################### #########################################################################
  
Line 113 
Line 109 
  
 endif endif
  
 FLAGS += -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  
  
 ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
   FLAGS += -g  FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
 else else
   FLAGS += -s  FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s
   #  
   # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably  
   # appeared in the 3.0 series of compilers.  
   #  
   ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)  
     EXTRA_CXX_FLAGS += -fno-enforce-eh-specs     EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
   endif  
   ifdef PEGASUS_OPTIMIZE_FOR_SIZE   ifdef PEGASUS_OPTIMIZE_FOR_SIZE
     FLAGS += -Os     FLAGS += -Os
   else   else
Line 133 
Line 122 
   endif   endif
 endif endif
  
 FLAGS += $(CXX_MACHINE_OPTIONS)  
   
 ifdef PEGASUS_ENABLE_GCOV  
   FLAGS += -ftest-coverage -fprofile-arcs  
   SYS_LIBS += -lgcc -lgcov  
   EXTRA_LIBRARIES += -lgcc -lgcov  
 endif  
   
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif

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