Fork me on GitHub

Changeset bd0a1aa in git for Makefile


Ignore:
Timestamp:
Jun 13, 2016, 1:42:30 PM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r4a0d9d5 rbd0a1aa  
    271271        modules/Pythia8LinkDef.h \
    272272        modules/PileUpMergerPythia8.h
     273tmp/modules/Pythia8Dict$(PcmSuf): \
     274        tmp/modules/Pythia8Dict.$(SrcSuf)
    273275Pythia8Dict$(PcmSuf): \
    274         tmp/modules/Pythia8Dict$(PcmSuf) \
    275         tmp/modules/Pythia8Dict.$(SrcSuf)
     276        tmp/modules/Pythia8Dict$(PcmSuf)
    276277DELPHES_DICT_OBJ +=  \
    277278        tmp/modules/Pythia8Dict.$(ObjSuf)
     
    288289        classes/SortableObject.h \
    289290        classes/DelphesClasses.h
     291tmp/classes/ClassesDict$(PcmSuf): \
     292        tmp/classes/ClassesDict.$(SrcSuf)
    290293ClassesDict$(PcmSuf): \
    291         tmp/classes/ClassesDict$(PcmSuf) \
    292         tmp/classes/ClassesDict.$(SrcSuf)
     294        tmp/classes/ClassesDict$(PcmSuf)
    293295tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
    294296        external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
     
    303305        external/ExRootAnalysis/ExRootConfReader.h \
    304306        external/ExRootAnalysis/ExRootTask.h
     307tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf): \
     308        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
    305309ExRootAnalysisDict$(PcmSuf): \
    306         tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf) \
    307         tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
     310        tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf)
    308311tmp/modules/ModulesDict.$(SrcSuf): \
    309312        modules/ModulesLinkDef.h \
     
    348351        modules/VertexFinder.h \
    349352        modules/ExampleModule.h
     353tmp/modules/ModulesDict$(PcmSuf): \
     354        tmp/modules/ModulesDict.$(SrcSuf)
    350355ModulesDict$(PcmSuf): \
    351         tmp/modules/ModulesDict$(PcmSuf) \
    352         tmp/modules/ModulesDict.$(SrcSuf)
     356        tmp/modules/ModulesDict$(PcmSuf)
    353357DELPHES_DICT_OBJ +=  \
    354358        tmp/classes/ClassesDict.$(ObjSuf) \
     
    366370        modules/FastJetGridMedianEstimator.h \
    367371        modules/RunPUPPI.h
     372tmp/modules/FastJetDict$(PcmSuf): \
     373        tmp/modules/FastJetDict.$(SrcSuf)
    368374FastJetDict$(PcmSuf): \
    369         tmp/modules/FastJetDict$(PcmSuf) \
    370         tmp/modules/FastJetDict.$(SrcSuf)
     375        tmp/modules/FastJetDict$(PcmSuf)
    371376FASTJET_DICT_OBJ +=  \
    372377        tmp/modules/FastJetDict.$(ObjSuf)
     
    384389        display/DelphesHtmlSummary.h \
    385390        display/DelphesPlotSummary.h
     391tmp/display/DisplayDict$(PcmSuf): \
     392        tmp/display/DisplayDict.$(SrcSuf)
    386393DisplayDict$(PcmSuf): \
    387         tmp/display/DisplayDict$(PcmSuf) \
    388         tmp/display/DisplayDict.$(SrcSuf)
     394        tmp/display/DisplayDict$(PcmSuf)
    389395DISPLAY_DICT_OBJ +=  \
    390396        tmp/display/DisplayDict.$(ObjSuf)
     
    21662172        @rm $@.arch $@.base
    21672173
    2168 %Dict$(PcmSuf):
     2174$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
     2175        @echo ">> Copying $@"
     2176        @cp $< $@
     2177
     2178$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
     2179        @echo ">> Copying $@"
     2180        @cp $< $@
     2181
     2182$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
    21692183        @echo ">> Copying $@"
    21702184        @cp $< $@
Note: See TracChangeset for help on using the changeset viewer.