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

Diff for /pegasus/mak/library.mak between version 1.11.14.1 and 1.23.20.2

version 1.11.14.1, 2003/08/13 19:39:49 version 1.23.20.2, 2007/10/22 01:30:02
Line 1 
Line 1 
   #//%2006////////////////////////////////////////////////////////////////////////
   #//
   #// 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.
   #// 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
   #// 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.
   #//
   #//==============================================================================
 ifeq ($(PLATFORM_VERSION_SUPPORTED), yes) ifeq ($(PLATFORM_VERSION_SUPPORTED), yes)
   ifdef PLATFORM_COMPONENT_NAME   ifdef PLATFORM_COMPONENT_NAME
      DEFINES += -DPLATFORM_COMPONENT_NAME=\"$(PLATFORM_COMPONENT_NAME)\"      DEFINES += -DPLATFORM_COMPONENT_NAME=\"$(PLATFORM_COMPONENT_NAME)\"
Line 10 
Line 40 
  
 include $(ROOT)/mak/common.mak include $(ROOT)/mak/common.mak
  
   ifdef PEGASUS_EXTRA_LIBRARY_LINK_FLAGS
       EXTRA_LINK_FLAGS += $(PEGASUS_EXTRA_LIBRARY_LINK_FLAGS)
   endif
   
 ################################################################################ ################################################################################
 ## ##
 ## Build list of object names. ## Build list of object names.
Line 19 
Line 53 
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
  
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 OBJECTS = $(TMP_OBJECTS:.cpp=.obj)  S_OBJECTS = $(TMP_OBJECTS:.s=.obj)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.obj)
   OBJECTS = $(CPP_OBJECTS:.c=.obj)
 else else
 OBJECTS = $(TMP_OBJECTS:.cpp=.o)  S_OBJECTS = $(TMP_OBJECTS:.s=.o)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.o)
   OBJECTS = $(CPP_OBJECTS:.c=.o)
 endif endif
  
 ################################################################################ ################################################################################
Line 33 
Line 71 
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 include $(ROOT)/mak/library-windows.mak include $(ROOT)/mak/library-windows.mak
 endif endif
   
 ifeq ($(OS_TYPE),unix) ifeq ($(OS_TYPE),unix)
 include $(ROOT)/mak/library-unix.mak include $(ROOT)/mak/library-unix.mak
 endif endif
 ifeq ($(OS_TYPE),nsk)  
 include $(ROOT)/mak/library-nsk.mak  ifeq ($(OS_TYPE),vms)
    include $(ROOT)/mak/library-vms.mak
   endif
   
   ifeq ($(OS_TYPE),vxworks)
    include $(ROOT)/mak/vxworks/library.mak
 endif endif
  
 ################################################################################ ################################################################################
Line 71 
Line 115 
 tests: $(ERROR) tests: $(ERROR)
  
 #l10n #l10n
   
 messages: $(ERROR) messages: $(ERROR)
  
 poststarttests: $(ERROR) poststarttests: $(ERROR)
   


Legend:
Removed from v.1.11.14.1  
changed lines
  Added in v.1.23.20.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2