Changeset 479f808 in git

Timestamp:

Jun 7, 2016, 5:28:10 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b0ba2b4

Parents:

740d430

Message:

fix dependencies for _rdict.pcm files

Files:

• Makefile (modified) (6 diffs)
• doc/genMakefile.tcl (modified) (1 diff)

Makefile

@@ -271 +271 @@
         modules/Pythia8LinkDef.h \
         modules/PileUpMergerPythia8.h
+tmp/modules/Pythia8Dict$(PcmSuf): \
+        tmp/modules/Pythia8Dict.$(SrcSuf)
 Pythia8Dict$(PcmSuf): \
-        tmp/modules/Pythia8Dict$(PcmSuf) \
-        tmp/modules/Pythia8Dict.$(SrcSuf)
+        tmp/modules/Pythia8Dict$(PcmSuf)
 DELPHES_DICT_OBJ +=  \
         tmp/modules/Pythia8Dict.$(ObjSuf)
@@ -288 +289 @@
         classes/SortableObject.h \
         classes/DelphesClasses.h
+tmp/classes/ClassesDict$(PcmSuf): \
+        tmp/classes/ClassesDict.$(SrcSuf)
 ClassesDict$(PcmSuf): \
-        tmp/classes/ClassesDict$(PcmSuf) \
-        tmp/classes/ClassesDict.$(SrcSuf)
+        tmp/classes/ClassesDict$(PcmSuf)
 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
         external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
@@ -303 +305 @@
         external/ExRootAnalysis/ExRootConfReader.h \
         external/ExRootAnalysis/ExRootTask.h
+tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf): \
+        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
 ExRootAnalysisDict$(PcmSuf): \
-        tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf) \
-        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
+        tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf)
 tmp/modules/ModulesDict.$(SrcSuf): \
         modules/ModulesLinkDef.h \
@@ -344 +347 @@
         modules/JetFakeParticle.h \
         modules/ExampleModule.h
+tmp/modules/ModulesDict$(PcmSuf): \
+        tmp/modules/ModulesDict.$(SrcSuf)
 ModulesDict$(PcmSuf): \
-        tmp/modules/ModulesDict$(PcmSuf) \
-        tmp/modules/ModulesDict.$(SrcSuf)
+        tmp/modules/ModulesDict$(PcmSuf)
 DELPHES_DICT_OBJ +=  \
         tmp/classes/ClassesDict.$(ObjSuf) \
@@ -362 +366 @@
         modules/FastJetGridMedianEstimator.h \
         modules/RunPUPPI.h
+tmp/modules/FastJetDict$(PcmSuf): \
+        tmp/modules/FastJetDict.$(SrcSuf)
 FastJetDict$(PcmSuf): \
-        tmp/modules/FastJetDict$(PcmSuf) \
-        tmp/modules/FastJetDict.$(SrcSuf)
+        tmp/modules/FastJetDict$(PcmSuf)
 FASTJET_DICT_OBJ +=  \
         tmp/modules/FastJetDict.$(ObjSuf)
@@ -380 +385 @@
         display/DelphesHtmlSummary.h \
         display/DelphesPlotSummary.h
+tmp/display/DisplayDict$(PcmSuf): \
+        tmp/display/DisplayDict.$(SrcSuf)
 DisplayDict$(PcmSuf): \
-        tmp/display/DisplayDict$(PcmSuf) \
-        tmp/display/DisplayDict.$(SrcSuf)
+        tmp/display/DisplayDict$(PcmSuf)
 DISPLAY_DICT_OBJ +=  \
         tmp/display/DisplayDict.$(ObjSuf)

doc/genMakefile.tcl

@@ -72 +72 @@
     dependencies $fileName "$dictName$srcSuf:$suffix$fileName"
 
+    puts -nonewline $dictName$pcmSuf:$suffix
+    puts -nonewline $dictName$srcSuf
+    puts {}
+
     puts -nonewline [file tail $dictName$pcmSuf]:$suffix
-    puts -nonewline $dictName$pcmSuf$suffix
-    puts -nonewline $dictName$srcSuf
+    puts -nonewline $dictName$pcmSuf
     puts {}
   }