Changeset 4a0d9d5 in git for Makefile

Timestamp:

Jun 6, 2016, 4:47:16 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bd0a1aa

Parents:

4406bf8 (diff), 740d430 (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' into dev_01

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -1362 +1362 @@
         modules/RunPUPPI.$(SrcSuf) \
         modules/RunPUPPI.h \
-        external/PUPPI/puppiCleanContainer.hh \
-        external/PUPPI/RecoObj.hh \
-        external/PUPPI/puppiParticle.hh \
-        external/PUPPI/puppiAlgoBin.hh \
+        external/PUPPI/RecoObj2.hh \
+        external/PUPPI/AlgoObj.hh \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1801 +1799 @@
 
 modules/RunPUPPI.h: \
-        classes/DelphesModule.h
+        classes/DelphesModule.h \
+        external/PUPPI/PuppiContainer.hh
         @touch $@
 
@@ -1933 +1932 @@
         external/fastjet/AreaDefinition.hh \
         external/fastjet/ClusterSequenceAreaBase.hh
-        @touch $@
-
-external/PUPPI/puppiCleanContainer.hh: \
-        external/PUPPI/RecoObj.hh \
-        external/PUPPI/puppiParticle.hh \
-        external/PUPPI/puppiAlgoBin.hh \
-        external/fastjet/internal/base.hh \
-        external/fastjet/PseudoJet.hh
         @touch $@