Changes in Makefile [5b5a56b:6427420] in git

File:

• Makefile (modified) (10 diffs)

Makefile

@@ -17 +17 @@
 CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
 DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
-DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
+DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
 
 ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
 HAS_CMSSW = true
 CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
-DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
+OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
 ifneq ($(CMSSW_RELEASE_BASE),)
 CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
 endif
 ifneq ($(LD_LIBRARY_PATH),)
-DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
-endif
-DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
+OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
+endif
+OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
 endif
 
 ifneq ($(PROMC),)
 HAS_PROMC = true
-CXXFLAGS += -I$(PROMC)/include
-DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
+CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
+OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
 endif
 
@@ -41 +41 @@
 HAS_PYTHIA8 = true
 CXXFLAGS += -I$(PYTHIA8)/include
-DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
+OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
 else
 ifneq ($(PYTHIA8DATA),)
 HAS_PYTHIA8 = true
 CXXFLAGS += -I$(PYTHIA8DATA)/../include
-DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
-endif
-endif
+OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
+endif
+endif
+
+DELPHES_LIBS += $(OPT_LIBS)
+DISPLAY_LIBS += $(OPT_LIBS)
 
 ###
@@ -238 +241 @@
         external/ExRootAnalysis/ExRootTreeWriter.h \
         external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootProgressBar.h \
-        external/ProMC/ProMCBook.h
+        external/ExRootAnalysis/ExRootProgressBar.h
 EXECUTABLE +=  \
         DelphesProMC$(ExeSuf)
@@ -245 +247 @@
 EXECUTABLE_OBJ +=  \
         tmp/readers/DelphesProMC.$(ObjSuf)
-
-tmp/external/ProMC/ProMCBook.$(ObjSuf): \
-        external/ProMC/ProMCBook.$(SrcSuf)
-tmp/external/ProMC/ProMC.pb.$(ObjSuf): \
-        external/ProMC/ProMC.pb.$(SrcSuf)
-tmp/external/ProMC/ProMCStat.pb.$(ObjSuf): \
-        external/ProMC/ProMCStat.pb.$(SrcSuf)
-tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf): \
-        external/ProMC/ProMCHeader.pb.$(SrcSuf)
-tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf): \
-        external/ProMC/ProMCDescription.pb.$(SrcSuf)
-DELPHES_OBJ +=  \
-        tmp/external/ProMC/ProMCBook.$(ObjSuf) \
-        tmp/external/ProMC/ProMC.pb.$(ObjSuf) \
-        tmp/external/ProMC/ProMCStat.pb.$(ObjSuf) \
-        tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf) \
-        tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf)
-
-ifeq ($(HAS_PYTHIA8),true)
-DELPHES_OBJ +=  \
-        
-endif
 
 endif
@@ -381 +361 @@
         display/DisplayLinkDef.h \
         display/DelphesDisplay.h \
-        display/DelphesCaloData.h
+        display/DelphesCaloData.h \
+        display/DelphesBranchElement.h \
+        display/Delphes3DGeometry.h \
+        display/DelphesEventDisplay.h \
+        display/DelphesHtmlSummary.h \
+        display/DelphesPlotSummary.h
 DisplayDict$(PcmSuf): \
         tmp/display/DisplayDict$(PcmSuf) \
@@ -1235 +1220 @@
         display/DelphesDisplay.$(SrcSuf) \
         display/DelphesDisplay.h
+tmp/display/DelphesPlotSummary.$(ObjSuf): \
+        display/DelphesPlotSummary.$(SrcSuf) \
+        display/DelphesPlotSummary.h
+tmp/display/DelphesBranchElement.$(ObjSuf): \
+        display/DelphesBranchElement.$(SrcSuf) \
+        display/DelphesBranchElement.h \
+        classes/DelphesClasses.h
+tmp/display/DelphesEventDisplay.$(ObjSuf): \
+        display/DelphesEventDisplay.$(SrcSuf) \
+        external/ExRootAnalysis/ExRootConfReader.h \
+        external/ExRootAnalysis/ExRootTreeReader.h \
+        display/DelphesCaloData.h \
+        display/DelphesBranchElement.h \
+        display/Delphes3DGeometry.h \
+        display/DelphesEventDisplay.h \
+        classes/DelphesClasses.h
+tmp/display/DelphesHtmlSummary.$(ObjSuf): \
+        display/DelphesHtmlSummary.$(SrcSuf) \
+        display/DelphesHtmlSummary.h
+tmp/display/Delphes3DGeometry.$(ObjSuf): \
+        display/Delphes3DGeometry.$(SrcSuf) \
+        display/Delphes3DGeometry.h \
+        external/ExRootAnalysis/ExRootConfReader.h \
+        classes/DelphesClasses.h
 tmp/display/DelphesCaloData.$(ObjSuf): \
         display/DelphesCaloData.$(SrcSuf) \
@@ -1240 +1249 @@
 DISPLAY_OBJ +=  \
         tmp/display/DelphesDisplay.$(ObjSuf) \
+        tmp/display/DelphesPlotSummary.$(ObjSuf) \
+        tmp/display/DelphesBranchElement.$(ObjSuf) \
+        tmp/display/DelphesEventDisplay.$(ObjSuf) \
+        tmp/display/DelphesHtmlSummary.$(ObjSuf) \
+        tmp/display/Delphes3DGeometry.$(ObjSuf) \
         tmp/display/DelphesCaloData.$(ObjSuf)
 
@@ -1461 +1475 @@
         @touch $@
 
+display/DelphesBranchElement.h: \
+        display/DelphesCaloData.h
+        @touch $@
+
 external/fastjet/internal/DynamicNearestNeighbours.hh: \
         external/fastjet/internal/numconsts.hh
@@ -1500 +1518 @@
         @touch $@
 
+display/DelphesEventDisplay.h: \
+        external/ExRootAnalysis/ExRootTreeReader.h \
+        display/DelphesDisplay.h \
+        display/Delphes3DGeometry.h \
+        display/DelphesHtmlSummary.h \
+        display/DelphesPlotSummary.h
+        @touch $@
+
 modules/TauTagging.h: \
         classes/DelphesModule.h
@@ -1584 +1610 @@
 modules/Hector.h: \
         classes/DelphesModule.h
+        @touch $@
+
+display/DelphesPlotSummary.h: \
+        external/ExRootAnalysis/ExRootTreeReader.h
         @touch $@