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

Diff for /pegasus/mak/objects-unix.mak between version 1.14 and 1.17

version 1.14, 2006/01/24 19:44:18 version 1.17, 2006/11/17 18:53:11
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 37 
Line 39 
 ################################################################################ ################################################################################
  
 ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU) ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
 GCC_VERSION=$(word 3, $(shell $(CXX) --version))  
 ifneq ($(GCC_VERSION), 2.9.5) ifneq ($(GCC_VERSION), 2.9.5)
     _NO_TMP_O=yes     _NO_TMP_O=yes
 endif endif
Line 49 
Line 50 
  
  
 ifeq ($(_NO_TMP_O), yes) ifeq ($(_NO_TMP_O), yes)
 $(OBJ_DIR)/%.o: %.cpp $(ERROR)  $(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.cpp $(ERROR)
         $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp         $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp
         @ $(TOUCH) $@         @ $(TOUCH) $@
         @ $(ECHO)         @ $(ECHO)
Line 63 
Line 64 
 endif endif
  
 ifeq ($(_NO_TMP_O), yes) ifeq ($(_NO_TMP_O), yes)
 $(OBJ_DIR)/%.o: %.c $(ERROR)  $(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.c $(ERROR)
         $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c         $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c
         @ $(TOUCH) $@         @ $(TOUCH) $@
         @ $(ECHO)         @ $(ECHO)
Line 77 
Line 78 
 endif endif
  
 ifeq ($(_NO_TMP_O), yes) ifeq ($(_NO_TMP_O), yes)
 $(OBJ_DIR)/%.o: %.s $(ERROR)  $(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.s $(ERROR)
         $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s         $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
         @ $(TOUCH) $@         @ $(TOUCH) $@
         @ $(ECHO)         @ $(ECHO)

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