Changeset 641 for CMT


Ignore:
Timestamp:
Jun 6, 2013, 4:13:52 PM (11 years ago)
Author:
rybkin
Message:

merge -r 630:631 HEAD mgr/fragments/nmake/constituent mgr/fragments/nmake/constituent_lock mgr/fragments/nmake/jar mgr/fragments/nmake/library mgr/fragments/nmake/library_no_static mgr/fragments/nmake/java mgr/fragments/constituent mgr/fragments/constituent_lock mgr/fragments/nmake/check_application mgr/cmt_dcc_version.sh

Location:
CMT/v1r25-branch
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • CMT/v1r25-branch/ChangeLog

    r640 r641  
     12013-02-06    <rybkin@lal.in2p3.fr> 502
     2
     3        * mgr/fragments/nmake/constituent: Remove unused code, add empty command for
     4        double-colon rules without one (so that implicit rule is not searched for),
     5        do not ignore errors in install target rule command(s)
     6        * mgr/fragments/nmake/constituent_lock: idem
     7        * mgr/fragments/nmake/jar: Add empty command for double-colon rules without one (so that implicit rule is not searched for)
     8        * mgr/fragments/nmake/library: idem
     9        * mgr/fragments/nmake/library_no_static: idem
     10        * mgr/fragments/nmake/java: Create necessary directory in compilation rule
     11        to avoid race condition
     12        * mgr/fragments/constituent: In ${CONSTITUENT}install target rule
     13        command, check whether makefile exists to allow for use of -n (no-op) Make
     14        option, do not ignore errors, in ${CONSTITUENT}uninstall target rule
     15        command, ignore errors, similar to ${CONSTITUENT}clean target rule command
     16        * mgr/fragments/constituent_lock: idem
     17        * mgr/fragments/nmake/check_application: Remove space between $(silent) and
     18        possibly undefined macro (causing NMAKE : fatal error U1038: Internal error)
     19        * mgr/cmt_dcc_version.sh: Made more generic to account for clang compiler
     20        on Mac OS X platform
     21       
    1222013-01-28    <rybkin@lal.in2p3.fr> 501
    223

  • CMT/v1r25-branch/mgr/cmt_dcc_version.sh

    r465 r641  
    1 
    21export LC_ALL=C
    32cc -v 2>&1 |\
    4  sed -n '/version/s#^[^ ]* [^ ]* \([0-9][^ ]*\) *.*#gcc-\1#p'
     3 sed -n '/version/s#^\([^ ]\{1,\} \)*\([^ ]\{1,\}\) version \([[:digit:]][^ ]*\) *.*#\2-\3#p'

  • CMT/v1r25-branch/mgr/fragments/constituent

    r640 r641  
    9292
    9393${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    94         $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
    95         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
    96         $(echo) "(constituents.make) install ${CONSTITUENT} done"
     94        $(echo) "(constituents.make) Starting $@"
     95        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     96          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install; \
     97          fi
     98#       @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
     99        $(echo) "(constituents.make) $@ done"
    97100
    98101uninstall : ${CONSTITUENT}uninstall
    … …  
    101104
    102105${CONSTITUENT}uninstall : $(${CONSTITUENT}uninstall_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    103         $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    104         @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     106        $(echo) "(constituents.make) Starting $@"
     107        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    105108          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall; \
    106109          fi
    107110#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
    108         $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
     111        $(echo) "(constituents.make) $@ done"
    109112
    110113remove_library_links :: ${CONSTITUENT}uninstall ;

  • CMT/v1r25-branch/mgr/fragments/constituent_lock

    r640 r641  
    9595
    9696${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    97         $(echo) "(constituents.make) Starting install ${CONSTITUENT}"
    98         @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
    99         $(echo) "(constituents.make) install ${CONSTITUENT} done"
     97        $(echo) "(constituents.make) Starting $@"
     98        @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     99          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install; \
     100          fi
     101#       @-$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) install
     102        $(echo) "(constituents.make) $@ done"
    100103
    101104uninstall : ${CONSTITUENT}uninstall
    … …  
    104107
    105108${CONSTITUENT}uninstall : $(${CONSTITUENT}uninstall_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    106         $(echo) "(constituents.make) Starting uninstall ${CONSTITUENT}"
    107         @if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
     109        $(echo) "(constituents.make) Starting $@"
     110        @-if test -f $(cmt_local_${CONSTITUENT}_makefile); then \
    108111          $(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall; \
    109112          fi
    110113#       @$(MAKE) -f $(cmt_local_${CONSTITUENT}_makefile) uninstall
    111         $(echo) "(constituents.make) uninstall ${CONSTITUENT} done"
     114        $(echo) "(constituents.make) $@ done"
    112115
    113116remove_library_links :: ${CONSTITUENT}uninstall ;

  • CMT/v1r25-branch/mgr/fragments/nmake/check_application

    r637 r641  
    55#${CONSTITUENT}check :: ${CONSTITUENT}
    66${CONSTITUENT}check ::
    7         $(silent) $(${CONSTITUENT}_pre_check)
    8         $(silent) $(bin)${CONSTITUENT}$(application_suffix) $(${CONSTITUENT}_check_args)
    9         $(silent) $(${CONSTITUENT}_post_check)
     7        $(silent)$(${CONSTITUENT}_pre_check)
     8        $(silent)$(bin)${CONSTITUENT}$(application_suffix) $(${CONSTITUENT}_check_args)
     9        $(silent)$(${CONSTITUENT}_post_check)
    1010
    1111#-- end of check_application ------

  • CMT/v1r25-branch/mgr/fragments/nmake/constituent

    r595 r641  
    22
    33cmt_${CONSTITUENT}_${HASTARGETTAG} = 1
     4cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
    45
    5 #--------------------------------------------------------
     6#----------------------------------------
    67
    78!if defined (cmt_${CONSTITUENT}_has_target_tag)
    89
    9 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    1010cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    11 cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake.tmp
    1211cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake
    13 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
    1412cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    1513
    1614${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
    1715
    18 #!if [if not exist $(bin) mkdir $(bin)] == 0
    19 #!endif
    20 
    21 #!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
    22 
    23 #!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
    24 #!endif
    25 #!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
    26 #!endif
    27 
    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
    39 #!endif
    40 
    41 #!endif
    42 
    4316!else
    4417
    45 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
    4618cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
    47 #cmt_local_setup_${CONSTITUENT} = $(bin)setup.nmake.tmp
    4819cmt_final_setup_${CONSTITUENT} = $(bin)setup.nmake
    49 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
    5020cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    5121
    5222!endif
    53 
    54 #!if "$(QUICK)" == ""
    55 #$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
    56 #!else
    57 #$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
    58 #!endif
    5923
    6024!if defined (cmt_${CONSTITUENT}_has_target_tag)
    … …  
    9054!endif
    9155
    92 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
    9356
    9457!if defined (cmt_${CONSTITUENT}_has_dependencies)
    … …  
    10972        $(echo) (constituents.nmake) ${CONSTITUENT} done
    11073
    111 clean :: ${CONSTITUENT}clean
     74clean :: ${CONSTITUENT}clean ;
    11275
    11376${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    114         $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
     77        $(echo) (constituents.nmake) Starting $@
    11578        @set include=$(include)
    11679        @set lib=$(lib)
    117         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    118         $(echo) (constituents.nmake) ${CONSTITUENT}clean done
     80        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles $@ tag=$(tag)
     81        $(echo) (constituents.nmake) $@ done
    11982#       @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    12083
    121 install :: ${CONSTITUENT}install
     84install :: ${CONSTITUENT}install ;
    12285
    12386${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    124         $(echo) (constituents.nmake) Starting install ${CONSTITUENT}
     87        $(echo) (constituents.nmake) Starting $@
    12588        @set include=$(include)
    12689        @set lib=$(lib)
    127         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
    128         $(echo) (constituents.nmake) install ${CONSTITUENT} done
     90        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
     91        $(echo) (constituents.nmake) $@ done
    12992
    130 uninstall :: ${CONSTITUENT}uninstall
     93uninstall :: ${CONSTITUENT}uninstall ;
    13194
    132 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    133 #${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
    13495${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies)
    135         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
     96        $(echo) (constituents.nmake) Starting $@
    13697        @set include=$(include)
    13798        @set lib=$(lib)
    … …  
    140101#       @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    141102#       @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
    142         $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
     103        $(echo) (constituents.nmake) $@ done
    143104
    144105#-- end of constituent ------

  • CMT/v1r25-branch/mgr/fragments/nmake/constituent_lock

    r595 r641  
    22
    33cmt_${CONSTITUENT}_${HASTARGETTAG} = 1
     4cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
    45
    5 #--------------------------------------------------------
     6#----------------------------------------
    67
    78!if defined (cmt_${CONSTITUENT}_has_target_tag)
    89
    9 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    1010cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    11 cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake.tmp
    1211cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake
    13 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
    1412cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    1513
    1614${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
    1715
    18 #!if [if not exist $(bin) mkdir $(bin)] == 0
    19 #!endif
    20 
    21 #!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
    22 
    23 #!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
    24 #!endif
    25 #!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
    26 #!endif
    27 
    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
    39 #!endif
    40 
    41 #!endif
    42 
    4316!else
    4417
    45 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
    4618cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
    47 #cmt_local_setup_${CONSTITUENT} = $(bin)setup.nmake.tmp
    4819cmt_final_setup_${CONSTITUENT} = $(bin)setup.nmake
    49 #cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
    5020cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    5121
    5222!endif
    53 
    54 #!if "$(QUICK)" == ""
    55 #$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
    56 #!else
    57 #$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
    58 #!endif
    5923
    6024!if defined (cmt_${CONSTITUENT}_has_target_tag)
    … …  
    9054!endif
    9155
    92 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
    9356
    9457!if defined (cmt_${CONSTITUENT}_has_dependencies)
    … …  
    11376        $(echo) (constituents.nmake) ${CONSTITUENT} done
    11477
    115 clean :: ${CONSTITUENT}clean
     78clean :: ${CONSTITUENT}clean ;
    11679
    11780${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
    118         $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
     81        $(echo) (constituents.nmake) Starting $@
    11982        @set include=$(include)
    12083        @set lib=$(lib)
    121         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    122         $(echo) (constituents.nmake) ${CONSTITUENT}clean done
     84        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles $@ tag=$(tag)
     85        $(echo) (constituents.nmake) $@ done
    12386#       @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    12487
    125 install :: ${CONSTITUENT}install
     88install :: ${CONSTITUENT}install ;
    12689
    12790${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
    128         $(echo) (constituents.nmake) Starting install ${CONSTITUENT}
     91        $(echo) (constituents.nmake) Starting $@
    12992        @set include=$(include)
    13093        @set lib=$(lib)
    131         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
    132         $(echo) (constituents.nmake) install ${CONSTITUENT} done
     94        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
     95        $(echo) (constituents.nmake) $@ done
    13396
    134 uninstall :: ${CONSTITUENT}uninstall
     97uninstall :: ${CONSTITUENT}uninstall ;
    13598
    136 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
    137 #${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
    13899${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies)
    139         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
     100        $(echo) (constituents.nmake) Starting $@
    140101        @set include=$(include)
    141102        @set lib=$(lib)
    … …  
    144105#       @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
    145106#       @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
    146         $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
     107        $(echo) (constituents.nmake) $@ done
    147108
    148109#-- end of constituent_lock ------

  • CMT/v1r25-branch/mgr/fragments/nmake/jar

    r487 r641  
    99${CONSTITUENT}installname = ${CONSTITUENT}.jar
    1010
    11 ${CONSTITUENT} :: ${CONSTITUENT}install
     11${CONSTITUENT} :: ${CONSTITUENT}install ;
    1212
    13 install :: ${CONSTITUENT}install
     13install :: ${CONSTITUENT}install ;
    1414
    1515${CONSTITUENT}install :: $(install_dir)\$(${CONSTITUENT}installname)
    … …  
    2626##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    2727
    28 uninstall :: ${CONSTITUENT}uninstall
     28uninstall :: ${CONSTITUENT}uninstall ;
    2929
    3030${CONSTITUENT}uninstall ::

  • CMT/v1r25-branch/mgr/fragments/nmake/java

    r11 r641  
     1#-- start of java ------
    12
    23${OUTPUTNAME} : ${FULLNAME}
    34        $(java_echo) $@
    4         @cd $(src)
    5         $(javacomp) -d $(javabin)/${CONSTITUENT} $(use_javaflags) $(${CONSTITUENT}_javaflags) $(${NAME}_javaflags) ${FULLNAME}
     5        $(java_silent) if not exist $(javabin)${CONSTITUENT} mkdir $(javabin)${CONSTITUENT}
     6        $(java_silent) cd $(src)
     7        $(java_silent) $(javacomp) -d $(javabin)/${CONSTITUENT} $(use_javaflags) $(${CONSTITUENT}_javaflags) $(${NAME}_javaflags) ${FULLNAME}
    68
     9#-- end of java ------

  • CMT/v1r25-branch/mgr/fragments/nmake/library

    r599 r641  
    3434${CONSTITUENT}installpdbname = $(library_prefix)${CONSTITUENT}$(library_suffix).pdb
    3535
    36 ${CONSTITUENT} :: ${CONSTITUENT}install
     36${CONSTITUENT} :: ${CONSTITUENT}install ;
    3737
    38 install :: ${CONSTITUENT}install
     38install :: ${CONSTITUENT}install ;
    3939
    4040!IF "$(vsCONFIG)" == "Debug"
    … …  
    7272##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    7373
    74 uninstall :: ${CONSTITUENT}uninstall
     74uninstall :: ${CONSTITUENT}uninstall ;
    7575
    7676${CONSTITUENT}uninstall ::

  • CMT/v1r25-branch/mgr/fragments/nmake/library_no_static

    r599 r641  
    5353${CONSTITUENT}installpdbname = $(library_prefix)${CONSTITUENT}$(library_suffix).pdb
    5454
    55 ${CONSTITUENT} :: ${CONSTITUENT}install
     55${CONSTITUENT} :: ${CONSTITUENT}install ;
    5656
    57 install :: ${CONSTITUENT}install
     57install :: ${CONSTITUENT}install ;
    5858
    5959!IF "$(vsCONFIG)" == "Debug"
    … …  
    9191##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    9292
    93 uninstall :: ${CONSTITUENT}uninstall
     93uninstall :: ${CONSTITUENT}uninstall ;
    9494
    9595${CONSTITUENT}uninstall ::
Note: See TracChangeset for help on using the changeset viewer.