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

Diff for /pegasus/mak/program-unix.mak between version 1.3 and 1.6

version 1.3, 2001/12/25 04:22:41 version 1.6, 2002/08/02 11:31:48
Line 8 
Line 8 
  
 EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM) EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM)
  
   ifdef PEGASUS_PURIFY
       PUREOPTIONS = -follow-child-processes=yes -locking=no \
           -always-use-cache-dir -cache-dir=$(PURIFY_TMP)/cache \
           -view-file=$(PURIFY_TMP)/$(PROGRAM).pv \
           -log-file=$(PURIFY_TMP)/$(PROGRAM).log
       LINK_WRAPPER = $(PURIFY_HOME)/purify $(PUREOPTIONS)
       SYS_LIBS += $(PURIFY_HOME)/libpurify_stubs.a
   endif
   
 $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR) $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)
 ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes) ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
  
Line 23 
Line 32 
          ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)          ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)         $(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
          else          else
                ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
           $(LINK_WRAPPER) $(CXX) -Wl,-brtl $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
                else
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)         $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
          endif          endif
      endif      endif
        endif
  
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)


Legend:
Removed from v.1.3  
changed lines
  Added in v.1.6

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2