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

Diff for /pegasus/mak/depend-unix.mak between version 1.16 and 1.17

version 1.16, 2007/11/09 18:50:21 version 1.17, 2007/11/14 20:19:43
Line 30 
Line 30 
 #//============================================================================== #//==============================================================================
 DEPEND_MAK = $(OBJ_DIR)/depend.mak DEPEND_MAK = $(OBJ_DIR)/depend.mak
  
   ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)
     SOURCES_NO_ASM = $(patsubst %.s,,$(SOURCES))
   else
     SOURCES_NO_ASM = $(SOURCES)
   endif
   
 ifeq ($(CXX), g++) ifeq ($(CXX), g++)
     PEGASUS_CXX_MAKEDEPEND_OPTION = -M     PEGASUS_CXX_MAKEDEPEND_OPTION = -M
 endif endif
 ifeq ($(CXX), CC) ifeq ($(CXX), CC)
     PEGASUS_CXX_MAKEDEPEND_OPTION = -xM1     PEGASUS_CXX_MAKEDEPEND_OPTION = -xM1
 endif endif
   ifeq ($(CXX), aCC)
       PEGASUS_CXX_MAKEDEPEND_OPTION = +make -E
   endif
  
 ifdef PEGASUS_CXX_MAKEDEPEND_OPTION ifdef PEGASUS_CXX_MAKEDEPEND_OPTION
 depend: $(OBJ_DIR)/target $(ERROR) depend: $(OBJ_DIR)/target $(ERROR)
         $(CXX) $(PEGASUS_CXX_MAKEDEPEND_OPTION) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $(SOURCES) | sed -e 's=^\(.*:\)='$(OBJ_DIR)'/\1=' > $(DEPEND_MAK)          $(CXX) $(PEGASUS_CXX_MAKEDEPEND_OPTION) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $(SOURCES_NO_ASM) | sed -e 's=^\(.*:\)='$(OBJ_DIR)'/\1=' > $(DEPEND_MAK)
  
 else else
 ifdef PEGASUS_HAS_MAKEDEPEND ifdef PEGASUS_HAS_MAKEDEPEND
Line 47 
Line 56 
  
 depend: $(OBJ_DIR)/target $(ERROR) depend: $(OBJ_DIR)/target $(ERROR)
         touch $(DEPEND_MAK)         touch $(DEPEND_MAK)
         makedepend -v $(LOCAL_DEFINES) $(DEFINES) $(DEPEND_DEFINES) $(PRE_DEPEND_INCLUDES) $(DEPEND_INCLUDES) $(INCLUDES) $(SOURCES) -f $(DEPEND_MAK) -p $(OBJ_DIR)/          makedepend -v $(LOCAL_DEFINES) $(DEFINES) $(DEPEND_DEFINES) $(PRE_DEPEND_INCLUDES) $(DEPEND_INCLUDES) $(INCLUDES) $(SOURCES_NO_ASM) -f $(DEPEND_MAK) -p $(OBJ_DIR)/
 else else
 depend: $(OBJ_DIR)/target $(ERROR) depend: $(OBJ_DIR)/target $(ERROR)
         mu depend -O$(OBJ_DIR) $(INCLUDES) $(SOURCES) > $(DEPEND_MAK)          mu depend -O$(OBJ_DIR) $(INCLUDES) $(SOURCES_NO_ASM) > $(DEPEND_MAK)
 endif endif
 endif endif
  


Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2