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

Diff for /pegasus/mak/library-unix.mak between version 1.63 and 1.67.2.1

version 1.63, 2005/10/11 11:51:44 version 1.67.2.1, 2006/07/28 18:07:29
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 50 
Line 52 
 ifeq ($(COMPILER),acc) ifeq ($(COMPILER),acc)
   LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)   LINK_COMMAND = $(CXX) -b -Wl,+hlib$(LIBRARY)$(LIB_SUFFIX)
   ifeq ($(PEGASUS_PLATFORM), HPUX_IA64_ACC)   ifeq ($(PEGASUS_PLATFORM), HPUX_IA64_ACC)
     LINK_COMMAND += +DD64 -mt      LINK_COMMAND += +DD64 -mt -Wl,+rpathfirst
   else   else
     LINK_COMMAND += -Wl,-Bsymbolic     LINK_COMMAND += -Wl,-Bsymbolic
   endif   endif
Line 78 
Line 80 
 ifeq ($(COMPILER),gnu) ifeq ($(COMPILER),gnu)
   ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)   ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
    ifdef PEGASUS_USE_RELEASE_DIRS    ifdef PEGASUS_USE_RELEASE_DIRS
       LINK_COMMAND = $(CXX) -shared        LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR)
    else    else
       LINK_COMMAND = $(CXX) -shared        LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)       LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
    endif    endif
   else   else
Line 102 
Line 104 
  
 ifeq ($(COMPILER),ibm) ifeq ($(COMPILER),ibm)
   LINK_COMMAND = $(CXX) $(FLAGS)   LINK_COMMAND = $(CXX) $(FLAGS)
   LINK_ARGUMENTS = -W "l,XPLINK,dll"    LINK_ARGUMENTS = -W "l,XPLINK,dll,EDIT=NO"
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
Line 110 
Line 112 
   LINK_COMMAND = CC   LINK_COMMAND = CC
   LINK_ARGUMENTS = -G -KPIC -mt -h lib$(LIBRARY).so   LINK_ARGUMENTS = -G -KPIC -mt -h lib$(LIBRARY).so
   LINK_OUT = -o   LINK_OUT = -o
     EXTRA_LIBRARIES += $(LIBRARY_SYS_LIBS)
 endif endif
  
 ifdef EXTRA_LINK_FLAGS ifdef EXTRA_LINK_FLAGS

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