Fork me on GitHub

Changeset 6965fe1 in git for Makefile


Ignore:
Timestamp:
Dec 5, 2017, 8:33:29 PM (7 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
8d4d51b
Parents:
ba75867 (diff), dda357d (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' of github.com:delphes/delphes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rba75867 r6965fe1  
    12571257        external/fastjet/Voronoi.$(SrcSuf) \
    12581258        external/fastjet/internal/Voronoi.hh
     1259tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf): \
     1260        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf)
    12591261tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
    12601262        external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
     
    14171419        external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
    14181420        external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
     1421        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
    14191422        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
    14201423        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
     
    14441447        external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
    14451448        external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
     1449        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
    14461450        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
    14471451        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
     
    15011505        tmp/external/fastjet/TilingExtent.$(ObjSuf) \
    15021506        tmp/external/fastjet/Voronoi.$(ObjSuf) \
     1507        tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf) \
    15031508        tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
    15041509        tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
     
    18941899        @touch $@
    18951900
     1901
     1902external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
     1903        external/fastjet/JetDefinition.hh \
     1904        external/fastjet/ClusterSequence.hh
     1905        @touch $@
     1906
    18961907external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
    18971908        external/fastjet/ClusterSequence.hh \
Note: See TracChangeset for help on using the changeset viewer.