Changeset 9666d3b in git for Makefile

Timestamp:

Apr 11, 2018, 4:19:18 PM (7 years ago)

Author:

Ulrike Schnoor <ulrike.schnoor@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6ba7847

Parents:

6f96f62 (diff), a670493 (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:

merged the upstream/master

File:

• Makefile (modified) (9 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)
@@ -1289 +1287 @@
 tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
         external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
+tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf): \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(SrcSuf) \
+        external/fastjet/NNH.hh
 tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf): \
         external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(SrcSuf) \
@@ -1419 +1420 @@
         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 \
         external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
         external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
         external/fastjet/tools/Filter.hh \
         external/fastjet/tools/Pruner.hh \
@@ -1447 +1448 @@
         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 \
@@ -1505 +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) \
@@ -1519 +1518 @@
         tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \
         tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
+        tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf) \
         tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
         tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf) \
@@ -1880 +1880 @@
         @touch $@
 
+external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
+        external/fastjet/JetDefinition.hh \
+        external/fastjet/ClusterSequence.hh
+        @touch $@
+
 external/fastjet/RectangularGrid.hh: \
         external/fastjet/PseudoJet.hh \
@@ -1898 +1903 @@
         @touch $@
 
+<<<<<<< HEAD
 
 external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
@@ -1904 +1910 @@
         @touch $@
 
+=======
+>>>>>>> upstream/master
 external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
         external/fastjet/ClusterSequence.hh \