(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.10 and 1.15

version 1.10, 2004/03/30 07:50:22 version 1.15, 2006/01/25 20:50:30
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// 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.
   #//
   #// 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.
   #//
   #//==============================================================================
 ################################################################################ ################################################################################
 ## ##
 ## An ugly trick is used here to overcome a bug in g++ 2.9.5. G++ failes to  ## An ugly trick is used here to overcome a bug in g++ v2.9.5. G++ fails to
 ## cleanup object files that are placed in directories other than the ## cleanup object files that are placed in directories other than the
 ## current one (using the -o option). To overcome this bug, we use -o.tmp.o ## current one (using the -o option). To overcome this bug, we use -o.tmp.o
 ## and then move the file to the object directory.  ## and then move the file to the object directory.  Note, this is only done for
   ## v2.9.5 of g++.
 ## ##
 ################################################################################ ################################################################################
  
 ifeq ($(OS),HPUX)  ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
   ifneq ($(GCC_VERSION), 2.9.5)
   _NO_TMP_O = yes   _NO_TMP_O = yes
 endif endif
   else
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)  
   _NO_TMP_O = yes  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  
   _NO_TMP_O = yes   _NO_TMP_O = yes
 endif endif
  
 _TMP_O = $(PEGASUS_PLATFORM).o _TMP_O = $(PEGASUS_PLATFORM).o
  
   
 ifeq ($(_NO_TMP_O), yes) ifeq ($(_NO_TMP_O), yes)
 $(OBJ_DIR)/%.o: %.cpp $(ERROR) $(OBJ_DIR)/%.o: %.cpp $(ERROR)
         $(CXX) -c -o $@ $(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)
 else else
 $(OBJ_DIR)/%.o: %.cpp $(ERROR) $(OBJ_DIR)/%.o: %.cpp $(ERROR)
         $(CXX) -c -o $(_TMP_O) $(FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp          $(CXX) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp
         @ $(COPY) $(_TMP_O) $@         @ $(COPY) $(_TMP_O) $@
         @ $(RM) $(_TMP_O)         @ $(RM) $(_TMP_O)
         @ $(TOUCH) $@         @ $(TOUCH) $@
Line 37 
Line 63 
  
 ifeq ($(_NO_TMP_O), yes) ifeq ($(_NO_TMP_O), yes)
 $(OBJ_DIR)/%.o: %.c $(ERROR) $(OBJ_DIR)/%.o: %.c $(ERROR)
         $(CC) -c -o $@ $(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)
 else else
 $(OBJ_DIR)/%.o: %.c $(ERROR) $(OBJ_DIR)/%.o: %.c $(ERROR)
         $(CC) -c -o $(_TMP_O) $(FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c          $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c
           @ $(COPY) $(_TMP_O) $@
           @ $(RM) $(_TMP_O)
           @ $(TOUCH) $@
           @ $(ECHO)
   endif
   
   ifeq ($(_NO_TMP_O), yes)
   $(OBJ_DIR)/%.o: %.s $(ERROR)
           $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
           @ $(TOUCH) $@
           @ $(ECHO)
   else
   $(OBJ_DIR)/%.o: %.s $(ERROR)
           $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
         @ $(COPY) $(_TMP_O) $@         @ $(COPY) $(_TMP_O) $@
         @ $(RM) $(_TMP_O)         @ $(RM) $(_TMP_O)
         @ $(TOUCH) $@         @ $(TOUCH) $@


Legend:
Removed from v.1.10  
changed lines
  Added in v.1.15

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2