(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.12 and 1.24

version 1.12, 2001/07/16 22:28:06 version 1.24, 2002/04/23 01:30:35
Line 1 
Line 1 
   
 ifeq ($(COMPILER),xlc) ifeq ($(COMPILER),xlc)
   LINK_COMMAND = makeC++SharedLib    LINK_COMMAND = makeC++SharedLib_r
   LINK_ARGUMENTS = -p 0   LINK_ARGUMENTS = -p 0
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
 ifeq ($(COMPILER),acc) ifeq ($(COMPILER),acc)
   LINK_COMMAND = aCC -b   LINK_COMMAND = aCC -b
     ifdef PEGASUS_PURIFY
       PUREOPTIONS = -follow-child-processes=yes -locking=no \
                     -always-use-cache-dir -cache-dir=/tmp/cache \
                     -view-file=/tmp/cimserver.pv -log-file=/tmp/cimserver.log
       LINK_COMMAND = $(PURIFY_HOME)/purify $(PUREOPTIONS) aCC -b
       FULL_LIBRARIES += $(PURIFY_HOME)/libpurify_stubs.a
     endif
     ifeq ($(HPUX_IA64_VERSION), yes)
       LINK_COMMAND += +DD64 -mt
     endif
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
     LINK_COMMAND += -Wl,+b/usr/lib -Wl,+s      LINK_COMMAND += -Wl,+s -Wl,+b/opt/wbem/lib
   endif   endif
   ifdef PEGASUS_DEBUG   ifdef PEGASUS_DEBUG
     LINK_COMMAND += -g     LINK_COMMAND += -g
   endif   endif
     ifdef PEGASUS_CCOVER
       FULL_LIBRARIES += $(CCOVER_LIB)/libcov.a
     endif
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
Line 29 
Line 41 
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
  
   ifeq ($(COMPILER),ibm)
     LINK_COMMAND = c++ $(FLAGS)
     LINK_ARGUMENTS =
     LINK_OUT = -o
   endif
   
 FULL_LIB=$(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) FULL_LIB=$(LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX)
  
 ## Rule for all UNIX library builds ## Rule for all UNIX library builds
 $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(LIBRARIES) $(ERROR)  $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) \
 ifneq ($(COMPILER),xlc)      $(ERROR)
   ## Actions for all UNIX compilers except xlc  
   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)   ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
     ## To generate shared libraries which will cause dynamic     ## To generate shared libraries which will cause dynamic
     ## search of other shared libraries which they reference,     ## search of other shared libraries which they reference,
Line 43 
Line 60 
     ## libraries.mak file that includes this file     ## libraries.mak file that includes this file
     ##     ##
         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT)$(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES)         $(LINK_COMMAND) $(LINK_ARGUMENTS) -L$(LIB_DIR) $(LINK_OUT)$(FULL_LIB) $(OBJECTS) $(DYNAMIC_LIBRARIES)
   else  
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)      ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
         ## z/OS needs side definition files to link executables to
         ## dynamic libraries, so we have to copy them into the lib_dir
           touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x
           cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)
   endif   endif
 else else
   ## Actions for xlc compiler only          $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES)
         ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(LIBRARIES)  
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT)$(FULL_LIB) $(PEGASUS_PLATFORM).lib  
         rm -f $(PEGASUS_PLATFORM).lib  
 endif endif
           $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
  
 clean-lib: $(ERROR) clean-lib: $(ERROR)


Legend:
Removed from v.1.12  
changed lines
  Added in v.1.24

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2