Changeset 108 for CMT/HEAD

Timestamp:

Oct 28, 2005, 6:51:19 PM (19 years ago)

Author:

arnault

Message:

Hack for the .DEFAUT target see CL#289

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/cleanup_header (modified) (1 diff)
• source/cmt_parser.cxx (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-10-28    <arnault@lal.in2p3.fr> 289
+
+        cmt/fragments/cleanup_header: Temporary hack to deal with missing files
+        and to avoid infinite loops in make. However, this must be seen as a ugly hack
+        since it considers an Atlas use case with config.h.in. This hack is 
+        harmless to any user of this special file though.
+
+ 
 2005-10-18    <arnault@lal.in2p3.fr> 288
 

CMT/HEAD/mgr/fragments/cleanup_header

@@ -4 +4 @@
         @cd .
 
-#.DEFAULT::
-#       @echo Using default action for $@
+#------------------------------------------------------------------------
+#        Temporary hack to deal with missing files
+#        and to avoid infinite loops in make. However, this must be seen as a ugly hack
+#        since it considers an Atlas use case with config.h.in. This hack is
+#        harmless to any user of this special file though.
+# =====> the .DEFAULT target should eventually complete disappear
+#------------------------------------------------------------------------
+
+.DEFAULT::
+        @if echo $@ | grep config.h.in ; then exit 0; else exit 1; fi
+
+##@echo Using default action for $@
+
 
 ${CONSTITUENT}clean ::

CMT/HEAD/source/cmt_parser.cxx

@@ -6534 +6534 @@
     if (Uses.size () == 0) return;
 
-    //buffer = "macro q '\"'";
-    //apply ();
-
     if (!Symbol::is_selected ("use_requirements"))
       {
@@ -6550 +6547 @@
             if (use->located ())
               {
-                buffer += "$(q)$(";
+                buffer += "$(";
                 buffer += use->prefix;
                 buffer += "ROOT)";
@@ -6559 +6556 @@
                 
                 buffer += fs;
-                buffer += "requirements$(q) ";
+                buffer += "requirements ";
               }
           }