(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.16 and 1.20

version 1.16, 2001/12/25 04:22:41 version 1.20, 2002/03/13 20:44:46
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
Line 8 
Line 8 
 ifeq ($(COMPILER),acc) ifeq ($(COMPILER),acc)
   LINK_COMMAND = aCC -b   LINK_COMMAND = aCC -b
   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
     FULL_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 43 
Line 43 
 ## Rule for all UNIX library builds ## Rule for all UNIX library builds
 $(FULL_LIB): $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_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 63 
Line 61 
   else   else
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES)         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT) $(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES)
   endif   endif
 else  
         ar crv $(PEGASUS_PLATFORM).lib $(OBJECTS) $(FULL_LIBRARIES)  
         $(LINK_COMMAND) $(LINK_ARGUMENTS) $(LINK_OUT)$(FULL_LIB) $(PEGASUS_PLATFORM).lib  
         rm -f $(PEGASUS_PLATFORM).lib  
 endif  
         $(TOUCH) $(FULL_LIB)         $(TOUCH) $(FULL_LIB)
         @ $(ECHO)         @ $(ECHO)
  

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