Changeset 6965fe1 in git for Makefile

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:

• Makefile (modified) (5 diffs)

Makefile

@@ -1257 +1257 @@
         external/fastjet/Voronoi.$(SrcSuf) \
         external/fastjet/internal/Voronoi.hh
+tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf): \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf)
 tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
@@ -1417 +1419 @@
         external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
         external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
@@ -1444 +1447 @@
         external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
         external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
@@ -1501 +1505 @@
         tmp/external/fastjet/TilingExtent.$(ObjSuf) \
         tmp/external/fastjet/Voronoi.$(ObjSuf) \
+        tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
@@ -1894 +1899 @@
         @touch $@
 
+
+external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
+        external/fastjet/JetDefinition.hh \
+        external/fastjet/ClusterSequence.hh
+        @touch $@
+
 external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
         external/fastjet/ClusterSequence.hh \