Changeset c1780a5 in git for Makefile

Timestamp:

May 26, 2021, 4:48:19 PM (4 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

master

Children:

c6f9311

Parents:

b03c0d0 (diff), b4786d3 (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 ​https://github.com/delphes/delphes

File:

• Makefile (modified) (6 diffs)

Makefile

@@ -103 +103 @@
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
-        classes/DelphesHepMCReader.h \
+        classes/DelphesHepMC2Reader.h \
         classes/DelphesPileUpWriter.h \
         external/ExRootAnalysis/ExRootProgressBar.h \
@@ -213 +213 @@
         tmp/validation/DelphesValidation.$(ObjSuf)
 
-DelphesHepMC$(ExeSuf): \
-        tmp/readers/DelphesHepMC.$(ObjSuf)
-
-tmp/readers/DelphesHepMC.$(ObjSuf): \
-        readers/DelphesHepMC.cpp \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesHepMCReader.h \
+DelphesHepMC2$(ExeSuf): \
+        tmp/readers/DelphesHepMC2.$(ObjSuf)
+
+tmp/readers/DelphesHepMC2.$(ObjSuf): \
+        readers/DelphesHepMC2.cpp \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesHepMC2Reader.h \
+        modules/Delphes.h \
+        external/ExRootAnalysis/ExRootProgressBar.h \
+        external/ExRootAnalysis/ExRootTreeBranch.h \
+        external/ExRootAnalysis/ExRootTreeWriter.h
+DelphesHepMC3$(ExeSuf): \
+        tmp/readers/DelphesHepMC3.$(ObjSuf)
+
+tmp/readers/DelphesHepMC3.$(ObjSuf): \
+        readers/DelphesHepMC3.cpp \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesHepMC3Reader.h \
         modules/Delphes.h \
         external/ExRootAnalysis/ExRootProgressBar.h \
@@ -263 +275 @@
         external/ExRootAnalysis/ExRootTreeWriter.h
 EXECUTABLE +=  \
-        DelphesHepMC$(ExeSuf) \
+        DelphesHepMC2$(ExeSuf) \
+        DelphesHepMC3$(ExeSuf) \
         DelphesLHEF$(ExeSuf) \
         DelphesROOT$(ExeSuf) \
@@ -269 +282 @@
 
 EXECUTABLE_OBJ +=  \
-        tmp/readers/DelphesHepMC.$(ObjSuf) \
+        tmp/readers/DelphesHepMC2.$(ObjSuf) \
+        tmp/readers/DelphesHepMC3.$(ObjSuf) \
         tmp/readers/DelphesLHEF.$(ObjSuf) \
         tmp/readers/DelphesROOT.$(ObjSuf) \
@@ -516 +530 @@
         classes/DelphesFormula.h \
         classes/DelphesClasses.h
-tmp/classes/DelphesHepMCReader.$(ObjSuf): \
-        classes/DelphesHepMCReader.$(SrcSuf) \
-        classes/DelphesHepMCReader.h \
+tmp/classes/DelphesHepMC2Reader.$(ObjSuf): \
+        classes/DelphesHepMC2Reader.$(SrcSuf) \
+        classes/DelphesHepMC2Reader.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesStream.h \
+        external/ExRootAnalysis/ExRootTreeBranch.h
+tmp/classes/DelphesHepMC3Reader.$(ObjSuf): \
+        classes/DelphesHepMC3Reader.$(SrcSuf) \
+        classes/DelphesHepMC3Reader.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1145 +1166 @@
         tmp/classes/DelphesFactory.$(ObjSuf) \
         tmp/classes/DelphesFormula.$(ObjSuf) \
-        tmp/classes/DelphesHepMCReader.$(ObjSuf) \
+        tmp/classes/DelphesHepMC2Reader.$(ObjSuf) \
+        tmp/classes/DelphesHepMC3Reader.$(ObjSuf) \
         tmp/classes/DelphesLHEFReader.$(ObjSuf) \
         tmp/classes/DelphesModule.$(ObjSuf) \