Changeset 441 for CMT


Ignore:
Timestamp:
Feb 15, 2008, 4:48:37 PM (16 years ago)
Author:
rybkin
Message:

See C.L. 345

Location:
CMT/HEAD
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r440 r441  
     12008-02-15    <rybkin@lal.in2p3.fr> 345
     2       
     3        * src/Makefile.core: Control the verbosity of Make by defining one of
     4        the Make variables with the following effect:
     5        QUIET - print CMT messages (default)
     6        VERBOSE - print CMT messages and echo Make commands
     7        ECHO - echo Make commands
     8        SILENT - no CMT messages or Make commands echoing
     9        Control the prefix of the CMT messages via the Make variable CMTMSGHDR
     10        (default value: #CMT--->)
     11        * src/Makefile.header: idem
     12        * mgr/fragments/constituents_header: idem
     13        * mgr/fragments/group: idem
     14        * mgr/fragments/constituent: idem
     15        * mgr/fragments/constituent_lock: idem
     16        * mgr/fragments/constituents_trailer: idem
     17        * mgr/fragments/make_header: idem
     18        * mgr/fragments/application_header: idem
     19        * mgr/fragments/application: idem
     20        * mgr/fragments/application_launcher: idem
     21        * mgr/fragments/library_header: idem
     22        * mgr/fragments/library: idem
     23        * mgr/fragments/library_no_share: idem
     24        * mgr/fragments/dependencies: idem
     25        * mgr/fragments/c: idem
     26        * mgr/fragments/c_library: idem
     27        * mgr/fragments/cpp: idem
     28        * mgr/fragments/cpp_library: idem
     29        * mgr/fragments/fortran: idem
     30        * mgr/fragments/fortran_library: idem
     31        * mgr/fragments/java_header: idem
     32        * mgr/fragments/jar: idem
     33        * mgr/fragments/cleanup_application: idem
     34        * mgr/fragments/installer: idem
     35        * mgr/cmt_make_shlib.sh: idem
     36        * mgr/cmt_install_action.sh: idem
     37        * mgr/cmt_uninstall_action.sh: idem
     38       
    1392008-02-09    <rybkin@lal.in2p3.fr> 344
    240

  • CMT/HEAD/mgr/cmt_install_action.sh

    r440 r441  
    2626# 5   cmtpath of the package
    2727#------------------------------------------------------------------------------
     28: ${CMTMSGHDR:=$0:}
    2829
    2930source_dir=""
    … …  
    134135fi
    135136
    136 echo "Installing file ${file_name} into ${install_dir}"
     137echo "${CMTMSGHDR}" "Installing file ${file_name} into ${install_dir}"
    137138if test -L ${dest_file_path} -o -f ${dest_file_path}; then
    138139    /bin/rm -f ${dest_file_path}

  • CMT/HEAD/mgr/cmt_make_shlib.sh

    r28 r441  
    22
    33#set -x
     4: ${CMTMSGHDR:=$0:}
    45
    56lib=$1
    … …  
    3536
    3637if test `uname` = "Linux" ; then
    37   echo "BUILDING SHARED LIBRARY ${lib}"
     38  echo "${CMTMSGHDR}" "BUILDING SHARED LIBRARY ${lib}"
    3839# ATTEMPT 2: temp for sharedlin force
    3940#   cp lib${lib}.a lib${lib}.so

  • CMT/HEAD/mgr/cmt_uninstall_action.sh

    r440 r441  
    2323# 4   cmtpath of the package
    2424#------------------------------------------------------------------------------
     25: ${CMTMSGHDR:=$0:}
    2526
    2627source_dir=""
    … …  
    122123
    123124if test -d ${dest_file_path}; then
    124   echo Removing directory ${file_name} from ${install_dir}
     125  echo "${CMTMSGHDR}" Removing directory ${file_name} from ${install_dir}
    125126  /bin/rm -rf ${dest_file_path}
    126127elif test -f ${dest_file_path}; then
    127   echo Removing file ${file_name} from ${install_dir}
     128  echo "${CMTMSGHDR}" Removing file ${file_name} from ${install_dir}
    128129  /bin/rm -f ${dest_file_path}
    129130fi

  • CMT/HEAD/mgr/fragments/application

    r227 r441  
    22
    33$(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
    4         $(link_echo) $@
     4        $(link_echo) "application $@"
    55        $(link_silent) cd $(bin); ${LINKMACRO} -o ${CONSTITUENT}.exe.new ${OBJS} $(use_linkopts) $(${CONSTITUENT}linkopts); mv -f ${CONSTITUENT}.exe.new ${CONSTITUENT}${application_suffix}
    66
    … …  
    1919
    2020${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    21         @if test ! "${CMTINSTALLAREA}" = ""; then\
    22           echo "installation done"; \
    23         fi
     21ifdef CMTINSTALLAREA
     22        $(echo) "installation done"
     23endif
    2424
    2525$(install_dir)/$(${CONSTITUENT}installname) :: $(bin)$(${CONSTITUENT}installname)
    26         @if test ! "${CMTINSTALLAREA}" = ""; then \
    27           $(cmt_install_action) \
     26ifdef CMTINSTALLAREA
     27        $(install_silent) $(cmt_install_action) \
    2828            -source "`(cd $(bin); pwd)`" \
    2929            -name "$(${CONSTITUENT}installname)" \
    3030            -out "$(install_dir)" \
    3131            -cmd "$(cmt_installarea_command)" \
    32             -cmtpath "$($(package)_cmtpath)"; \
    33         fi
     32            -cmtpath "$($(package)_cmtpath)"
     33endif
    3434
    3535##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    3838
    3939${CONSTITUENT}uninstall ::
    40         @echo "------> (${CONSTITUENT}.make) Removing installed files"
    41         @if test ! "${CMTINSTALLAREA}" = ""; then \
    42           $(cmt_uninstall_action) \
     40ifdef CMTINSTALLAREA
     41        $(cleanup_silent) $(cmt_uninstall_action) \
    4342            -source "`(cd $(bin); pwd)`" \
    4443            -name "$(${CONSTITUENT}installname)" \
    4544            -out "$(install_dir)" \
    46             -cmtpath "$($(package)_cmtpath)"; \
    47         fi
     45            -cmtpath "$($(package)_cmtpath)"
     46endif
    4847
     48#       @echo "------> (${CONSTITUENT}.make) Removing installed files"
    4949#-- end of application

  • CMT/HEAD/mgr/fragments/application_header

    r11 r441  
    22
    33${CONSTITUENT} :: dirs ${PROTOTARGET} $(bin)${CONSTITUENT}${application_suffix}
    4         @/bin/echo "------> ${CONSTITUENT} ok"
     4        $(echo) "${CONSTITUENT} ok"
    55
    66#-- end of application_header

  • CMT/HEAD/mgr/fragments/application_launcher

    r11 r441  
    22
    33${CONSTITUENT} ::
    4         cd $(bin); \
     4        $(silent) cd $(bin); \
    55          ${${CONSTITUENT}_pre_check}; \
    66          ${FULLNAME} ${${CONSTITUENT}_check_args}; \

  • CMT/HEAD/mgr/fragments/c

    r436 r441  
    44
    55$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(c_echo) $@
     6        $(c_echo) $<
    77        $(c_silent) cd $(bin); $(ccomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(app_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(app_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
    88

  • CMT/HEAD/mgr/fragments/c_library

    r436 r441  
    44
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(c_echo) $@
     6        $(c_echo) $<
    77        $(c_silent) cd $(bin); $(ccomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
    88

  • CMT/HEAD/mgr/fragments/cleanup_application

    r11 r441  
    11#-- start of cleanup_application ------
    2         @echo "------> (${CONSTITUENT}.make) Removing application files"
    3         -$(cleanup_echo) ${CONSTITUENT}${application_suffix}
    4         -@cd $(bin); /bin/rm -f ${CONSTITUENT}${application_suffix}
     2        $(cleanup_echo) ${CONSTITUENT}${application_suffix}
     3        -$(cleanup_silent) cd $(bin); /bin/rm -f ${CONSTITUENT}${application_suffix}
     4
     5#       @echo "------> (${CONSTITUENT}.make) Removing application files"
    56#-- end of cleanup_application ------

  • CMT/HEAD/mgr/fragments/constituent

    r434 r441  
    2626$(cmt_local_tagfile_${CONSTITUENT}) :
    2727endif
    28         @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
     28        $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
    2929        @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    3030          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \
    3131          if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \
    3232          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})
    33         @/bin/echo setup.make ok
     33        $(echo) setup.make ok
    3434
    3535else
    … …  
    5353$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    5454endif
    55         @echo "------> (constituents.make) Building ${CONSTITUENT}.make"; \
     55        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
    5656          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    5757
    5858${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    59         @echo "------> (constituents.make) Starting ${CONSTITUENT}"
     59        $(echo) "(constituents.make) Starting ${CONSTITUENT}"
    6060        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}
    61         @echo "------> (constituents.make) ${CONSTITUENT} done"
     61        $(echo) "(constituents.make) ${CONSTITUENT} done"
    6262
    6363clean :: ${CONSTITUENT}clean
    6464
    6565${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     66        $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
    6667        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    67           echo "------> (constituents.make) Starting ${CONSTITUENT}clean"; \
    6868          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
    6969        fi
    … …  
    7474
    7575${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    76         @echo "------> (constituents.make) Starting install ${CONSTITUENT}"
     76        $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
    7777        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
    78         @echo "------> (constituents.make) install ${CONSTITUENT} done"
     78        $(echo) "(constituents.make) install ${CONSTITUENT} done"
    7979
    8080uninstall :: ${CONSTITUENT}uninstall
    8181
    8282${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    83         @echo "------> (constituents.make) Starting uninstall ${CONSTITUENT}"
     83        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    8484        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
    85         @echo "------> (constituents.make) uninstall ${CONSTITUENT} done"
     85        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
    8686
    8787ifndef PEDANTIC
    8888.DEFAULT::
    89         @echo "------> (constituents.make) Starting $@ ${CONSTITUENT}"
    90         @echo Using default action for $@
    91         @echo "------> (constituents.make) $@ ${CONSTITUENT} done"
     89        $(echo) "(constituents.make) Starting $@ ${CONSTITUENT}"
     90        $(echo) Using default action for $@
     91        $(echo) "(constituents.make) $@ ${CONSTITUENT} done"
    9292endif
    9393

  • CMT/HEAD/mgr/fragments/constituent_lock

    r434 r441  
    2626$(cmt_local_tagfile_${CONSTITUENT}) :
    2727endif
    28         @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
     28        $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
    2929        @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    3030          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \
    3131          if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \
    3232          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})
    33         @/bin/echo setup.make ok
     33        $(echo) setup.make ok
    3434
    3535else
    … …  
    5353$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    5454endif
    55         @echo "------> (constituents.make) Building ${CONSTITUENT}.make"; \
     55        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
    5656          $(cmtexe) -quiet -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    5757
    5858${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    59         @echo "------> (constituents.make) Creating ${CONSTITUENT}${lock_suffix}"
     59        $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix}"
    6060        @${lock_command} ${CONSTITUENT}${lock_suffix}
    61         @echo "------> (constituents.make) Starting ${CONSTITUENT}"
     61        $(echo) "(constituents.make) Starting ${CONSTITUENT}"
    6262        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}; \
    6363        retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}
    64         @echo "------> (constituents.make) ${CONSTITUENT} done"
     64        $(echo) "(constituents.make) ${CONSTITUENT} done"
    6565
    6666clean :: ${CONSTITUENT}clean
    6767
    6868${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     69        $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
    6970        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    70           echo "------> (constituents.make) Starting ${CONSTITUENT}clean"; \
    7171          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
    7272        fi
    … …  
    7777
    7878${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    79         @echo "------> (constituents.make) Starting install ${CONSTITUENT}"
     79        $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
    8080        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
    81         @echo "------> (constituents.make) install ${CONSTITUENT} done"
     81        $(echo) "(constituents.make) install ${CONSTITUENT} done"
    8282
    8383uninstall :: ${CONSTITUENT}uninstall
    8484
    8585${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    86         @echo "------> (constituents.make) Starting uninstall ${CONSTITUENT}"
     86        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    8787        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
    88         @echo "------> (constituents.make) uninstall ${CONSTITUENT} done"
     88        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
    8989
    9090ifndef PEDANTIC
    9191.DEFAULT::
    92         @echo "------> (constituents.make) Starting $@ ${CONSTITUENT}"
    93         @echo Using default action for $@
    94         @echo "------> (constituents.make) $@ ${CONSTITUENT} done"
     92        $(echo) "(constituents.make) Starting $@ ${CONSTITUENT}"
     93        $(echo) Using default action for $@
     94        $(echo) "(constituents.make) $@ ${CONSTITUENT} done"
    9595endif
    9696

  • CMT/HEAD/mgr/fragments/constituents_header

    r434 r441  
    5656
    5757$(cmt_final_setup) : $(cmt_local_tagfile)
    58         @/bin/echo "------> (constituents.make) Rebuilding $@"
     58        $(echo) "(constituents.make) Rebuilding $@"
    5959        @if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \
    6060          if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \
    … …  
    6565          else \
    6666            if /usr/bin/diff $(cmt_local_setup) $@ >/dev/null ; then \
    67               echo "$@ untouched"; \
     67              : ; \
    6868            else \
    6969              mv $(cmt_local_setup) $@; \
    7070            fi; \
    7171          fi
    72         @/bin/echo $@ ok   
     72
     73#       @/bin/echo $@ ok   
    7374
    7475config :: checkuses
    … …  
    8182ifndef QUICK
    8283all :: build_library_links
    83         @echo "------> (constituents.make) all done"
     84        $(echo) "(constituents.make) all done"
    8485endif
    8586
    … …  
    9596
    9697build_library_links : dirs requirements
    97         @echo "------> (constituents.make) Rebuilding library links"; \
     98        $(echo) "(constituents.make) Rebuilding library links"; \
    9899        if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi; \
    99100        $(build_library_links)

  • CMT/HEAD/mgr/fragments/constituents_trailer

    r95 r441  
    44
    55remove_library_links ::
    6         @echo "Removing library links"; \
    7           $(remove_library_links); \
     6        $(echo) "Removing library links"; \
     7          $(remove_library_links)
    88
    99makefilesclean ::
    … …  
    1616
    1717binclean :: clean
     18        $(echo) "Removing binary directory $(bin)"
    1819        @if test ! "$(bin)" = "./"; then \
    19           echo "Removing binary directory $(bin)"
    2020          /bin/rm -rf $(bin); \
    2121        fi

  • CMT/HEAD/mgr/fragments/cpp

    r436 r441  
    44
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(cpp_echo) $@
     6        $(cpp_echo) $<
    77        $(cpp_silent) cd $(bin); $(cppcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(app_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
    88

  • CMT/HEAD/mgr/fragments/cpp_library

    r436 r441  
    44
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(cpp_echo) $@
     6        $(cpp_echo) $<
    77        $(cpp_silent) cd $(bin); $(cppcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.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}
    88

  • CMT/HEAD/mgr/fragments/dependencies

    r436 r441  
    55ifndef QUICK
    66$(bin)${CONSTITUENT}_dependencies.make : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
    7         @echo "------> (${CONSTITUENT}.make) Rebuilding $@"; \
     7        $(echo) "(${CONSTITUENT}.make) Rebuilding $@"; \
    88          $(build_dependencies) ${CONSTITUENT} -all_sources
    99endif

  • CMT/HEAD/mgr/fragments/fortran

    r436 r441  
    44 
    55$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(fortran_echo) $@
     6        $(fortran_echo) $<
    77        $(fortran_silent)cd $(bin); $(fcomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(app_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(app_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
    88

  • CMT/HEAD/mgr/fragments/fortran_library

    r436 r441  
    44 
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(fortran_echo) $@
     6        $(fortran_echo) $<
    77        $(fortran_silent)cd $(bin); $(fcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
    88

  • CMT/HEAD/mgr/fragments/group

    r325 r441  
    44
    55${GROUP} :: $(${GROUP}_dependencies)  $(${GROUP}_pre_constituents) $(${GROUP}_constituents)  $(${GROUP}_post_constituents)
    6         @/bin/echo " ${GROUP} ok."
     6        $(echo) "${GROUP} ok."
     7
     8#       @/bin/echo " ${GROUP} ok."
    79
    810clean :: allclean
    911
    1012${GROUP}clean ::  $(${GROUP}_constituentsclean)
    11         @echo $(${GROUP}_constituentsclean)
    12         @/bin/echo " ${GROUP}clean ok."
     13        $(echo) $(${GROUP}_constituentsclean)
     14        $(echo) "${GROUP}clean ok."
     15
     16#       @echo $(${GROUP}_constituentsclean)
     17#       @/bin/echo " ${GROUP}clean ok."
    1318
    1419${GROUP}clean :: makefilesclean

  • CMT/HEAD/mgr/fragments/installer

    r11 r441  
    44
    55${install_dir}/${NAME}${FILESUFFIX} : ${FULLNAME}
    6         @if test ! -d "${install_dir}" ; then mkdir -p ${install_dir}; fi
    7         ${install_command} ${FULLNAME} ${install_dir}/${NAME}${FILESUFFIX}
     6        $(install_silent) if test ! -d "${install_dir}" ; then mkdir -p ${install_dir}; fi
     7        $(install_silent) ${install_command} ${FULLNAME} ${install_dir}/${NAME}${FILESUFFIX}
    88
    99${CONSTITUENT}clean ::
    10         ${uninstall_command} ${install_dir}/${NAME}${FILESUFFIX}
     10        $(cleanup_silent) ${uninstall_command} ${install_dir}/${NAME}${FILESUFFIX}
    1111
    1212#-- end of installer ------

  • CMT/HEAD/mgr/fragments/jar

    r11 r441  
    1313
    1414${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    15         @if test ! "${CMTINSTALLAREA}" = ""; then\
    16           echo "installation done"; \
    17         fi
     15ifdef CMTINSTALLAREA
     16        $(echo) "installation done"
     17endif
    1818
    1919$(install_dir)/$(${CONSTITUENT}installname) :: $(javabin)$(${CONSTITUENT}installname)
    20         @if test ! "${CMTINSTALLAREA}" = ""; then \
    21           $(cmt_install_action) \
     20ifdef CMTINSTALLAREA
     21        $(install_silent) $(cmt_install_action) \
    2222            -source "$(PACKAGE_ROOT)/classes" \
    2323            -name "$(${CONSTITUENT}installname)" \
    2424            -out "$(install_dir)" \
    2525            -cmd "$(cmt_installarea_command)" \
    26             -cmtpath "$($(package)_cmtpath)" ; \
    27         fi
     26            -cmtpath "$($(package)_cmtpath)"
     27endif
    2828
    2929##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    3232
    3333${CONSTITUENT}uninstall ::
    34         @if test ! "${CMTINSTALLAREA}" = ""; then \
    35           $(cmt_uninstall_action) \
     34ifdef CMTINSTALLAREA
     35        $(cleanup_silent) $(cmt_uninstall_action) \
    3636            -source "$(PACKAGE_ROOT)/classes" \
    3737            -name "$(${CONSTITUENT}installname)" \
    3838            -out "$(install_dir)" \
    39             -cmtpath "$($(package)_cmtpath)" ; \
    40         fi
     39            -cmtpath "$($(package)_cmtpath)"
     40endif
    4141
    4242${CONSTITUENT}clean ::
    43         /bin/rm -rf $(javabin)/${CONSTITUENT}
    44         /bin/rm -f $(javabin)/${CONSTITUENT}.jar
     43        $(cleanup_silent) /bin/rm -rf $(javabin)/${CONSTITUENT}
     44        $(cleanup_silent) /bin/rm -f $(javabin)/${CONSTITUENT}.jar
    4545
    4646#-- end of jar ------

  • CMT/HEAD/mgr/fragments/java_header

    r401 r441  
    22
    33${CONSTITUENT}javadirs ::
    4         @if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
     4        $(silent) if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
    55
    66${CONSTITUENT} :: ${CONSTITUENT}javadirs $(javabin)${CONSTITUENT}.jar
    7         @/bin/echo "------> ${CONSTITUENT} ok"
     7        $(echo) "${CONSTITUENT} ok"
    88
    99$(javabin)${CONSTITUENT}.jar :: ${OBJS}
    … …  
    2121
    2222${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    23         @if test ! "${CMTINSTALLAREA}" = ""; then\
    24           echo "installation done"; \
    25         fi
     23ifdef CMTINSTALLAREA
     24        $(echo) "installation done"
     25endif
    2626
    2727$(install_dir)/$(${CONSTITUENT}installname) :: $(javabin)$(${CONSTITUENT}installname)
    28         @if test ! "${CMTINSTALLAREA}" = ""; then \
    29           $(cmt_install_action) \
     28ifdef CMTINSTALLAREA
     29        $(install_silent) $(cmt_install_action) \
    3030            -source "$(PACKAGE_ROOT)/classes" \
    3131            -name "$(${CONSTITUENT}installname)" \
    3232            -out "$(install_dir)" \
    3333            -cmd "$(cmt_installarea_command)" \
    34             -cmtpath "$($(package)_cmtpath)" ; \
    35         fi
     34            -cmtpath "$($(package)_cmtpath)"
     35endif
    3636
    3737##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    4040
    4141${CONSTITUENT}uninstall ::
    42         @if test ! "${CMTINSTALLAREA}" = ""; then \
    43           $(cmt_uninstall_action) \
     42ifdef CMTINSTALLAREA
     43        $(cleanup_silent) $(cmt_uninstall_action) \
    4444            -source "$(PACKAGE_ROOT)/classes" \
    4545            -name "$(${CONSTITUENT}installname)" \
    4646            -out "$(install_dir)" \
    47             -cmtpath "$($(package)_cmtpath)" ; \
    48         fi
     47            -cmtpath "$($(package)_cmtpath)"
     48endif
    4949
    5050${CONSTITUENT}clean ::
    51         /bin/rm -rf $(javabin)/${CONSTITUENT}
    52         /bin/rm -f $(javabin)/${CONSTITUENT}.jar
     51        $(cleanup_silent) /bin/rm -rf $(javabin)/${CONSTITUENT}
     52        $(cleanup_silent) /bin/rm -f $(javabin)/${CONSTITUENT}.jar
    5353
    5454#-- end of java_header ------

  • CMT/HEAD/mgr/fragments/library

    r227 r441  
    22
    33${CONSTITUENT}LIB :: $(${CONSTITUENT}lib) $(${CONSTITUENT}shstamp)
    4         @/bin/echo "------> ${CONSTITUENT} : library ok"
     4        $(echo) "${CONSTITUENT} : library ok"
    55
    66$(${CONSTITUENT}lib) :: ${OBJS}
    7         $(lib_echo) library
     7        $(lib_echo) "library $@"
    88        $(lib_silent) cd $(bin); \
    99          $(ar) $(${CONSTITUENT}lib) $?
    … …  
    5252
    5353${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    54         @if test ! "${CMTINSTALLAREA}" = ""; then\
    55           echo "installation done"; \
    56         fi
     54ifdef CMTINSTALLAREA
     55        $(echo) "installation done"
     56endif
    5757
    5858$(install_dir)/$(${CONSTITUENT}installname) :: $(bin)$(${CONSTITUENT}installname)
    59         @if test ! "${CMTINSTALLAREA}" = ""; then \
    60           $(cmt_install_action) \
     59ifdef CMTINSTALLAREA
     60        $(install_silent) $(cmt_install_action) \
    6161            -source "`(cd $(bin); pwd)`" \
    6262            -name "$(${CONSTITUENT}installname)" \
    6363            -out "$(install_dir)" \
    6464            -cmd "$(cmt_installarea_command)" \
    65             -cmtpath "$($(package)_cmtpath)" ; \
    66         fi
     65            -cmtpath "$($(package)_cmtpath)"
     66endif
    6767
    6868##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    7171
    7272${CONSTITUENT}uninstall ::
    73         @if test ! "${CMTINSTALLAREA}" = ""; then \
    74           $(cmt_uninstall_action) \
     73ifdef CMTINSTALLAREA
     74        $(cleanup_silent) $(cmt_uninstall_action) \
    7575            -source "`(cd $(bin); pwd)`" \
    7676            -name "$(${CONSTITUENT}installname)" \
    7777            -out "$(install_dir)" \
    78             -cmtpath "$($(package)_cmtpath)" ; \
    79         fi
    80 
     78            -cmtpath "$($(package)_cmtpath)"
     79endif
    8180
    8281#-- end of libary -----------------------

  • CMT/HEAD/mgr/fragments/library_header

    r11 r441  
    77
    88${CONSTITUENT} :: dirs ${PROTOTARGET} ${CONSTITUENT}LIB
    9         @/bin/echo "------> ${CONSTITUENT} ok"
     9        $(echo) "${CONSTITUENT} ok"
    1010
    1111#-- end of libary_header ----------------

  • CMT/HEAD/mgr/fragments/library_no_share

    r11 r441  
    22
    33${CONSTITUENT}LIB :: $(${CONSTITUENT}lib)
    4         @/bin/echo ${CONSTITUENT} : library ok
     4        $(echo) "${CONSTITUENT} : library ok"
    55
    66$(${CONSTITUENT}lib) :: ${OBJS}
    7         $(lib_echo) library
     7        $(lib_echo) "library $@"
    88        $(lib_silent) cd $(bin); \
    99          $(ar) $(${CONSTITUENT}lib) $?
    … …  
    3434
    3535${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    36         @if test ! "${CMTINSTALLAREA}" = ""; then\
    37           echo "installation done"; \
    38         fi
     36ifdef CMTINSTALLAREA
     37        $(echo) "installation done"
     38endif
    3939
    4040$(install_dir)/$(${CONSTITUENT}installname) :: $(bin)$(${CONSTITUENT}installname)
    41         @if test ! "${CMTINSTALLAREA}" = ""; then \
    42           $(cmt_install_action) \
     41ifdef CMTINSTALLAREA
     42        $(install_silent) $(cmt_install_action) \
    4343            -source "`(cd $(bin); pwd)`" \
    4444            -name "$(${CONSTITUENT}installname)" \
    4545            -out "$(install_dir)" \
    4646            -cmd "$(cmt_installarea_command)" \
    47             -cmtpath "$($(package)_cmtpath)" ; \
    48         fi
     47            -cmtpath "$($(package)_cmtpath)"
     48endif
    4949
    5050##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    5353
    5454${CONSTITUENT}uninstall ::
    55         @if test ! "${CMTINSTALLAREA}" = ""; then \
    56           $(cmt_uninstall_action) \
     55ifdef CMTINSTALLAREA
     56        $(cleanup_silent) $(cmt_uninstall_action) \
    5757            -source "`(cd $(bin); pwd)`" \
    5858            -name "$(${CONSTITUENT}installname)" \
    5959            -out "$(install_dir)" \
    60             -cmtpath "$($(package)_cmtpath)" ; \
    61         fi
     60            -cmtpath "$($(package)_cmtpath)"
     61endif
    6262
    6363${CONSTITUENT}clean ::

  • CMT/HEAD/mgr/fragments/make_header

    r434 r441  
    9999
    100100help ::
    101         @echo '${CONSTITUENT}'
     101        $(echo) '${CONSTITUENT}'
    102102
    103103binobj =
    … …  
    106106${CONSTITUENT}::
    107107        @if test ! -d $(bin)$(binobj) ; then $(mkdir) -p $(bin)$(binobj) ; fi
    108         @echo "STRUCTURED_OUTPUT="$(bin)$(binobj)
     108        $(echo) "STRUCTURED_OUTPUT="$(bin)$(binobj)
    109109endif
    110110

  • CMT/HEAD/src/Makefile.core

    r11 r441  
    4141#
    4242
     43ifndef CMTMSGHDR
     44CMTMSGHDR = \#CMT--->
     45endif
     46
     47ifdef ECHO
     48VERBOSE = 1
     49endif
     50
     51ifndef VERBOSE
     52QUIET = 1
     53endif
     54
     55ifdef SILENT
     56QUIET = 1
     57MAKEFLAGS += --silent
     58endif
     59
    4360ifdef QUIET
    4461LEX_QUIET = 1
    … …  
    5168LIB_QUIET = 1
    5269CLEANUP_QUIET = 1
     70INSTALL_QUIET = 1
    5371silent = @
    54 echo = @/bin/echo
     72echo = @- echo "$(CMTMSGHDR)"
    5573else
    5674silent =
    57 echo = @- echo
     75echo = @- echo "$(CMTMSGHDR)"
    5876endif
    5977
    6078ifdef LEX_QUIET
    6179lex_silent = @
    62 lex_echo = @/bin/echo rebuilding
     80lex_echo = $(echo) building
    6381else
    6482lex_silent =
    65 lex_echo = $(echo)
     83lex_echo = $(echo) building
    6684endif
    6785
    6886ifdef YACC_QUIET
    6987yacc_silent = @
    70 yacc_echo = @/bin/echo rebuilding
     88yacc_echo = $(echo) building
    7189else
    7290yacc_silent =
    73 yacc_echo = $(echo)
     91yacc_echo = $(echo) building
    7492endif
    7593
    7694ifdef C_QUIET
    7795c_silent = @
    78 c_echo = @/bin/echo rebuilding
     96c_echo = $(echo) compiling
    7997else
    8098c_silent =
    81 c_echo = $(echo)
     99c_echo = $(echo) compiling
    82100endif
    83101
    84102ifdef CPP_QUIET
    85103cpp_silent = @
    86 cpp_echo = @/bin/echo rebuilding
     104cpp_echo = $(echo) compiling
    87105else
    88106cpp_silent =
    89 cpp_echo = $(echo)
     107cpp_echo = $(echo) compiling
    90108endif
    91109
    92110ifdef FORTRAN_QUIET
    93111fortran_silent = @
    94 fortran_echo = @/bin/echo rebuilding
     112fortran_echo = $(echo) compiling
    95113else
    96114fortran_silent =
    97 fortran_echo = $(echo)
     115fortran_echo = $(echo) compiling
    98116endif
    99117
    100118ifdef JAVA_QUIET
    101119java_silent = @
    102 java_echo = @/bin/echo rebuilding
     120java_echo = $(echo) building
    103121else
    104122java_silent =
    105 java_echo = $(echo)
     123java_echo = $(echo) building
    106124endif
    107125
    108126ifdef LINK_QUIET
    109127link_silent = @
    110 link_echo = @/bin/echo rebuilding
     128link_echo = $(echo) building
    111129else
    112130link_silent =
    113 link_echo = $(echo)
     131link_echo = $(echo) building
    114132endif
    115133
    116134ifdef LIB_QUIET
    117135lib_silent = @
    118 lib_echo = @/bin/echo rebuilding
     136lib_echo = $(echo) building
    119137else
    120138lib_silent =
    121 lib_echo = $(echo)
     139lib_echo = $(echo) building
    122140endif
    123141
    124142ifdef CLEANUP_QUIET
    125143cleanup_silent = @
    126 cleanup_echo = @/bin/echo removing
     144cleanup_echo = $(echo) removing
    127145else
    128146cleanup_silent =
    129 cleanup_echo = $(echo)
     147cleanup_echo = $(echo) removing
     148endif
     149
     150ifdef INSTALL_QUIET
     151install_silent = @
     152install_echo = $(echo) installing
     153else
     154install_silent =
     155install_echo = $(echo) installing
     156endif
     157
     158ifdef ECHO
     159echo = @:
     160endif
     161
     162ifdef SILENT
     163echo = @:
    130164endif
    131165

  • CMT/HEAD/src/Makefile.header

    r434 r441  
    9898
    9999$(cmt_constituents_makefile) : $(cmt_local_tagfile)
    100         @echo "------> (Makefile.header) Rebuilding $@"; \
     100        $(echo) "(Makefile.header) Rebuilding $@"; \
    101101          if test ! -d $(@D) ; then $(mkdir) -p $(@D); fi; \
    102102          $(cmtexe) -quiet -tag=$(tags) build constituents_makefile -out=$@; \
    103103          retval=$$?; \
    104104          if test $${retval} != 0; then \
    105           echo "#CMT> Error generating constituents makefile" >&2; \
     105          echo "#CMT> Error: $@: Cannot generate" >&2; \
    106106          /bin/rm -f $@; fi; \
    107107          exit $${retval}
    … …  
    112112$(cmt_local_tagfile) :
    113113endif
    114         @/bin/echo "------> (Makefile.header) Rebuilding $@"; \
     114        $(echo) "(Makefile.header) Rebuilding $@"; \
    115115          if test -f $@; then rm -f $@; fi; \
    116116          if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \
    117           echo CMTCONFIG=$(CMTCONFIG) ; \
    118           $(cmtexe) -quiet -tag=$(tags) build tag_makefile >$@ \
    119           && /bin/echo $@ ok   
     117          $(cmtexe) -quiet -tag=$(tags) build tag_makefile >$@
     118
     119#         && /bin/echo $@ ok   
     120#       $(echo) CMTCONFIG=$(CMTCONFIG) ; \
     121#
    120122
    121123#
Note: See TracChangeset for help on using the changeset viewer.