Changes in Makefile [b4786d3:78e55cf] in git

File:

• Makefile (modified) (6 diffs)

Makefile

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