(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.24 and 1.24.12.1

version 1.24, 2012/07/30 09:23:48 version 1.24.12.1, 2013/09/13 10:52:34
Line 34 
Line 34 
   SOURCES_NO_ASM = $(SOURCES)   SOURCES_NO_ASM = $(SOURCES)
 endif endif
  
 ifeq ($(CXX), g++)  ##
   ## test for compiler definition in CXX (g++, clang++, etc. compilers).
   ## Test for compiler type  as substring, not exact because there
   ## are cases where other info exists in CXX (ex. CXX=ccache g++)
   ##
   ifeq ($(findstring g++, $(CXX)), g++)
     PEGASUS_CXX_MAKEDEPEND_OPTION = -M     PEGASUS_CXX_MAKEDEPEND_OPTION = -M
 endif endif
   
 ifeq ($(CXX), clang++) ifeq ($(CXX), clang++)
     PEGASUS_CXX_MAKEDEPEND_OPTION = -M     PEGASUS_CXX_MAKEDEPEND_OPTION = -M
     C_SOURCES = $(filter %.c, $(SOURCES))     C_SOURCES = $(filter %.c, $(SOURCES))
Line 50 
Line 56 
     acc_sed_filter = -e 's=$(OBJ_DIR).*cpp:==g'     acc_sed_filter = -e 's=$(OBJ_DIR).*cpp:==g'
 endif endif
  
   ##
   ## If compiler definition found, use compiler to define depend.mak
   ## each obj dir
   ##
 ifdef PEGASUS_CXX_MAKEDEPEND_OPTION ifdef PEGASUS_CXX_MAKEDEPEND_OPTION
  
 ifeq ($(COMPILER), clang) ifeq ($(COMPILER), clang)
Line 63 
Line 73 
 else else
   depend: $(OBJ_DIR)/target $(ERROR)   depend: $(OBJ_DIR)/target $(ERROR)
        $(CXX) $(PEGASUS_CXX_MAKEDEPEND_OPTION) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $(SOURCES_NO_ASM) | sed -e 's=^\(.*:\)='$(OBJ_DIR)'/\1=' $(acc_sed_filter) > $(DEPEND_MAK)        $(CXX) $(PEGASUS_CXX_MAKEDEPEND_OPTION) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $(SOURCES_NO_ASM) | sed -e 's=^\(.*:\)='$(OBJ_DIR)'/\1=' $(acc_sed_filter) > $(DEPEND_MAK)
   
 endif endif
   
   ##
   ## Compiler type not found.   If PEGASUS_HAS_MAKEDEPEND set use makedepend
   ## to define depend.mak files.  Otherwise use OpenPegasus mu to create
   ## depend.make files
   ##
 else else
 ifdef PEGASUS_HAS_MAKEDEPEND ifdef PEGASUS_HAS_MAKEDEPEND
 DEPEND_INCLUDES += -DPEGASUS_OS_TYPE_UNIX -I/usr/include $(SYS_INCLUDES) DEPEND_INCLUDES += -DPEGASUS_OS_TYPE_UNIX -I/usr/include $(SYS_INCLUDES)


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2