Fork me on GitHub

Changeset ebf057e in git for Makefile


Ignore:
Timestamp:
Aug 26, 2016, 2:17:11 PM (8 years ago)
Author:
Alexandre Mertens <alexandre.mertens@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
058006a
Parents:
1160e4f (diff), 7da1826 (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 'dev_01' of ​https://github.com/delphes/delphes into ValidationWorkWithPavel

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r1160e4f rebf057e  
    148148tmp/examples/Validation.$(ObjSuf): \
    149149        examples/Validation.cpp \
    150         classes/DelphesClasses.h \
    151         external/ExRootAnalysis/ExRootTreeReader.h \
    152         external/ExRootAnalysis/ExRootTreeWriter.h \
    153         external/ExRootAnalysis/ExRootTreeBranch.h \
    154         external/ExRootAnalysis/ExRootResult.h \
    155         external/ExRootAnalysis/ExRootUtilities.h
    156 Validation_electron$(ExeSuf): \
    157         tmp/examples/Validation_electron.$(ObjSuf)
    158 
    159 tmp/examples/Validation_electron.$(ObjSuf): \
    160         examples/Validation_electron.cpp \
    161         classes/DelphesClasses.h \
    162         external/ExRootAnalysis/ExRootTreeReader.h \
    163         external/ExRootAnalysis/ExRootTreeWriter.h \
    164         external/ExRootAnalysis/ExRootTreeBranch.h \
    165         external/ExRootAnalysis/ExRootResult.h \
    166         external/ExRootAnalysis/ExRootUtilities.h
    167 Validation_jet$(ExeSuf): \
    168         tmp/examples/Validation_jet.$(ObjSuf)
    169 
    170 tmp/examples/Validation_jet.$(ObjSuf): \
    171         examples/Validation_jet.cpp \
    172         classes/DelphesClasses.h \
    173         external/ExRootAnalysis/ExRootTreeReader.h \
    174         external/ExRootAnalysis/ExRootTreeWriter.h \
    175         external/ExRootAnalysis/ExRootTreeBranch.h \
    176         external/ExRootAnalysis/ExRootResult.h \
    177         external/ExRootAnalysis/ExRootUtilities.h
    178 Validation_muon$(ExeSuf): \
    179         tmp/examples/Validation_muon.$(ObjSuf)
    180 
    181 tmp/examples/Validation_muon.$(ObjSuf): \
    182         examples/Validation_muon.cpp \
    183         classes/DelphesClasses.h \
    184         external/ExRootAnalysis/ExRootTreeReader.h \
    185         external/ExRootAnalysis/ExRootTreeWriter.h \
    186         external/ExRootAnalysis/ExRootTreeBranch.h \
    187         external/ExRootAnalysis/ExRootResult.h \
    188         external/ExRootAnalysis/ExRootUtilities.h
    189 Validation_photon$(ExeSuf): \
    190         tmp/examples/Validation_photon.$(ObjSuf)
    191 
    192 tmp/examples/Validation_photon.$(ObjSuf): \
    193         examples/Validation_photon.cpp \
    194150        classes/DelphesClasses.h \
    195151        external/ExRootAnalysis/ExRootTreeReader.h \
    … …  
    206162        stdhep2pileup$(ExeSuf) \
    207163        Example1$(ExeSuf) \
    208         Validation$(ExeSuf) \
    209         Validation_electron$(ExeSuf) \
    210         Validation_jet$(ExeSuf) \
    211         Validation_muon$(ExeSuf) \
    212         Validation_photon$(ExeSuf)
     164        Validation$(ExeSuf)
    213165
    214166EXECUTABLE_OBJ +=  \
    … …  
    220172        tmp/converters/stdhep2pileup.$(ObjSuf) \
    221173        tmp/examples/Example1.$(ObjSuf) \
    222         tmp/examples/Validation.$(ObjSuf) \
    223         tmp/examples/Validation_electron.$(ObjSuf) \
    224         tmp/examples/Validation_jet.$(ObjSuf) \
    225         tmp/examples/Validation_muon.$(ObjSuf) \
    226         tmp/examples/Validation_photon.$(ObjSuf)
     174        tmp/examples/Validation.$(ObjSuf)
    227175
    228176DelphesHepMC$(ExeSuf): \
Note: See TracChangeset for help on using the changeset viewer.