(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.1.2.1 and 1.10

version 1.1.2.1, 2001/10/28 20:39:22 version 1.10, 2003/06/06 16:18:24
Line 8 
Line 8 
  
 EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM) EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM)
  
 $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(LIBRARIES) $(ERROR)  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)
 ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes) ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
  
 ## ##
Line 21 
Line 30 
         $(LINK_WRAPPER) $(CXX) $(PR_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)         $(LINK_WRAPPER) $(CXX) $(PR_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
      else      else
          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 -shared -XLinker -rdynamic -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
        else
            ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
           $(LINK_WRAPPER) $(CXX) $(FLAGS) -Xlinker -rpath -XLinker -shared -XLinker -rdynamic -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
            else
                ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
           $(LINK_WRAPPER) $(CXX) -Wl,-brtl -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
          else          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
        endif
  
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)
 else else
         $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS)
 endif endif
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)


Legend:
Removed from v.1.1.2.1  
changed lines
  Added in v.1.10

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2