Changeset 588 for CMT/HEAD/mgr/fragments


Ignore:
Timestamp:
Nov 27, 2011, 4:36:15 PM (13 years ago)
Author:
rybkin
Message:

See C.L. 465

Location:
CMT/HEAD/mgr/fragments
Files:
4 added
16 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/mgr/fragments/c

    r487 r588  
    2020$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
    2121
     22$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
     23
    2224$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    2325endif

  • CMT/HEAD/mgr/fragments/c_library

    r487 r588  
    2020$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
    2121
     22$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
     23
    2224$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    2325endif

  • CMT/HEAD/mgr/fragments/constituent

    r561 r588  
    4444endif
    4545
     46not_${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 ]; }
     47
    4648ifdef STRUCTURED_OUTPUT
    4749${CONSTITUENT}dirs :
    … …  
    7375          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    7476else
    75 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
    76         if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
    77           [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
     77$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_build_library_linksstamp) $(use_requirements)
     78        @if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
     79          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ] || \
     80          $(not_${CONSTITUENT}_dependencies) ; then \
    7881          test -z "$(cmtmsg)" || \
    7982          echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
    … …  
    8992          $(cmtexe) -f=$(bin)${CONSTITUENT}.in -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -without_cmt -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    9093else
    91 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
    92         if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
    93           [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
     94$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_build_library_linksstamp) $(bin)${CONSTITUENT}.in
     95        @if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
     96          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ] || \
     97          $(not_${CONSTITUENT}_dependencies) ; then \
    9498          test -z "$(cmtmsg)" || \
    9599          echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
    … …  
    104108${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
    105109        $(echo) "(constituents.make) Starting ${CONSTITUENT}"
    106         @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
     110        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     111          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \
     112          fi
     113#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    107114        $(echo) "(constituents.make) ${CONSTITUENT} done"
    108115
    … …  
    126133        $(echo) "(constituents.make) install ${CONSTITUENT} done"
    127134
    128 uninstall :: ${CONSTITUENT}uninstall
     135uninstall : ${CONSTITUENT}uninstall
    129136
    130137$(foreach d,$(${CONSTITUENT}_dependencies),$(eval $(d)uninstall_dependencies += ${CONSTITUENT}uninstall))
    131138
    132 ${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     139${CONSTITUENT}uninstall : $(${CONSTITUENT}uninstall_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    133140        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    134         @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
     141        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     142          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall; \
     143          fi
     144#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
    135145        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
     146
     147remove_library_links :: ${CONSTITUENT}uninstall
    136148
    137149ifndef PEDANTIC

  • CMT/HEAD/mgr/fragments/constituent_lock

    r561 r588  
    4444endif
    4545
     46not_${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 ]; }
     47
    4648ifdef STRUCTURED_OUTPUT
    4749${CONSTITUENT}dirs :
    … …  
    7375          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    7476else
    75 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
    76         if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
    77           [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
     77$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_build_library_linksstamp) $(use_requirements)
     78        @if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
     79          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ] || \
     80          $(not_${CONSTITUENT}_dependencies) ; then \
    7881          test -z "$(cmtmsg)" || \
    7982          echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
    … …  
    8992          $(cmtexe) -f=$(bin)${CONSTITUENT}.in -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -without_cmt -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    9093else
    91 $(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
    92         if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
    93           [ ! -f $(cmt_final_setup_${CONSTITUENT}) ]; then \
     94$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_build_library_linksstamp) $(bin)${CONSTITUENT}.in
     95        @if [ ! -f $@ ] || [ ! -f $(cmt_local_tagfile_${CONSTITUENT}) ] || \
     96          [ ! -f $(cmt_final_setup_${CONSTITUENT}) ] || \
     97          $(not_${CONSTITUENT}_dependencies) ; then \
    9498          test -z "$(cmtmsg)" || \
    9599          echo "$(CMTMSGPREFIX)" "(constituents.make) Building ${CONSTITUENT}.make"; \
    … …  
    107111          retval=$$?; \
    108112          trap '${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}' 1 2 15; \
     113          if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    109114          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \
     115          fi; \
    110116          retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}
    111117        $(echo) "(constituents.make) ${CONSTITUENT} done"
    … …  
    130136        $(echo) "(constituents.make) install ${CONSTITUENT} done"
    131137
    132 uninstall :: ${CONSTITUENT}uninstall
     138uninstall : ${CONSTITUENT}uninstall
    133139
    134140$(foreach d,$(${CONSTITUENT}_dependencies),$(eval $(d)uninstall_dependencies += ${CONSTITUENT}uninstall))
    135141
    136 ${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     142${CONSTITUENT}uninstall : $(${CONSTITUENT}uninstall_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    137143        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    138         @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
     144        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     145          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall; \
     146          fi
     147#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
    139148        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
     149
     150remove_library_links :: ${CONSTITUENT}uninstall
    140151
    141152ifndef PEDANTIC

  • CMT/HEAD/mgr/fragments/constituents_header

    r488 r588  
    2626#cmt_final_setup = $(bin)$(package)setup.make
    2727
     28cmt_build_library_linksstamp = $(bin)cmt_build_library_links.stamp
    2829#--------------------------------------------------------
    2930
    … …  
    7374
    7475ifndef QUICK
    75 all :: build_library_links
    76         $(echo) "(constituents.make) all done"
     76all :: build_library_links ;
     77else
     78all :: $(cmt_build_library_linksstamp) ;
    7779endif
    7880
    … …  
    8890#         if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi
    8991
    90 requirements :
    91         @if test ! -r requirements ; then echo "No requirements file" ; fi
     92#requirements :
     93#       @if test ! -r requirements ; then echo "No requirements file" ; fi
    9294
    9395build_library_links : dirs
    … …  
    9799#       $(build_library_links)
    98100
     101$(cmt_build_library_linksstamp) : $(cmt_final_setup) $(cmt_local_tagfile) $(bin)library_links.in
     102        $(echo) "(constituents.make) Rebuilding library links"; \
     103         $(build_library_links) -f=$(bin)library_links.in -without_cmt
     104        $(silent) \touch $@
     105
    99106makefiles : ;
    100107
     108ifndef PEDANTIC
    101109.DEFAULT ::
     110#.DEFAULT :
    102111        $(echo) "(constituents.make) $@: No rule for such target" >&2
    103 #       @echo "#CMT> Warning: $@: Using default commands" >&2; exit
     112endif
    104113
    105 #       @if test "$@" = "$(cmt_lock_setup)"; then \
    106         #  /bin/rm -f $(cmt_lock_setup); \
    107          # touch $(cmt_lock_setup); \
    108         #fi
     114${CMTROOT}/src/Makefile.core : ;
     115ifdef use_requirements
     116$(use_requirements) : ;
     117endif
    109118
    110119#-- end of constituents_header ------

  • CMT/HEAD/mgr/fragments/constituents_trailer

    r487 r588  
    11#-- start of constituents_trailer ------
    22
    3 clean :: remove_library_links
     3uninstall : remove_library_links ;
     4clean ::
     5        $(cleanup_echo) $(cmt_build_library_linksstamp)
     6        -$(cleanup_silent) \rm -f $(cmt_build_library_linksstamp)
     7#clean :: remove_library_links
    48
    59remove_library_links ::
     10ifndef QUICK
    611        $(echo) "(constituents.make) Removing library links"; \
    712          $(remove_library_links)
     13else
     14        $(echo) "(constituents.make) Removing library links"; \
     15          $(remove_library_links) -f=$(bin)library_links.in -without_cmt
     16endif
    817
    918makefilesclean ::
    … …  
    1524clean :: makefilesclean
    1625
    17 binclean :: clean
    18         $(echo) "(constituents.make) Removing binary directory $(bin)"
    19         @if test ! "$(bin)" = "./"; then \
    20           /bin/rm -rf $(bin); \
    21         fi
    22 
    2326#-- end of constituents_trailer ------

  • CMT/HEAD/mgr/fragments/cpp

    r487 r588  
    2020$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
    2121
     22$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
     23
    2224$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    2325endif

  • CMT/HEAD/mgr/fragments/cpp_library

    r487 r588  
    2020$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
    2121
     22$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
     23
    2224$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    2325endif

  • CMT/HEAD/mgr/fragments/dependencies

    r548 r588  
    1 #-- start of dependency ------------------
     1#-- start of dependencies ------------------
    22ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
    33ifneq ($(MAKECMDGOALS),uninstall)
    44
    5 #$(bin)${CONSTITUENT}_dependencies.make :: dirs
    6 
    7 ifndef QUICK
    8 $(bin)${CONSTITUENT}_dependencies.make : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
    9 else
    10 $(bin)${CONSTITUENT}_dependencies.make :
    11 endif
     5$(bin)${CONSTITUENT}_dependencies.make : $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
    126        $(echo) "(${CONSTITUENT}.make) Rebuilding $@"; \
    13           $(build_dependencies) ${CONSTITUENT} -all_sources -out=$@ ${LINE}
    14 
    15 #$(${CONSTITUENT}_dependencies)
     7          $(build_dependencies) -out=$@ -start_all ${LINE} -end_all $(includes) $(app_${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) ${CONSTITUENT} $? -f=$(cmt_dependencies_in_${CONSTITUENT}) -without_cmt
    168
    179-include $(bin)${CONSTITUENT}_dependencies.make
    … …  
    1911endif
    2012endif
    21 #-- end of dependency -------------------
     13#-- end of dependencies -------------------

  • CMT/HEAD/mgr/fragments/fortran

    r469 r588  
    22
    33$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
     4
     5$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
    46 
    57$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)

  • CMT/HEAD/mgr/fragments/fortran_library

    r469 r588  
    22
    33$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
     4
     5$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
    46 
    57$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)

  • CMT/HEAD/mgr/fragments/lex

    r436 r588  
    22
    33$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
     4
     5$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
    46
    57$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)

  • CMT/HEAD/mgr/fragments/lex_library

    r436 r588  
    22
    33$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
     4
     5$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
    46
    57$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)

  • CMT/HEAD/mgr/fragments/make_header

    r487 r588  
    4646
    4747cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
     48cmt_dependencies_in_${CONSTITUENT} = $(bin)dependencies_${CONSTITUENT}.in
    4849#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    4950cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    … …  
    5253
    5354cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
     55cmt_dependencies_in_${CONSTITUENT} = $(bin)dependencies.in
    5456#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    5557cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    … …  
    8385endif
    8486
     87${CMTROOT}/src/Makefile.core : ;
    8588ifdef use_requirements
    8689$(use_requirements) : ;

  • CMT/HEAD/mgr/fragments/yacc

    r436 r588  
    22
    33$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
     4
     5$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
    46
    57$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)

  • CMT/HEAD/mgr/fragments/yacc_library

    r436 r588  
    22
    33$(bin)${CONSTITUENT}_dependencies.make : $(${NAME}_${FILESUFFIX}_dependencies)
     4
     5$(bin)${CONSTITUENT}_dependencies.make : ${FULLNAME}
    46
    57$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
Note: See TracChangeset for help on using the changeset viewer.