Changeset 183


Ignore:
Timestamp:
May 2, 2006, 2:37:57 PM (18 years ago)
Author:
garonne
Message:

see CL 305

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

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/mgr/fragments/cleanup_header

    r127 r183  
    44        @cd .
    55
    6 #------------------------------------------------------------------------
    7 #        Temporary hack to deal with missing files
    8 #        and to avoid infinite loops in make. However, this must be seen as a ugly hack
    9 #        since it considers an Atlas use case with config.h.in. This hack is
    10 #        harmless to any user of this special file though.
    11 # =====> the .DEFAULT target should eventually complete disappear
    12 #------------------------------------------------------------------------
     6ifndef PEDANTIC
     7.DEFAULT::
     8        @echo "You should provide a target for this file  $@"
     9#       @exit 0
     10endif
    1311
    14 .DEFAULT::
    15         @echo "You should provide a target for this file  $@"
    16 #       @if echo $@ | grep config.h.in ; then exit 0; else exit 1; fi
     12#ifdef PEDANTIC
     13#.DEFAULT::
     14#       @echo "You should provide a target for this file  $@"
     15#       @exit 1
     16#endif
    1717
    18 ##@echo Using default action for $@
     18
    1919
    2020

  • CMT/HEAD/mgr/fragments/constituent

    r123 r183  
    88
    99ifdef 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
     10cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag)_${CONSTITUENT}.make$(cmt_lock_pid)
     11cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}_setup.make
    1212cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    1313else
    14 cmt_local_tagfile_${CONSTITUENT}  = $(${PACKAGE}_tag)_${CONSTITUENT}.make
    15 cmt_final_setup_${CONSTITUENT}    = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
     14cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.make
     15cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.make
    1616cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    1717endif
    … …  
    3131ifdef READONLY
    3232cmt_local_tagfile_${CONSTITUENT} = /tmp/CMT_$(${PACKAGE}_tag).make$(cmt_lock_pid)
    33 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
     33cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_setup.make
    3434cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    3535else
    3636cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).make
    37 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
     37cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.make
    3838cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    3939endif
    … …  
    7575        @echo "------> (constituents.make) uninstall ${CONSTITUENT} done"
    7676
     77ifndef PEDANTIC
    7778.DEFAULT::
    7879        @echo "------> (constituents.make) Starting $@ ${CONSTITUENT}"
    7980        @echo Using default action for $@
    8081        @echo "------> (constituents.make) $@ ${CONSTITUENT} done"
     82endif
    8183
    8284

  • CMT/HEAD/mgr/fragments/constituents_header

    r131 r183  
    2323
    2424ifdef READONLY
    25 cmt_local_setup = /tmp/CMT_${PACKAGE}setup$(cmt_lock_pid).make
    26 cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
     25cmt_local_setup = /tmp/CMT_${PACKAGE}_setup$(cmt_lock_pid).make
     26cmt_final_setup = /tmp/CMT_${PACKAGE}_setup.make
    2727else
    28 cmt_local_setup = $(bin)${PACKAGE}setup$(cmt_lock_pid).make
    29 cmt_final_setup = $(bin)${PACKAGE}setup.make
     28cmt_local_setup = $(bin)${PACKAGE}_setup$(cmt_lock_pid).make
     29cmt_final_setup = $(bin)${PACKAGE}_setup.make
    3030endif
    3131
    3232#--------------------------------------------------------
    3333
    34 ##cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make
     34cmt_lock_setup = /tmp/lock$(cmt_lock_pid).make
    3535cmt_temp_tag = /tmp/tag$(cmt_lock_pid).make
    3636
    … …  
    4040##      @bin=`$(cmtexe) -quiet show macro_value bin`
    4141
    42 $(cmt_local_tagfile) : ##$(cmt_lock_setup)
     42$(cmt_local_tagfile) : $(cmt_lock_setup)
    4343        @/bin/echo "------> (constituents.make) Rebuilding setup.make $(cmt_local_tagfile)"
    4444        @if test -f $(cmt_local_tagfile); then /bin/rm -f $(cmt_local_tagfile); fi
    … …  
    4949          echo CMTCONFIG=$(CMTCONFIG); \
    5050          if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \
    51           cmt_local_setup=$${bin}${PACKAGE}setup$(cmt_lock_pid).make; \
    52           cmt_final_setup=$${bin}${PACKAGE}setup.make; \
     51          cmt_local_setup=$${bin}${PACKAGE}_setup$(cmt_lock_pid).make; \
     52          cmt_final_setup=$${bin}${PACKAGE}_setup.make; \
    5353          trap '/bin/rm -f $${cmt_local_setup}' 0 1 2 15; \
    5454          $(cmtexe) -quiet -tag=$(tags) show setup >>$${cmt_local_setup}; \
    … …  
    6464        @/bin/echo setup.make ok
    6565
    66 config :: ## checkuses
     66config :: checkuses
    6767        @exit 0
    6868
    … …  
    8989
    9090.DEFAULT ::
    91         @echo "You should provide a target for this file  $@"
    92 #       @if test "$@" = "$(cmt_lock_setup)"; then \
    93 #         /bin/rm -f $(cmt_lock_setup); \
    94 #         touch $(cmt_lock_setup); \
    95 #       fi
     91        @if test "$@" = "$(cmt_lock_setup)"; then \
     92          /bin/rm -f $(cmt_lock_setup); \
     93          touch $(cmt_lock_setup); \
     94        fi
    9695
    9796#-- end of constituents_header ------

  • CMT/HEAD/mgr/fragments/make_header

    r107 r183  
    5151
    5252ifdef READONLY
    53 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}setup.make
     53cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}_setup.make
    5454cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    5555else
    56 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
     56cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.make
    5757cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    5858endif
    … …  
    6161
    6262ifdef READONLY
    63 cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
     63cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_setup.make
    6464cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
    6565else
    66 cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
     66cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.make
    6767cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
    6868endif
    … …  
    7171
    7272ifdef READONLY
    73 cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
     73cmt_final_setup = /tmp/CMT_${PACKAGE}_setup.make
    7474else
    75 cmt_final_setup = $(bin)${PACKAGE}setup.make
     75cmt_final_setup = $(bin)${PACKAGE}_setup.make
    7676endif
    7777
    … …  
    9090          if test ! -d $(bin) ; then $(mkdir) -p $(bin) ; fi
    9191
    92 ###       /bin/rm -f checkuses
    93 
    9492javadirs ::
    9593        @if test ! -d $(javabin) ; then $(mkdir) -p $(javabin) ; fi
Note: See TracChangeset for help on using the changeset viewer.