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

version 1.15, 2001/12/13 14:53:31 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   ifdef PEGASUS_CCOVER
     LIBRARIES += $(CCOVER_LIB)/libcov-PIC.a      FULL_LIBRARIES += $(CCOVER_LIB)/libcov.a
   endif   endif
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
Line 33 
Line 42 
 endif endif
  
 ifeq ($(COMPILER),ibm) ifeq ($(COMPILER),ibm)
   LINK_COMMAND = c++ -W l,dll -W c,dll,expo    LINK_COMMAND = c++ $(FLAGS)
   LINK_ARGUMENTS =   LINK_ARGUMENTS =
   LINK_OUT = -o   LINK_OUT = -o
 endif endif
Line 41 
Line 50 
 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) \  $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) \
     $(ERROR)     $(ERROR)
 ifneq ($(COMPILER),xlc)  
   ## 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 57 
Line 64 
     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)     ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
       ## z/OS needs side definition files to link executables to       ## z/OS needs side definition files to link executables to
       ## dynamic libraries, so we have to copy them into the lib_dir       ## dynamic libraries, so we have to copy them into the lib_dir
         $(COPY) $(ROOT)/src/$(DIR)/*.x $(LIB_DIR)          touch $(ROOT)/src/$(DIR)/lib$(LIBRARY).x
     endif          cp $(ROOT)/src/$(DIR)/lib$(LIBRARY).x $(LIB_DIR)
   
   else  
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(LIBRARIES)  
   endif   endif
 else else
         ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(LIBRARIES)          $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES)
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT)$(FULL_LIB) $(PEGASUS_PLATFORM).lib  
         rm -f $(PEGASUS_PLATFORM).lib  
 endif endif
         $(TOUCH) $(FULL_LIB)         $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2