Changeset 588 for CMT/HEAD/mgr/fragments/constituent_lock

Timestamp:

Nov 27, 2011, 4:36:15 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 465

File:

• CMT/HEAD/mgr/fragments/constituent_lock (modified) (5 diffs)

CMT/HEAD/mgr/fragments/constituent_lock

@@ -44 +44 @@
 endif
 
+not_${CONSTITUENT}_dependencies = { n=0; for p in $?; do m=0; for d in $(${CONSTITUENT}_dependencies); do if [ $$p = $$d ]; then m=1; break; fi; done; if [ $$m -eq 0 ]; then n=1; break; fi; done; [ $$n -eq 1 ]; }
+
 ifdef STRUCTURED_OUTPUT
 ${CONSTITUENT}dirs :
@@ -73 +75 @@
           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 else
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
-        if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
-          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_build_library_linksstamp) $(use_requirements)
+        @if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
+          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ] || \
+          $(not_${CONSTITUENT}_dependencies) ; then \
           test -z "$(cmtmsg)" || \
           echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
@@ -89 +92 @@
           $(cmtexe) -f=$(bin)${CONSTITUENT}.in -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -without_cmt -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
 else
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
-        if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
-          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_build_library_linksstamp) $(bin)${CONSTITUENT}.in
+        @if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
+          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ] || \
+          $(not_${CONSTITUENT}_dependencies) ; then \
           test -z "$(cmtmsg)" || \
           echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
@@ -107 +111 @@
           retval=$$?; \
           trap '${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}' 1 2 15; \
+          if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
           $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \
+          fi; \
           retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}
         $(echo) "(constituents.make) ${CONSTITUENT} done"
@@ -130 +136 @@
         $(echo) "(constituents.make) install ${CONSTITUENT} done"
 
-uninstall :: ${CONSTITUENT}uninstall
+uninstall : ${CONSTITUENT}uninstall
 
 $(foreach d,$(${CONSTITUENT}_dependencies),$(eval $(d)uninstall_dependencies += ${CONSTITUENT}uninstall))
 
-${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
+${CONSTITUENT}uninstall : $(${CONSTITUENT}uninstall_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
         $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
-        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
+        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
+          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall; \
+          fi
+#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
         $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
+
+remove_library_links :: ${CONSTITUENT}uninstall
 
 ifndef PEDANTIC