Changeset 615 for CMT/HEAD/mgr/fragments/cpp_library

Timestamp:

May 7, 2012, 2:39:57 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 490

File:

• CMT/HEAD/mgr/fragments/cpp_library (modified) (2 diffs)

CMT/HEAD/mgr/fragments/cpp_library

@@ -7 +7 @@
 -include $(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d
 
-$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d : $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d :
 
-$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d : ${FULLNAME}
-        $(dep_echo) $@
-        $(cpp_silent) $(cppcomp) ${DEPENDENCIESOPTS} -o $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
-        $(cpp_silent) $(format_dependencies) $@ $(@D)/${NAME}${CONSTITUENTSUFFIX}.o ${FULLNAME} $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(cmt_final_setup_${CONSTITUENT})
+
+$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : ${FULLNAME}
+        $(cpp_echo) ${FULLNAME}
+        $(cpp_silent) $(cppcomp) ${DEPENDENCIESOPTS} -o $@ $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
 endif
 endif
 
-$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : ${FULLNAME}
 else
 $(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
@@ -23 +23 @@
 
 $(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
-endif
         $(cpp_echo) ${FULLNAME}
         $(cpp_silent) $(cppcomp) -o $@ $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
 
+endif
+
 #-- end of cpp_library ------------------