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

Diff for /pegasus/mak/library.mak between version 1.17 and 1.20.2.1

version 1.17, 2005/05/12 15:27:28 version 1.20.2.1, 2006/06/13 17:25:31
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// 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 38 
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 47 
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)
 CPP_OBJECTS = $(TMP_OBJECTS:.cpp=.obj)  S_OBJECTS = $(TMP_OBJECTS:.s=.obj)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.obj)
 OBJECTS = $(CPP_OBJECTS:.c=.obj) OBJECTS = $(CPP_OBJECTS:.c=.obj)
 else else
 CPP_OBJECTS = $(TMP_OBJECTS:.cpp=.o)  S_OBJECTS = $(TMP_OBJECTS:.s=.o)
   CPP_OBJECTS = $(S_OBJECTS:.cpp=.o)
 OBJECTS = $(CPP_OBJECTS:.c=.o) OBJECTS = $(CPP_OBJECTS:.c=.o)
 endif endif
  
Line 104 
Line 112 
 tests: $(ERROR) tests: $(ERROR)
  
 #l10n #l10n
 messages: $(ERROR)  
  
 poststarttests: $(ERROR) poststarttests: $(ERROR)
  

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