Changeset bd0a1aa in git for Makefile

Timestamp:

Jun 13, 2016, 1:42:30 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

29d662e

Parents:

4a0d9d5 (diff), 83e60eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into dev_01

File:

• Makefile (modified) (7 diffs)

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 \
@@ -348 +351 @@
         modules/VertexFinder.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) \
@@ -366 +370 @@
         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)
@@ -384 +389 @@
         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)
@@ -2166 +2172 @@
         @rm $@.arch $@.base
 
-%Dict$(PcmSuf):
+$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
+$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
+        @echo ">> Copying $@"
+        @cp $< $@
+
+$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
         @echo ">> Copying $@"
         @cp $< $@