Changeset 487


Ignore:
Timestamp:
Jan 8, 2009, 11:23:36 AM (15 years ago)
Author:
rybkin
Message:

See C.L. 382

Location:
CMT/HEAD
Files:
1 added
49 edited

Legend:

Unmodified
Added
Removed
  • CMT/HEAD/ChangeLog

    r486 r487  
     12009-01-08    <rybkin@lal.in2p3.fr> 382
     2       
     3        * source/cmt_parser.cxx: In function Cmt::do_show_groups, ensure that the
     4        constituents are parsed so that command "cmt show groups" is functional
     5        * src/Makefile.header: Make the READONLY mode obsolete (the relocation
     6        of the binary build directory provides this functionality as well).
     7        Change the name of the file recording the setup to $(bin)setup.make and
     8        generate it here. Do not specify the first, config targets. Add the
     9        uninstall targets to the help message
     10        * mgr/fragments/constituents_header: Make the READONLY mode obsolete.
     11        Change the name of the file recording the setup to $(bin)setup.make and
     12        do not generate it here. Remove the first, config, checkuses targets
     13        * mgr/fragments/constituent: Make the READONLY mode obsolete.
     14        Change the names of the files recording the setup to $(bin)setup.make and
     15        $(bin)setup_${CONSTITUENT}.make, do not override the latter when identical
     16        (see C.L. 233). Make $(cmt_local_${CONSTITUENT}_makefile) only depend on
     17        $(cmt_local_tagfile_${CONSTITUENT}). Make ${CONSTITUENT}clean also depend
     18        on $(cmt_local_${CONSTITUENT}_makefile)
     19        * mgr/fragments/constituent_lock: idem
     20        * mgr/fragments/make_header: Make the READONLY mode obsolete.
     21        Change the names of the files recording the setup to $(bin)setup.make and
     22        $(bin)setup_${CONSTITUENT}.make. Add a rule with an empty command for
     23        $(use_requirements) for optimisation.
     24        * mgr/fragments/cmt_action_runner_header: Improve control of Make verbosity
     25        * mgr/fragments/protos_header: idem
     26        * mgr/fragments/buildproto: idem
     27        * mgr/fragments/cleanup_objects: Clean up per object file dependencies
     28        files and stamps
     29        * mgr/fragments/library: idem
     30        * mgr/fragments/library_no_share: idem
     31        * mgr/fragments/library_no_static: idem
     32        * mgr/fragments/dependencies: Do not include dependencies fragment in the
     33        constituent makefile when "make uninstall" is run
     34        * mgr/fragments/c: idem
     35        * mgr/fragments/c_library: idem
     36        * mgr/fragments/cpp: idem
     37        * mgr/fragments/cpp_library: idem
     38        * mgr/fragments/cleanup_library: Fix for the clean command
     39        * mgr/fragments/check_application_header: Improve control of Make verbosity,
     40        make ${CONSTITUENT}check depend on $(cmt_local_${CONSTITUENT}_makefile)
     41        * mgr/fragments/check_application: Specify the application path when
     42        running it (so that the command does not fail if . is not in the PATH)
     43        * mgr/fragments/constituents_trailer: Minor change to diognostic messages
     44        * mgr/fragments/cleanup_application: idem
     45        * mgr/fragments/cleanup_header: Replace cd . with an empty command
     46        * mgr/cmt_uninstall_action.sh: Ensure that dangling symbolic links can be
     47        uninstalled
     48        * src/NMakefile.header: Improve the help message, make it the same as for UNix-like
     49        systems. In the QUICK mode, generate $(cmt_constituents_makefile) if non-existent
     50        * mgr/fragments/nmake/constituents_header: Do not override the $(bin)setup.nmake
     51        when identical (see C.L. 233). In the QUICK mode, generate $(cmt_local_tagfile)
     52        if non-existent. Add diagnostic messages
     53        * mgr/fragments/nmake/constituent: Change the names of the files recording
     54        the setup to $(bin)setup.nmake and $(bin)setup_${CONSTITUENT}.nmake, do not
     55        override the latter when identical (see C.L. 233).
     56        Make $(cmt_local_${CONSTITUENT}_makefile) only depend on
     57        $(cmt_local_tagfile_${CONSTITUENT}). Make ${CONSTITUENT}clean also depend
     58        on $(cmt_local_${CONSTITUENT}_makefile).
     59        In the QUICK mode, generate $(cmt_local_tagfile_${CONSTITUENT}) if non-existent
     60        * mgr/fragments/nmake/constituent_lock: idem
     61        * mgr/fragments/nmake/cmt_action_runner_header: Improve control of Make verbosity
     62        * mgr/fragments/nmake/protos_header: idem
     63        * mgr/fragments/nmake/buildproto: Introduce NMake version of the file
     64        * mgr/fragments/nmake/cpp: Fix a typo
     65        * mgr/fragments/nmake/cpp_library: idem
     66        * mgr/fragments/nmake/c: idem
     67        * mgr/fragments/nmake/c_library: idem
     68        * mgr/fragments/nmake/application: Remove the connection between clean and
     69        uninstall targets - same as the for Unix-like systems (see C.L. 246)
     70        * mgr/fragments/nmake/library: idem
     71        * mgr/fragments/nmake/library_no_share: idem
     72        * mgr/fragments/nmake/library_no_static: idem
     73        * mgr/fragments/nmake/jar: idem
     74        * mgr/fragments/nmake/java_header: idem
     75        * mgr/fragments/nmake/install_includes_header: idem
     76        * mgr/fragments/nmake/dependencies: Do not attempt to include the dependencies
     77        file if non-existent
     78        * mgr/fragments/nmake/group: Make ${GROUP} also depend on
     79        $(${GROUP}_dependencies)
     80        * mgr/fragments/nmake/check_application_header: Improve control of Make verbosity,
     81        make ${CONSTITUENT}check depend on $(cmt_local_${CONSTITUENT}_makefile)
     82        * mgr/fragments/nmake/make_header: Change the names of the files recording the
     83        setup to $(bin)setup.nmake and $(bin)setup_${CONSTITUENT}.nmake. Add a rule with
     84        an empty command for $(use_requirements) for optimisation
     85        * mgr/fragments/nmake/constituents_trailer: Remove the connection between
     86        binclean and clean targets to make the former a fast removal of $(bin)
     87        * mgr/fragments/nmake/cleanup_header: Add a clean target dependent on
     88        ${CONSTITUENT}clean
     89       
    1902008-12-17    <rybkin@lal.in2p3.fr> 381
    291       
  • CMT/HEAD/mgr/cmt_uninstall_action.sh

    r446 r487  
    122122fi
    123123
    124 if test -d ${dest_file_path}; then
     124if test -L ${dest_file_path}; then
     125
     126if test "${cmtmsg}"; then
     127  echo "${CMTMSGPREFIX}" removing symbolic link ${file_name} from ${install_dir}
     128fi
     129if test "${makecmd}"; then set -v; fi
     130  /bin/rm -f ${dest_file_path}
     131if test "${makecmd}"; then set +v; fi
     132
     133elif test -d ${dest_file_path}; then
     134
    125135if test "${cmtmsg}"; then
    126136  echo "${CMTMSGPREFIX}" removing directory ${file_name} from ${install_dir}
     
    129139  /bin/rm -rf ${dest_file_path}
    130140if test "${makecmd}"; then set +v; fi
     141
    131142elif test -f ${dest_file_path}; then
     143
    132144if test "${cmtmsg}"; then
    133145  echo "${CMTMSGPREFIX}" removing file ${file_name} from ${install_dir}
     
    136148  /bin/rm -f ${dest_file_path}
    137149if test "${makecmd}"; then set +v; fi
     150
    138151fi
    139152
  • CMT/HEAD/mgr/fragments/buildproto

    r11 r487  
    22
    33$(inc)${NAME}.pp : ${FILEPATH}${FILENAME}
    4         @echo "Now rebuilding $@"
    5         @cd $(inc); $(build_prototype) ${FILEPATH}${FILENAME} >/dev/null
    6         @cat /dev/null >$(inc)${NAME}.pp
     4        $(echo) "Now rebuilding $@"
     5        cd $(inc); $(build_prototype) ${FILEPATH}${FILENAME} >/dev/null
     6        cat /dev/null >$(inc)${NAME}.pp
    77
    88#-- end of buildproto
  • CMT/HEAD/mgr/fragments/c

    r483 r487  
    44
    55ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
     6ifneq ($(MAKECMDGOALS),uninstall)
    67-include $(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d
    78
     
    1213        $(c_silent) $(ccomp) ${DEPENDENCIESOPTS} -o $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep $(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}
    1314        $(c_silent) $(format_dependencies) $@ $(@D)/${NAME}${CONSTITUENTSUFFIX}.o ${FULLNAME} $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep
     15endif
    1416endif
    1517
  • CMT/HEAD/mgr/fragments/c_library

    r483 r487  
    44
    55ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
     6ifneq ($(MAKECMDGOALS),uninstall)
    67-include $(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d
    78
     
    1213        $(c_silent) $(ccomp) ${DEPENDENCIESOPTS} -o $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep $(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}
    1314        $(c_silent) $(format_dependencies) $@ $(@D)/${NAME}${CONSTITUENTSUFFIX}.o ${FULLNAME} $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep
     15endif
    1416endif
    1517
  • CMT/HEAD/mgr/fragments/check_application

    r11 r487  
    44
    55${CONSTITUENT}check :: ${CONSTITUENT}
    6         cd $(bin); $(${CONSTITUENT}_pre_check)
    7         cd $(bin); ${CONSTITUENT}${application_suffix} $(${CONSTITUENT}_check_args)
    8         cd $(bin); $(${CONSTITUENT}_post_check)
     6        $(${CONSTITUENT}_pre_check)
     7        $(bin)${CONSTITUENT}${application_suffix} $(${CONSTITUENT}_check_args)
     8        $(${CONSTITUENT}_post_check)
     9
    910#-- end of check_application ------
  • CMT/HEAD/mgr/fragments/check_application_header

    r459 r487  
    22
    33check :: ${CONSTITUENT}check
    4         @echo "------> ${CONSTITUENT}check ok"
     4        $(echo) "(constituents.make) ${CONSTITUENT}check ok"
     5#       @echo "------> ${CONSTITUENT}check ok"
    56
    6 ${CONSTITUENT}check ::
    7         @echo "------> starting ${CONSTITUENT}check"
    8         @$(cmtexe) build constituent_makefile ${CONSTITUENT}; $(MAKE) -f ${CONSTITUENT}.make build_strategy=keep_makefiles ${CONSTITUENT}check
     7#${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile)
     8${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile)
     9        $(echo) "(constituents.make) Starting $@"
     10        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) $@
     11
     12#${CONSTITUENT}check ::
     13#       @echo "------> starting ${CONSTITUENT}check"
     14#       @$(cmtexe) build constituent_makefile ${CONSTITUENT}; $(MAKE) -f ${CONSTITUENT}.make build_strategy=keep_makefiles ${CONSTITUENT}check
    915
    1016#-- end of check_application_header ------
  • CMT/HEAD/mgr/fragments/cleanup_application

    r441 r487  
    11#-- start of cleanup_application ------
    2         $(cleanup_echo) ${CONSTITUENT}${application_suffix}
     2        $(cleanup_echo) application ${CONSTITUENT}
    33        -$(cleanup_silent) cd $(bin); /bin/rm -f ${CONSTITUENT}${application_suffix}
    4 
    5 #       @echo "------> (${CONSTITUENT}.make) Removing application files"
    64#-- end of cleanup_application ------
  • CMT/HEAD/mgr/fragments/cleanup_header

    r459 r487  
    11#-- start of cleanup_header --------------
    22
    3 clean :: ${CONSTITUENT}clean
    4         @cd .
     3clean :: ${CONSTITUENT}clean ;
     4#       @cd .
    55
    66ifndef PEDANTIC
  • CMT/HEAD/mgr/fragments/cleanup_library

    r204 r487  
    11#-- start of cleanup_library -------------
    2         $(cleanup_echo) library
    3         -$(cleanup_silent) cd $(bin); /bin/rm -f $(binobj)$(library_prefix)${CONSTITUENT}$(library_suffix).a $(binobj)$(library_prefix)${CONSTITUENT}$(library_suffix).s? $(binobj)${CONSTITUENT}.stamp $(binobj)${CONSTITUENT}.shstamp
     2        $(cleanup_echo) library ${CONSTITUENT}
     3        -$(cleanup_silent) cd $(bin); /bin/rm -f $(library_prefix)${CONSTITUENT}$(library_suffix).a $(library_prefix)${CONSTITUENT}$(library_suffix).s? ${CONSTITUENT}.stamp ${CONSTITUENT}.shstamp
    44#-- end of cleanup_library ---------------
    5 
  • CMT/HEAD/mgr/fragments/cleanup_objects

    r469 r487  
    11#-- start of cleanup_objects ------
    2         $(cleanup_echo) objects
     2        $(cleanup_echo) objects ${CONSTITUENT}
    33        -$(cleanup_silent) /bin/rm -f ${OBJS}
     4        -$(cleanup_silent) /bin/rm -f $(patsubst %.o,%.d,${OBJS}) $(patsubst %.o,%.dep,${OBJS}) $(patsubst %.o,%.d.stamp,${OBJS})
    45        -$(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
    56#-- end of cleanup_objects ------
  • CMT/HEAD/mgr/fragments/cmt_action_runner_header

    r79 r487  
    77ifdef ${CONSTITUENT}_once
    88
    9 ${CONSTITUENT}actionstamp = ${CONSTITUENT}.actionstamp
     9${CONSTITUENT}actionstamp = $(bin)${CONSTITUENT}.actionstamp
     10#${CONSTITUENT}actionstamp = ${CONSTITUENT}.actionstamp
    1011
    1112${CONSTITUENT} :: $(${CONSTITUENT}actionstamp)
    12         @echo ${CONSTITUENT} ok
     13        $(echo) "${CONSTITUENT} ok"
     14#       @echo ${CONSTITUENT} ok
    1315
    1416$(${CONSTITUENT}actionstamp) :: $(${CONSTITUENT}_dependencies)
    1517        $(silent) ${action_value}
    16         @echo ok > $(${CONSTITUENT}actionstamp)
     18        $(silent) cat /dev/null > $(${CONSTITUENT}actionstamp)
     19#       @echo ok > $(${CONSTITUENT}actionstamp)
    1720
    1821${CONSTITUENT}clean ::
    19         @/bin/rm -f $(${CONSTITUENT}actionstamp)
     22        $(cleanup_silent) /bin/rm -f $(${CONSTITUENT}actionstamp)
    2023
    2124else
  • CMT/HEAD/mgr/fragments/constituent

    r483 r487  
    77ifdef cmt_${CONSTITUENT}_has_target_tag
    88
    9 ifdef READONLY
    10 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid)
    11 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}setup.make
    12 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    13 else
    149#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
    1510cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    16 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
     11cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}$$$$.make
     12cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
     13#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    1714cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    18 endif
    1915
    2016${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
     
    2622$(cmt_local_tagfile_${CONSTITUENT}) :
    2723endif
    28         $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
    29         @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    30           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \
    31           if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \
    32           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})
    33         $(echo) setup.make ok
     24        $(echo) "(constituents.make) Rebuilding $@"; \
     25          if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
     26          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT})
     27        $(echo) "(constituents.make) Rebuilding $(cmt_final_setup_${CONSTITUENT})"; \
     28          test ! -f $(cmt_local_setup_${CONSTITUENT}) || \rm -f $(cmt_local_setup_${CONSTITUENT}); \
     29          trap '\rm -f $(cmt_local_setup_${CONSTITUENT})' 0 1 2 15; \
     30          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT}) && \
     31          if [ -f $(cmt_final_setup_${CONSTITUENT}) ] && \
     32            \cmp -s $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}); then \
     33            \rm $(cmt_local_setup_${CONSTITUENT}); else \
     34            \mv -f $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}); fi
    3435
    3536else
    3637
    37 ifdef READONLY
    38 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    39 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
    40 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    41 else
    4238#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
    4339cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    44 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
     40cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
     41#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    4542cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    46 endif
    4743
    4844endif
    4945
    50 ifndef QUICK
    5146ifdef STRUCTURED_OUTPUT
    52  ${CONSTITUENT}dirs ::
     47${CONSTITUENT}dirs :
    5348        @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
    5449        $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
     50else
     51${CONSTITUENT}dirs : ;
     52endif
    5553
    56 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
    57 else
    58 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
    59 endif
    60 else
    61 $(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    62 endif
     54#ifndef QUICK
     55#ifdef STRUCTURED_OUTPUT
     56# ${CONSTITUENT}dirs ::
     57#       @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
     58#       $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
     59#
     60#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
     61#else
     62#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
     63#endif
     64#else
     65#$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     66#endif
     67
     68$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
    6369        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
    6470          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    6571
    66 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     72ifndef QUICK
     73${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs
     74else
     75${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
     76endif
    6777        $(echo) "(constituents.make) Starting ${CONSTITUENT}"
    68         @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}
     78        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    6979        $(echo) "(constituents.make) ${CONSTITUENT} done"
    7080
    7181clean :: ${CONSTITUENT}clean
    7282
    73 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     83${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    7484        $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
    75         @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    76           $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
    77         fi
     85        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean
     86        $(echo) "(constituents.make) ${CONSTITUENT}clean done"
     87#       @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     88#         $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
     89#       fi
    7890
    7991##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
     
    8395${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    8496        $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
    85         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
     97        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
    8698        $(echo) "(constituents.make) install ${CONSTITUENT} done"
    8799
     
    90102${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    91103        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    92         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
     104        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
    93105        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
    94106
     
    100112endif
    101113
    102 
    103114#-- end of constituent ------
  • CMT/HEAD/mgr/fragments/constituent_lock

    r483 r487  
    77ifdef cmt_${CONSTITUENT}_has_target_tag
    88
    9 ifdef READONLY
    10 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid)
    11 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}setup.make
    12 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    13 else
    149#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
    1510cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    16 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
     11cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}$$$$.make
     12cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
     13#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    1714cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    18 endif
    1915
    2016${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
     
    2622$(cmt_local_tagfile_${CONSTITUENT}) :
    2723endif
    28         $(echo) "(constituents.make) Rebuilding setup.make $(cmt_local_tagfile_${CONSTITUENT})"
    29         @if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
    30           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT}); \
    31           if test -f $(cmt_final_setup_${CONSTITUENT}); then /bin/rm -f $(cmt_final_setup_${CONSTITUENT}); fi; \
    32           $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >>$(cmt_final_setup_${CONSTITUENT})
    33         $(echo) setup.make ok
     24        $(echo) "(constituents.make) Rebuilding $@"; \
     25          if test -f $(cmt_local_tagfile_${CONSTITUENT}); then /bin/rm -f $(cmt_local_tagfile_${CONSTITUENT}); fi ; \
     26          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >>$(cmt_local_tagfile_${CONSTITUENT})
     27        $(echo) "(constituents.make) Rebuilding $(cmt_final_setup_${CONSTITUENT})"; \
     28          test ! -f $(cmt_local_setup_${CONSTITUENT}) || \rm -f $(cmt_local_setup_${CONSTITUENT}); \
     29          trap '\rm -f $(cmt_local_setup_${CONSTITUENT})' 0 1 2 15; \
     30          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT}) && \
     31          if [ -f $(cmt_final_setup_${CONSTITUENT}) ] && \
     32            \cmp -s $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}); then \
     33            \rm $(cmt_local_setup_${CONSTITUENT}); else \
     34            \mv -f $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}); fi
    3435
    3536else
    3637
    37 ifdef READONLY
    38 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    39 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
    40 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    41 else
    4238#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
    4339cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    44 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
     40cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
     41#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    4542cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    46 endif
    4743
    4844endif
    4945
    50 ifndef QUICK
    5146ifdef STRUCTURED_OUTPUT
    52 ${CONSTITUENT}dirs ::
     47${CONSTITUENT}dirs :
    5348        @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
    5449        $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
     50else
     51${CONSTITUENT}dirs : ;
     52endif
    5553
    56 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
    57 else
    58 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
    59 endif
    60 else
    61 $(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    62 endif
     54#ifndef QUICK
     55#ifdef STRUCTURED_OUTPUT
     56# ${CONSTITUENT}dirs ::
     57#       @if test ! -d $(bin)${CONSTITUENT}; then $(mkdir) -p $(bin)${CONSTITUENT}; fi
     58#       $(echo) "STRUCTURED_OUTPUT="$(bin)${CONSTITUENT}
     59#
     60#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs ${CONSTITUENT}dirs
     61#else
     62#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) build_library_links dirs
     63#endif
     64#else
     65#$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     66#endif
     67
     68$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
    6369        $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \
    6470          $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    6571
    66 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     72ifndef QUICK
     73${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) build_library_links dirs ${CONSTITUENT}dirs
     74else
     75${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs ${CONSTITUENT}dirs
     76endif
    6777        $(echo) "(constituents.make) Creating ${CONSTITUENT}${lock_suffix} and Starting ${CONSTITUENT}"
    6878        @${lock_command} ${CONSTITUENT}${lock_suffix} || exit $$?; \
    6979          retval=$$?; \
    7080          trap '${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}' 1 2 15; \
    71           $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}; \
     81          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}; \
    7282          retval=$$?; ${unlock_command} ${CONSTITUENT}${lock_suffix}; exit $${retval}
    7383        $(echo) "(constituents.make) ${CONSTITUENT} done"
     
    7585clean :: ${CONSTITUENT}clean
    7686
    77 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     87${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    7888        $(echo) "(constituents.make) Starting ${CONSTITUENT}clean"
    79         @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    80           $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
    81         fi
     89        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}clean
     90        $(echo) "(constituents.make) ${CONSTITUENT}clean done"
     91#       @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     92#         $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} ${CONSTITUENT}clean; \
     93#       fi
    8294
    8395##        /bin/rm -f $(cmt_local_${CONSTITUENT}_makefile) $(bin)${CONSTITUENT}_dependencies.make
     
    8799${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    88100        $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
    89         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} install
     101        @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
    90102        $(echo) "(constituents.make) install ${CONSTITUENT} done"
    91103
     
    94106${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    95107        $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    96         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) cmt_lock_pid=$${cmt_lock_pid} uninstall
     108        @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
    97109        $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
    98110
     
    104116endif
    105117
    106 
    107118#-- end of constituent_lock ------
  • CMT/HEAD/mgr/fragments/constituents_header

    r459 r487  
    1414${PACKAGE}_tag = $(tag)
    1515
    16 ifdef READONLY
    17 cmt_local_tagfile = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    18 else
    1916#cmt_local_tagfile = $(${PACKAGE}_tag).make
    2017cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).make
    21 endif
    2218
    2319#-include $(cmt_local_tagfile)
    2420include $(cmt_local_tagfile)
    2521
    26 ifdef READONLY
    27 cmt_local_setup = /tmp/CMT_${PACKAGE}setup$(cmt_lock_pid).make
    28 cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
    29 else
    30 #cmt_local_setup = $(bin)${PACKAGE}setup$(cmt_lock_pid).make
    31 cmt_local_setup = $(bin)$(package)setup$$$$.make
     22#cmt_local_setup = $(bin)setup$$$$.make
     23#cmt_local_setup = $(bin)$(package)setup$$$$.make
    3224#cmt_final_setup = $(bin)${PACKAGE}setup.make
    33 cmt_final_setup = $(bin)$(package)setup.make
    34 endif
     25cmt_final_setup = $(bin)setup.make
     26#cmt_final_setup = $(bin)$(package)setup.make
    3527
    3628#--------------------------------------------------------
     
    4133#first :: $(cmt_local_tagfile)
    4234#       @echo $(cmt_local_tagfile) ok
    43 ifndef QUICK
    44 first :: $(cmt_final_setup) ;
    45 else
    46 first :: ;
    47 endif
     35#ifndef QUICK
     36#first :: $(cmt_final_setup) ;
     37#else
     38#first :: ;
     39#endif
    4840
    4941##      @bin=`$(cmtexe) show macro_value bin`
     
    5143#$(cmt_local_tagfile) : $(cmt_lock_setup)
    5244#       @echo "#CMT> Error: $@: No such file" >&2; exit 1
    53 $(cmt_local_tagfile) :
    54         @echo "#CMT> Warning: $@: No such file" >&2; exit
     45#$(cmt_local_tagfile) :
     46#       @echo "#CMT> Warning: $@: No such file" >&2; exit
    5547#       @echo "#CMT> Info: $@: No need to rebuild file" >&2; exit
    5648
    57 $(cmt_final_setup) : $(cmt_local_tagfile)
    58         $(echo) "(constituents.make) Rebuilding $@"
    59         @if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \
    60           if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \
    61           trap '/bin/rm -f $(cmt_local_setup)' 0 1 2 15; \
    62           $(cmtexe) -tag=$(tags) show setup >>$(cmt_local_setup); \
    63           if test ! -f $@; then \
    64             mv $(cmt_local_setup) $@; \
    65           else \
    66             if /usr/bin/diff $(cmt_local_setup) $@ >/dev/null ; then \
    67               : ; \
    68             else \
    69               mv $(cmt_local_setup) $@; \
    70             fi; \
    71           fi
     49#$(cmt_final_setup) : $(cmt_local_tagfile)
     50#       $(echo) "(constituents.make) Rebuilding $@"
     51#       @if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \
     52#         if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \
     53#         trap '/bin/rm -f $(cmt_local_setup)' 0 1 2 15; \
     54#         $(cmtexe) -tag=$(tags) show setup >>$(cmt_local_setup); \
     55#         if test ! -f $@; then \
     56#           mv $(cmt_local_setup) $@; \
     57#         else \
     58#           if /usr/bin/diff $(cmt_local_setup) $@ >/dev/null ; then \
     59#             : ; \
     60#           else \
     61#             mv $(cmt_local_setup) $@; \
     62#           fi; \
     63#         fi
    7264
    7365#       @/bin/echo $@ ok   
    7466
    75 config :: checkuses
    76         @exit 0
    77 checkuses : ;
     67#config :: checkuses
     68#       @exit 0
     69#checkuses : ;
    7870
    7971env.make ::
     
    9183        @if test ! -d $(src) ; then $(mkdir) -p $(src) ; fi
    9284
    93 dirs ::
    94         @if test ! -r requirements ; then echo "No requirements file" ; fi; \
    95           if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi
     85dirs :: requirements
     86        @if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi
     87#       @if test ! -r requirements ; then echo "No requirements file" ; fi; \
     88#         if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi
    9689
    97 build_library_links : dirs requirements
     90requirements :
     91        @if test ! -r requirements ; then echo "No requirements file" ; fi
     92
     93build_library_links : dirs
    9894        $(echo) "(constituents.make) Rebuilding library links"; \
    99         if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi; \
    100         $(build_library_links)
     95         $(build_library_links)
     96#       if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi; \
     97#       $(build_library_links)
    10198
    10299.DEFAULT ::
  • CMT/HEAD/mgr/fragments/constituents_trailer

    r441 r487  
    44
    55remove_library_links ::
    6         $(echo) "Removing library links"; \
     6        $(echo) "(constituents.make) Removing library links"; \
    77          $(remove_library_links)
    88
     
    1616
    1717binclean :: clean
    18         $(echo) "Removing binary directory $(bin)"
     18        $(echo) "(constituents.make) Removing binary directory $(bin)"
    1919        @if test ! "$(bin)" = "./"; then \
    2020          /bin/rm -rf $(bin); \
  • CMT/HEAD/mgr/fragments/cpp

    r483 r487  
    44
    55ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
     6ifneq ($(MAKECMDGOALS),uninstall)
    67-include $(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d
    78
     
    1213        $(cpp_silent) $(cppcomp) ${DEPENDENCIESOPTS} -o $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep $(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}
    1314        $(cpp_silent) $(format_dependencies) $@ $(@D)/${NAME}${CONSTITUENTSUFFIX}.o ${FULLNAME} $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep
     15endif
    1416endif
    1517
  • CMT/HEAD/mgr/fragments/cpp_library

    r483 r487  
    44
    55ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
     6ifneq ($(MAKECMDGOALS),uninstall)
    67-include $(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.d
    78
     
    1213        $(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}
    1314        $(cpp_silent) $(format_dependencies) $@ $(@D)/${NAME}${CONSTITUENTSUFFIX}.o ${FULLNAME} $(@D)/${NAME}${CONSTITUENTSUFFIX}.dep
     15endif
    1416endif
    1517
  • CMT/HEAD/mgr/fragments/dependencies

    r474 r487  
    11#-- start of dependency ------------------
    22ifneq ($(MAKECMDGOALS),${CONSTITUENT}clean)
     3ifneq ($(MAKECMDGOALS),uninstall)
    34
    45#$(bin)${CONSTITUENT}_dependencies.make :: dirs
     
    1516
    1617endif
     18endif
    1719#-- end of dependency -------------------
  • CMT/HEAD/mgr/fragments/library

    r469 r487  
    3434
    3535${CONSTITUENT}clean ::
    36         $(cleanup_echo) objects
     36        $(cleanup_echo) objects ${CONSTITUENT}
    3737        $(cleanup_silent) /bin/rm -f ${OBJS}
     38        $(cleanup_silent) /bin/rm -f $(patsubst %.o,%.d,${OBJS}) $(patsubst %.o,%.dep,${OBJS}) $(patsubst %.o,%.d.stamp,${OBJS})
    3839        $(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
    3940
  • CMT/HEAD/mgr/fragments/library_no_share

    r469 r487  
    6161
    6262${CONSTITUENT}clean ::
    63         $(cleanup_echo) ${OBJS}
     63        $(cleanup_echo) objects ${CONSTITUENT}
    6464        $(cleanup_silent) /bin/rm -f ${OBJS}
     65        $(cleanup_silent) /bin/rm -f $(patsubst %.o,%.d,${OBJS}) $(patsubst %.o,%.dep,${OBJS}) $(patsubst %.o,%.d.stamp,${OBJS})
     66        $(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
     67#       $(cleanup_echo) ${OBJS}
     68#       $(cleanup_silent) /bin/rm -f ${OBJS}
    6569
    6670#-- end of library_no_share ------
  • CMT/HEAD/mgr/fragments/library_no_static

    r469 r487  
    3636
    3737${CONSTITUENT}clean ::
    38         $(cleanup_echo) objects
     38        $(cleanup_echo) objects ${CONSTITUENT}
    3939        $(cleanup_silent) /bin/rm -f ${OBJS}
     40        $(cleanup_silent) /bin/rm -f $(patsubst %.o,%.d,${OBJS}) $(patsubst %.o,%.dep,${OBJS}) $(patsubst %.o,%.d.stamp,${OBJS})
    4041        $(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
    4142
  • CMT/HEAD/mgr/fragments/make_header

    r483 r487  
    2626${PACKAGE}_tag = $(tag)
    2727
    28 ifdef READONLY
    29 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid)
    30 else
    3128#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
    3229cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.make
    33 endif
    3430
    3531else
     
    3935${PACKAGE}_tag = $(tag)
    4036
    41 ifdef READONLY
    42 cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    43 else
    4437#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
    4538cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).make
    46 endif
    4739
    4840endif
    4941
    50 -include $(cmt_local_tagfile_${CONSTITUENT})
     42include $(cmt_local_tagfile_${CONSTITUENT})
     43#-include $(cmt_local_tagfile_${CONSTITUENT})
    5144
    5245ifdef cmt_${CONSTITUENT}_has_target_tag
    5346
    54 ifdef READONLY
    55 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}setup.make
    56 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    57 else
    58 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
     47cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
     48#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
    5949cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    60 endif
    6150
    6251else
    6352
    64 ifdef READONLY
    65 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
    66 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    67 else
    68 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
     53cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
     54#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
    6955cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    70 endif
    7156
    7257endif
    7358
    74 ifdef READONLY
    75 cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
    76 else
    77 cmt_final_setup = $(bin)${PACKAGE}setup.make
    78 endif
     59cmt_final_setup = $(bin)setup.make
     60#cmt_final_setup = $(bin)${PACKAGE}setup.make
    7961
    80 ${CONSTITUENT} ::
    81 
    82 
    83 ifdef READONLY
    84 ${CONSTITUENT} ::
    85         @echo tags=$(tags)
    86         @echo cmt_local_tagfile=$(cmt_local_tagfile)
    87 endif
    88 
     62#${CONSTITUENT} :: ;
    8963
    9064dirs ::
     
    10983endif
    11084
     85ifdef use_requirements
     86$(use_requirements) : ;
     87endif
     88
    11189#-- end of make_header ------------------
    112 
  • CMT/HEAD/mgr/fragments/nmake/application

    r484 r487  
    3030!endif
    3131
    32 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     32##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    3333
    3434uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/c

    r483 r487  
    33!if "${DEPENDENCIESOPTS}" != ""
    44
    5 !if exists ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
     5!if exist ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
    66!include $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d
    77!endif
  • CMT/HEAD/mgr/fragments/nmake/c_library

    r483 r487  
    33!if "${DEPENDENCIESOPTS}" != ""
    44
    5 !if exists ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
     5!if exist ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
    66!include $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d
    77!endif
  • CMT/HEAD/mgr/fragments/nmake/check_application_header

    r459 r487  
     1#-- start of check_application_header ------
    12
    23check :: ${CONSTITUENT}check
    3         @echo "------> ${CONSTITUENT}check ok"
     4        $(echo) "(constituents.nmake) ${CONSTITUENT}check ok"
     5#       @echo "------> ${CONSTITUENT}check ok"
    46
    5 ${CONSTITUENT}check ::
    6         @echo "------> starting ${CONSTITUENT}check"
    7         @$(cmtexe) build -nmake constituent_makefile ${CONSTITUENT}
    8         $(MAKE) /f ${CONSTITUENT}.nmake build_strategy=keep_makefiles ${CONSTITUENT}check
     7#${CONSTITUENT}check : ${CONSTITUENT} $(cmt_local_${CONSTITUENT}_makefile)
     8${CONSTITUENT}check : $(cmt_local_${CONSTITUENT}_makefile)
     9        $(echo) "(constituents.nmake) Starting $@"
     10        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles $@ tag=$(tag)
    911
     12#${CONSTITUENT}check ::
     13#       @echo "------> starting ${CONSTITUENT}check"
     14#       @$(cmtexe) build -nmake constituent_makefile ${CONSTITUENT}
     15#       $(MAKE) /f ${CONSTITUENT}.nmake build_strategy=keep_makefiles ${CONSTITUENT}check
     16
     17#-- end of check_application_header ------
  • CMT/HEAD/mgr/fragments/nmake/cleanup_header

    r11 r487  
     1
     2clean :: ${CONSTITUENT}clean ;
    13
    24${CONSTITUENT}clean ::
  • CMT/HEAD/mgr/fragments/nmake/cmt_action_runner_header

    r337 r487  
    77!if defined (${CONSTITUENT}_once)
    88
    9 ${CONSTITUENT}actionstamp = ${CONSTITUENT}.actionstamp
     9${CONSTITUENT}actionstamp = $(bin)${CONSTITUENT}.actionstamp
     10#${CONSTITUENT}actionstamp = ${CONSTITUENT}.actionstamp
    1011
    1112${CONSTITUENT} :: $(${CONSTITUENT}actionstamp)
    12         @echo ${CONSTITUENT} ok
     13        $(echo) "${CONSTITUENT} ok"
     14#       @echo ${CONSTITUENT} ok
    1315
    1416#-- $(${CONSTITUENT}_dependencies)
    1517$(${CONSTITUENT}actionstamp) ::
    1618        $(silent) ${action_value}
    17         @echo ok > $(${CONSTITUENT}actionstamp)
     19        $(silent) type nul > $(${CONSTITUENT}actionstamp)
     20#       @echo ok > $(${CONSTITUENT}actionstamp)
    1821
    1922${CONSTITUENT}clean ::
    20         @if exist $(${CONSTITUENT}actionstamp) del $(${CONSTITUENT}actionstamp)
     23        $(cleanup_silent)if exist $(${CONSTITUENT}actionstamp) del $(${CONSTITUENT}actionstamp)
     24#       @if exist $(${CONSTITUENT}actionstamp) del $(${CONSTITUENT}actionstamp)
    2125
    2226!else
  • CMT/HEAD/mgr/fragments/nmake/constituent

    r473 r487  
    99#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    1010cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    11 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
     11cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake.tmp
     12cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake
     13#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
    1214cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    1315
     
    1719!endif
    1820
    19 !if "$(QUICK)" == ""
     21!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
    2022
     23!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
     24!endif
    2125!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
    2226!endif
    2327
    24 !if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0
     28!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
     29!endif
     30!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
     31!endif
     32
     33!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
     34!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
     35!endif
     36!else
     37!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
     38!endif
    2539!endif
    2640
     
    3145#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
    3246cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
    33 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
     47#cmt_local_setup_${CONSTITUENT} = $(bin)setup.nmake.tmp
     48cmt_final_setup_${CONSTITUENT} = $(bin)setup.nmake
     49#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
    3450cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    3551
    3652!endif
    3753
    38 !if "$(QUICK)" == ""
    39 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
    40 !else
    41 $(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    42 !endif
     54#!if "$(QUICK)" == ""
     55#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
     56#!else
     57#$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     58#!endif
     59$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
    4360        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    4461        @set include=$(include)
    4562        @set lib=$(lib)
    4663        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
    47         $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
     64#       $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
    4865
    49 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
     66${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs
    5067        $(echo) (constituents.nmake) Starting ${CONSTITUENT}
    5168        @set include=$(include)
     
    5673clean :: ${CONSTITUENT}clean
    5774
    58 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     75#${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     76${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    5977        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
    6078        @set include=$(include)
    6179        @set lib=$(lib)
    62         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     80        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    6381        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
     82#       @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     83#       $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    6484
    6585install :: ${CONSTITUENT}install
     
    7595
    7696${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    77         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}"
     97        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
    7898        @set include=$(include)
    7999        @set lib=$(lib)
  • CMT/HEAD/mgr/fragments/nmake/constituent_lock

    r473 r487  
    99#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    1010cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    11 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
     11cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake.tmp
     12cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake
     13#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
    1214cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    1315
     
    1719!endif
    1820
    19 !if "$(QUICK)" == ""
     21!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
    2022
     23!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
     24!endif
    2125!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
    2226!endif
    2327
    24 !if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0
     28!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
     29!endif
     30!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
     31!endif
     32
     33!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
     34!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
     35!endif
     36!else
     37!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
     38!endif
    2539!endif
    2640
     
    3145#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
    3246cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
    33 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
     47#cmt_local_setup_${CONSTITUENT} = $(bin)setup.nmake.tmp
     48cmt_final_setup_${CONSTITUENT} = $(bin)setup.nmake
     49#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
    3450cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    3551
    3652!endif
    3753
    38 !if "$(QUICK)" == ""
    39 $(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
    40 !else
    41 $(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
    42 !endif
     54#!if "$(QUICK)" == ""
     55#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
     56#!else
     57#$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
     58#!endif
     59$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
    4360        $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
    4461        @set include=$(include)
    4562        @set lib=$(lib)
    4663        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
    47         $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
     64#       $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
    4865
    49 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    50         $(echo) (constituents.make) Creating ${CONSTITUENT}$(lock_suffix)
     66${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs
     67        $(echo) (constituents.nmake) Creating ${CONSTITUENT}$(lock_suffix)
    5168        @$(lock_command) ${CONSTITUENT}$(lock_suffix)
    5269        $(echo) (constituents.nmake) Starting ${CONSTITUENT}
     
    6077clean :: ${CONSTITUENT}clean
    6178
    62 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     79#${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
     80${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    6381        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
    6482        @set include=$(include)
    6583        @set lib=$(lib)
    66         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     84        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    6785        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
     86#       @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     87#       $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    6888
    6989install :: ${CONSTITUENT}install
     
    7999
    80100${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    81         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}"
     101        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
    82102        @set include=$(include)
    83103        @set lib=$(lib)
  • CMT/HEAD/mgr/fragments/nmake/constituents_header

    r472 r487  
     1#-- start of constituents_header ------
    12
    23!include $(CMTROOT)/src/NMakefile.core
     
    1415cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).nmake
    1516
    16 !if "$(QUICK)" == ""
     17cmt_local_setup = $(bin)setup.nmake.tmp
     18cmt_final_setup = $(bin)setup.nmake
     19
     20!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile))
    1721
    1822#!if [$(echo) (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
    1923!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile)] == 0
    2024!endif
    21 
    2225#!if [cmt build tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 0
    2326!if [cmt build tag_makefile -tag_add=$(tags) >$(cmt_local_tagfile)] == 0
     27!endif
     28
     29!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup)] == 0
     30!endif
     31!if [cmt -tag=$(tags) show setup >$(cmt_local_setup)] == 0
     32!endif
     33
     34!if exist ($(cmt_final_setup)) && [ echo n|comp $(cmt_final_setup) $(cmt_local_setup) >nul 2>&1 ] == 0
     35!if [ del $(cmt_local_setup) ] == 0
     36!endif
     37!else
     38!if [ move /y $(cmt_local_setup) $(cmt_final_setup) >nul ] == 0
     39!endif
    2440!endif
    2541
     
    3349#--------------------------------------------------------
    3450
    35 cmt_lock_setup = lock$(cmt_lock_pid).nmake
    36 cmt_setup_pid  = $(bin)setup.nmake
     51#cmt_lock_setup = lock$(cmt_lock_pid).nmake
     52#cmt_setup_pid  = $(bin)setup.nmake
    3753
    38 config ::  ##$(${PACKAGE}_tag).nmake
     54#config ::  ##$(${PACKAGE}_tag).nmake
    3955
    4056env.nmake ::
     
    4965        @if not exist $(src) mkdir $(src)
    5066
    51 !if "$(QUICK)" == ""
    52 dirs ::
     67dirs :: requirements
     68        @if not exist $(bin) mkdir $(bin)
     69
     70requirements :
    5371        @if not exist requirements echo "No requirements file"
    54         $(echo) (constituents.nmake) Rebuilding setup.nmake
    55         @if not exist $(bin) mkdir $(bin)
    56         @$(cmtexe) -tag=$(tags) show setup   >$(cmt_setup_pid)
    57         $(echo) setup.nmake ok
    58 !else
    59 dirs ::
    60         @if not exist requirements echo "No requirements file"
    61         @if not exist $(bin) mkdir $(bin)
    62 !endif
     72
     73#!if "$(QUICK)" == ""
     74#dirs ::
     75#       @if not exist requirements echo "No requirements file"
     76#       $(echo) (constituents.nmake) Rebuilding setup.nmake
     77#       @if not exist $(bin) mkdir $(bin)
     78#       @$(cmtexe) -tag=$(tags) show setup   >$(cmt_setup_pid)
     79#       $(echo) setup.nmake ok
     80#!else
     81#dirs ::
     82#       @if not exist requirements echo "No requirements file"
     83#       @if not exist $(bin) mkdir $(bin)
     84#!endif
    6385
    6486.DEFAULT :
    6587        $(echo) "???"
    6688
     89#-- end of constituents_header ------
  • CMT/HEAD/mgr/fragments/nmake/constituents_trailer

    r445 r487  
     1#-- start of constituents_trailer ------
    12
    2 clean :: remove_library_links
     3#clean :: remove_library_links
    34
    45remove_library_links ::
    5         $(echo) "Removing library links"
     6        $(echo) "(constituents.make) Removing library links"
    67        @$(remove_library_links)
    78
    89makefilesclean ::
    9         @if exist *.make.* del *.make*
     10#       @if exist *.nmake* del *.nmake*
    1011
    1112###     @if exist checkuses del checkuses
     
    1314clean :: makefilesclean
    1415
    15 binclean :: clean
    16         @del /Q $(bin)\*
     16#binclean :: clean
     17binclean ::
     18        $(echo) (constituents.make) Removing binary directory $(bin)
     19        $(cleanup_silent)if not "$(bin)"==".\" (if exist $(bin) rmdir /S /Q $(bin))
     20#       @del /Q $(bin)\*
    1721
     22#-- end of constituents_trailer ------
  • CMT/HEAD/mgr/fragments/nmake/cpp

    r483 r487  
    33!if "${DEPENDENCIESOPTS}" != ""
    44
    5 !if exists ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
     5!if exist ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
    66!include $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d
    77!endif
  • CMT/HEAD/mgr/fragments/nmake/cpp_library

    r483 r487  
    33!if "${DEPENDENCIESOPTS}" != ""
    44
    5 !if exists ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
     5!if exist ($(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d)
    66!include $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d
    77!endif
  • CMT/HEAD/mgr/fragments/nmake/dependencies

    r474 r487  
    1313!endif
    1414
     15!if exist ($(bin)${CONSTITUENT}_dependencies.nmake)
    1516!include $(bin)${CONSTITUENT}_dependencies.nmake
     17!endif
    1618
    1719#-- end of dependency ------------------
  • CMT/HEAD/mgr/fragments/nmake/group

    r445 r487  
     1#-- start of group ------
    12
    23all_groups :: ${GROUP}
    34
    4 ${GROUP} ::  $(${GROUP}_pre_constituents) $(${GROUP}_constituents)  $(${GROUP}_post_constituents)
     5${GROUP} :: $(${GROUP}_dependencies)  $(${GROUP}_pre_constituents) $(${GROUP}_constituents)  $(${GROUP}_post_constituents)
    56        $(echo) " ${GROUP} ok."
    67
     
    1314${GROUP}clean :: makefilesclean
    1415
     16#-- end of group ------
  • CMT/HEAD/mgr/fragments/nmake/install_includes_header

    r11 r487  
    1818        @if NOT "$(CMTINSTALLAREA)"=="" $(cmt_installdir_action) "$(PACKAGE_ROOT)" "$(package)" "$(install_dir)" "$(cmt_installdir_excludes)"
    1919
    20 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     20##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    2121
    2222uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/jar

    r445 r487  
    2424!endif
    2525
    26 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     26##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    2727
    2828uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/java_header

    r445 r487  
    3131!endif
    3232
    33 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     33##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    3434
    3535uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/library

    r469 r487  
    6868!endif
    6969
    70 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     70##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    7171
    7272uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/library_no_share

    r469 r487  
    3434!endif
    3535
    36 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     36##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    3737
    3838uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/library_no_static

    r469 r487  
    8686!endif
    8787
    88 ${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
     88##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    8989
    9090uninstall :: ${CONSTITUENT}uninstall
  • CMT/HEAD/mgr/fragments/nmake/make_header

    r469 r487  
    4646!include $(cmt_local_tagfile)
    4747
    48 ${CONSTITUENT} ::
     48!if defined (cmt_${CONSTITUENT}_has_target_tag)
     49
     50cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.make
     51#cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
     52
     53!else
     54
     55cmt_final_setup_${CONSTITUENT} = $(bin)setup.make
     56#cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
     57
     58!endif
     59
     60#cmt_final_setup = $(bin)setup.make
     61
     62#${CONSTITUENT} ::
    4963
    5064javadirs ::
     
    6175        @echo '${CONSTITUENT}'
    6276
     77!if "$(use_requirements)" != ""
     78$(use_requirements) : ;
     79!endif
     80
    6381#-- end of make_header ------------------
  • CMT/HEAD/mgr/fragments/nmake/protos_header

    r11 r487  
     1#-- start of protos_header ------
    12   
    23${CONSTITUENT}PROTOS :: ${PROTOSTAMPS}
    3         @echo ${CONSTITUENT} : Protos ok
     4        $(echo) "${CONSTITUENT} : Protos ok"
     5#       @echo ${CONSTITUENT} : Protos ok
    46
     7#-- end of protos_header ------
  • CMT/HEAD/mgr/fragments/protos_header

    r11 r487  
    22   
    33${CONSTITUENT}PROTOS :: ${PROTOSTAMPS}
    4         @/bin/echo ${CONSTITUENT} : Protos ok
     4        $(echo) "${CONSTITUENT} : Protos ok"
    55
    66#-- end of protos_header ------
  • CMT/HEAD/source/cmt_parser.cxx

    r485 r487  
    38863886void Cmt::do_show_groups (const ArgParser& /*ap*/)
    38873887{
     3888  Constituent::parse_all ();
     3889  //  set_standard_macros ();
    38883890  Group::show_all ();
    38893891}
  • CMT/HEAD/src/Makefile.header

    r483 r487  
    1818tags      = $(tag),$(CMTEXTRATAGS)
    1919
    20 ifdef READONLY
    21 cmt_local_tagfile = /tmp/CMT_$(tag).make$$$$
    22 else
    2320cmt_local_tagfile = $(bin)$(tag).make
    24 endif
    2521
    26 ifdef READONLY
    27 cmt_constituents_makefile = /tmp/CMT_$(tag)_constituents.make$$$$
    28 else
    2922cmt_constituents_makefile = $(bin)constituents.make
    30 endif
     23
     24cmt_local_setup = $(bin)setup$$$$.make
     25#cmt_local_setup = $(bin)$(package)setup$$$$.make
     26#cmt_final_setup = $(bin)${PACKAGE}setup.make
     27cmt_final_setup = $(bin)setup.make
     28#cmt_final_setup = $(bin)$(package)setup.make
    3129
    3230#
     
    4240        @$(cmtexe) check configuration; retval=$$?; \
    4341        if test $${retval} = 0; then \
    44           $(MAKE) --no-print-directory target="first config all" common_target; \
     42          $(MAKE) --no-print-directory target="all" common_target; \
    4543        else \
    4644          echo "#CMT> There are configuration errors. Please correct them before running gmake"; \
     
    4846
    4947no_check_config ::
    50         @$(MAKE) --no-print-directory target="first config all" common_target
     48        @$(MAKE) --no-print-directory target="all" common_target
    5149
    5250binclean ::
     
    5452          if test -d $(bin) ; then \
    5553            test -z "$(cmtmsg)" || \
    56             echo "$(CMTMSGPREFIX)" "(Makefile.header) Cleaning all from $(bin)"; \
     54            echo "$(CMTMSGPREFIX)" "(Makefile.header) Removing binary directory $(bin)"; \
    5755            /bin/rm -rf $(bin) ; \
    5856          fi ; \
     
    6563.DEFAULT ::
    6664        @$(cmtexe) check configuration
    67         $(MAKE) --no-print-directory target="first config $@" common_target
     65        @$(MAKE) --no-print-directory target="$@" common_target
    6866#       @$(MAKE) --no-print-directory target="config $@" common_target
    6967
     
    7169#  Capture all possible targets
    7270#
    73 ifdef READONLY
    74 common_target ::
    75         @tmpdir=/tmp; \
    76           if test ! "${TMPDIR}" = ""; then tmpdir=${TMPDIR}; fi; \
    77           cmt_lock_pid=`mkdir -p $${tmpdir}; mktemp $${tmpdir}/CMT_XXXXXX | sed -e 's#'"$${tmpdir}"'/CMT_##'`; \
    78           temp_marker=$${tmpdir}/CMT_$${cmt_lock_pid}; \
    79           temp_lock=$${tmpdir}/CMT_lock$${cmt_lock_pid}.make; \
    80           temp_constituents=$${tmpdir}/CMT_constituents$${cmt_lock_pid}; \
    81           if test ! "${CMTMAKEDEBUG}" = 1; then\
    82             trap '/bin/rm -f $${temp_lock} $${temp_constituents} $${temp_marker}; exit $${status}' 0 1 2 15; \
    83           fi; \
    84           /bin/rm -f $${temp_marker}; \
    85           /bin/rm -f $${temp_lock}; \
    86           echo "------> (Makefile.header) Rebuilding constituents.make"; \
    87           $(cmtexe) -tag=$(tags) build constituents_makefile -out=$${temp_constituents}; status=$$?; \
    88           if test $${status} = 0; then \
    89             /bin/rm -f $(cmt_local_tagfile); \
    90             $(MAKE) --no-print-directory -f $${temp_constituents} cmt_lock_pid=$${cmt_lock_pid} $(target); \
    91             status=$$?; \
    92           else \
    93             echo "#CMT> Error generating constituents makefile"; \
    94           fi; \
    95           exit $${status}
    96 else
    9771common_target : $(cmt_constituents_makefile)
    98         @$(MAKE) --no-print-directory -f $< cmt_lock_pid=$(cmt_lock_pid) $(target)
    99 endif
     72        @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $(target)
     73#       @$(MAKE) --no-print-directory -f $< cmt_lock_pid=$(cmt_lock_pid) $(target)
    10074
    10175$(cmt_constituents_makefile) : $(cmt_local_tagfile)
     
    11892          if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \
    11993          $(cmtexe) -tag=$(tags) build tag_makefile >$@
     94        $(echo) "(Makefile.header) Rebuilding $(cmt_final_setup)"; \
     95          test ! -f $(cmt_local_setup) || \rm -f $(cmt_local_setup); \
     96          trap '\rm -f $(cmt_local_setup)' 0 1 2 15; \
     97          $(cmtexe) -tag=$(tags) show setup >$(cmt_local_setup) && \
     98          if [ -f $(cmt_final_setup) ] && \
     99            \cmp -s $(cmt_final_setup) $(cmt_local_setup); then \
     100            \rm $(cmt_local_setup); else \
     101            \mv -f $(cmt_local_setup) $(cmt_final_setup); fi
    120102
    121103#         && /bin/echo $@ ok   
     
    147129        @echo 'clean       : remove everything that can be rebuilt'
    148130        @echo 'binclean    : fast erase of the binary directory'
     131        @echo 'uninstall   : remove everything installed in the installation area'
    149132        @echo ' '
    150133        @groups=`$(cmtexe) show groups -tag=$(tags)`; \
     
    154137        @echo "Constituents:"; \
    155138          for c in `$(cmtexe) show constituent_names -tag=$(tags)` ; do \
    156             echo "  $${c}  $${c}clean"; \
     139            echo "  $${c}  $${c}clean  $${c}uninstall"; \
    157140          done
    158141        @echo ' '
  • CMT/HEAD/src/NMakefile.header

    r472 r487  
    4343        @echo --------------------------------------------------------------------------
    4444        @echo You may select one of the following make targets :
    45         @echo 
     45        @echo.
    4646        @echo help        : this help
    4747        @echo all         : rebuild everything according to the $$(constituents) macro
    4848        @echo               (this is the default target)
    4949        @echo clean       : remove everything that can be rebuilt
    50         @echo configclean : remove configuration files (*.nmake)
    51         @echo 
     50#       @echo configclean : remove configuration files (*.nmake)
     51        @echo binclean    : fast erase of the binary directory
     52        @echo uninstall   : remove everything installed in the installation area
     53        @echo.
     54        @for /F "usebackq" %%i in (`$(cmtexe) show groups -tag^=$(tags)`) do \
     55          @echo %%i : rebuild all constituents of group %%i
     56        @echo Constituents: & \
     57          for /F "usebackq" %%i in (`$(cmtexe) show constituent_names -tag^=$(tags)`) do \
     58            @echo   %%i  %%iclean  %%iuninstall
     59        @echo.
    5260        @echo check :
    5361        @echo               run all applications defined with the -check option
    54         @echo 
    55         @echo everywhere [target=...] :
    56         @echo               o Rebuild on all plateforms specified in the $$(everywhere) macro
    57         @echo               o Use "cmt show macro everywhere -tag=<site>" to check it
    58         @echo               o The "target" option permits to transmit a target to the remote site
    59 
     62        @echo.
     63#       @echo everywhere [target=...] :
     64#       @echo               o Rebuild on all plateforms specified in the $$(everywhere) macro
     65#       @echo               o Use "cmt show macro everywhere -tag=<site>" to check it
     66#       @echo               o The "target" option permits to transmit a target to the remote site
    6067
    6168cmt_constituents_makefile = $(bin)constituents.nmake
     
    6673!ENDIF
    6774
    68 !if "$(QUICK)" == ""
     75!if "$(QUICK)" == "" || !exist ($(cmt_constituents_makefile))
     76
     77!if [$(echo) (NMakefile.header) Rebuilding $(cmt_constituents_makefile)] == 0
     78!endif
    6979!if [$(cmtexe) -tag=$(tags) build constituents_makefile -out=$(cmt_constituents_makefile)] == 0
    7080!endif
     81
    7182!endif
    7283
     
    7586
    7687
    77 
    78 
Note: See TracChangeset for help on using the changeset viewer.