Changeset a4b3685 in git for Makefile

Timestamp:

May 16, 2018, 8:26:56 AM (7 years ago)

Author:

Basil Schneider <basil.schneider@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bfe749b

Parents:

cdcceb7 (diff), 3fa0357 (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 with master

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -1754 +1754 @@
         external/fastjet/internal/numconsts.hh \
         external/fastjet/PseudoJet.hh \
-        external/fastjet/internal/deprecated.hh
+        external/fastjet/internal/deprecated.hh \
+        external/fastjet/ClusterSequence.hh
         @touch $@
 
@@ -1901 +1902 @@
 display/DelphesBranchElement.h: \
         display/DelphesCaloData.h
-        @touch $@
-
-external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
-        external/fastjet/ClusterSequence.hh \
-        external/fastjet/JetDefinition.hh
         @touch $@