Changeset 492 for CMT/HEAD/mgr/fragments/constituent

Timestamp:

Mar 15, 2009, 1:13:07 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 387

File:

• CMT/HEAD/mgr/fragments/constituent (modified) (3 diffs)

CMT/HEAD/mgr/fragments/constituent

@@ -68 +68 @@
 makefiles : $(cmt_local_${CONSTITUENT}_makefile)
 
+ifndef QUICK
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links
+else
 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+endif
         $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 
-ifndef QUICK
-${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs
-else
 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
-endif
         $(echo) "(constituents.make) Starting ${CONSTITUENT}"
         @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
@@ -83 +83 @@
 clean :: ${CONSTITUENT}clean
 
-${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
+${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
-        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean
+        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
+          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean; \
+        fi
         $(echo) "(constituents.make) ${CONSTITUENT}clean done"
-#       @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
-#         $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
-#       fi
+#       @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean
 
 ##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
@@ -102 +102 @@
 uninstall :: ${CONSTITUENT}uninstall
 
-${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
+$(foreach d,$(${CONSTITUENT}_dependencies),$(eval $(d)uninstall_dependencies += ${CONSTITUENT}uninstall))
+
+${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
         @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall