Changeset 1128 in svn for trunk

Timestamp:

May 28, 2013, 11:10:23 PM (11 years ago)

Author:

Pavel Demin

Message:

update Makefile

Location:

trunk

Files:

• Makefile (modified) (3 diffs)
• doc/genMakefile.tcl (modified) (9 diffs)

trunk/Makefile

@@ -136 +136 @@
         external/ExRootAnalysis/ExRootTreeBranch.h \
         external/ExRootAnalysis/ExRootProgressBar.h
+Example1$(ExeSuf): \
+        tmp/examples/Example1.$(ObjSuf)
+
+tmp/examples/Example1.$(ObjSuf): \
+        examples/Example1.cpp \
+        classes/DelphesClasses.h \
+        external/ExRootAnalysis/ExRootTreeReader.h \
+        external/ExRootAnalysis/ExRootTreeWriter.h \
+        external/ExRootAnalysis/ExRootTreeBranch.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootUtilities.h
 EXECUTABLE =  \
         DelphesLHEF$(ExeSuf) \
@@ -145 +156 @@
         stdhep2pileup$(ExeSuf) \
         hepmc2pileup$(ExeSuf) \
-        pileup2root$(ExeSuf)
+        pileup2root$(ExeSuf) \
+        Example1$(ExeSuf)
 
 EXECUTABLE_OBJ =  \
@@ -156 +168 @@
         tmp/converters/stdhep2pileup.$(ObjSuf) \
         tmp/converters/hepmc2pileup.$(ObjSuf) \
-        tmp/converters/pileup2root.$(ObjSuf)
+        tmp/converters/pileup2root.$(ObjSuf) \
+        tmp/examples/Example1.$(ObjSuf)
 
 tmp/classes/ClassesDict.$(SrcSuf): \

trunk/doc/genMakefile.tcl

@@ -31 +31 @@
     }
   }
-  
+
   if {[llength $list] > 0} {
     puts -nonewline $firstLine
@@ -49 +49 @@
   }
 
-  close $fid  
+  close $fid
 }
 
@@ -57 +57 @@
 
   set dict [eval glob -nocomplain $args]
-  
+
   set dictSrcFiles {}
   set dictObjFiles {}
@@ -64 +64 @@
     regsub {LinkDef\.h} $fileName {Dict} dictName
     set dictName $prefix$dictName
-  
+
     lappend dictSrcFiles $dictName$srcSuf
     lappend dictObjFiles $dictName$objSuf
-  
+
     dependencies $fileName "$dictName$srcSuf:$suffix$fileName"
   }
-  
+
   puts -nonewline "${dictVar} = $suffix"
   puts [join $dictSrcFiles $suffix]
@@ -84 +84 @@
 
   global prefix suffix srcSuf objSuf
-  
+
   set source [eval glob -nocomplain $args]
-    
+
   set srcObjFiles {}
-  
+
   foreach fileName $source {
     regsub {\.cc} $fileName {} srcName
     set srcObjName $prefix$srcName
-  
+
     lappend srcObjFiles $srcObjName$objSuf
-  
+
     dependencies $fileName "$srcObjName$objSuf:$suffix$srcName$srcSuf"
   }
@@ -106 +106 @@
 
   global prefix suffix srcSuf objSuf
-   
+
   set source [glob -nocomplain {external/tcl/*.c}]
-  
+
   set srcObjFiles {}
-  
+
   foreach fileName $source {
     if {$fileName == "tcl/tclc.c" || $fileName == "tcl/tcl.c"} continue
- 
+
     regsub {\.c} $fileName {} srcName
     set srcObjName $prefix$srcName
-  
+
     lappend srcObjFiles $srcObjName$objSuf
-  
+
     dependencies $fileName "$srcObjName$objSuf:$suffix$fileName"
   }
-  
+
   puts -nonewline "TCL_OBJ = $suffix"
   puts [join $srcObjFiles $suffix]
@@ -130 +130 @@
 
   global prefix suffix objSuf exeSuf
-   
+
   set executable [glob -nocomplain {readers/*.cpp} {converters/*.cpp} {examples/*.cpp}]
-  
+
   set exeFiles {}
-  
+
   foreach fileName $executable {
     if {$fileName == "examples/DelphesCMSFWLite.cpp"} continue
@@ -144 +144 @@
     lappend exeFiles $exeName$exeSuf
     lappend exeObjFiles $exeObjName$objSuf
-    
+
     puts "$exeName$exeSuf:$suffix$exeObjName$objSuf"
     puts ""
-  
+
     dependencies $fileName "$exeObjName$objSuf:$suffix$fileName"
   }
-  
+
   if [info exists exeFiles] {
     puts -nonewline "EXECUTABLE = $suffix"
@@ -166 +166 @@
 proc headerDeps {} {
   global suffix headerFiles
-    
+
   foreach fileName [array names headerFiles] {
     dependencies $fileName "$fileName:" 0 "\t@touch \$@"