(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.24

version 1.11.14.1, 2003/08/13 19:39:49 version 1.24, 2008/12/01 17:49:05
Line 1 
Line 1 
   #//%LICENSE////////////////////////////////////////////////////////////////
   #//
   #// Licensed to The Open Group (TOG) under one or more contributor license
   #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
   #// this work for additional information regarding copyright ownership.
   #// Each contributor licenses this file to you under the OpenPegasus Open
   #// Source License; you may not use this file except in compliance with the
   #// License.
   #//
   #// 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 38 
  
 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 51 
 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 36 
Line 72 
 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)  ifeq ($(OS_TYPE),vms)
 include $(ROOT)/mak/library-nsk.mak   include $(ROOT)/mak/library-vms.mak
 endif endif
  
 ################################################################################ ################################################################################
Line 71 
Line 107 
 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.24

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2