Changeset 646 for CMT

Timestamp:

Jun 24, 2013, 3:32:58 PM (11 years ago)

Author:

rybkin

Message:

merge -r 635:645 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff, 1 prop)
• mgr/cmt_dcc_version.sh (modified) (1 prop)
• mgr/fragments/application (modified) (1 diff)
• mgr/fragments/constituent (modified) (1 prop)
• mgr/fragments/constituent_lock (modified) (1 prop)
• mgr/fragments/jar (modified) (1 prop)
• mgr/fragments/java (modified) (1 prop)
• mgr/fragments/nmake/application (modified) (1 diff)
• mgr/fragments/nmake/check_application (modified) (1 prop)
• mgr/fragments/nmake/constituent (modified) (1 prop)
• mgr/fragments/nmake/constituent_lock (modified) (1 prop)
• mgr/fragments/nmake/jar (modified) (1 prop)
• mgr/fragments/nmake/java (modified) (1 prop)
• mgr/fragments/nmake/library (modified) (1 prop)
• mgr/fragments/nmake/library_no_static (modified) (1 prop)
• source/cmt_project.cxx (modified) (1 prop)

CMT/v1r25-branch/ChangeLog

@@ +1 @@
+2013-06-24    <rybkin@lal.in2p3.fr> 505
+
+        * mgr/fragments/application: Work around Make errors if $(use_stamps) files
+        do not exist
+        * mgr/fragments/nmake/application: idem
+        
 2013-06-06    <rybkin@lal.in2p3.fr> 504
 

CMT/v1r25-branch/mgr/fragments/application

@@ -4 +4 @@
         $(link_echo) "application $@"
         $(link_silent) ${LINKMACRO} -o $(@).new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) && mv -f $(@).new $(@)
+
+ifdef use_stamps
+# Work around Make errors if stamps files do not exist
+$(use_stamps) :
+endif
 
 #-----------------------------------------------------------------

CMT/v1r25-branch/mgr/fragments/nmake/application

@@ -11 +11 @@
 
 
+
+!if "$(use_stamps)" != ""
+# Work around Make errors if stamps files do not exist
+$(use_stamps) :
+!endif
 
 install_dir = $(CMTINSTALLAREA)\$(tag)\bin