Changeset a85a257 in git for Makefile

Timestamp:

Oct 25, 2014, 7:19:00 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d8b1858

Parents:

3a73e6d

Message:

adapt Delphes to ProMC 1.5

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -34 +34 @@
 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 
+DELPHES_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
 endif
 
@@ -238 +238 @@
         external/ExRootAnalysis/ExRootTreeWriter.h \
         external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootProgressBar.h \
-        external/ProMC/ProMCBook.h
+        external/ExRootAnalysis/ExRootProgressBar.h
 EXECUTABLE +=  \
         DelphesProMC$(ExeSuf)
@@ -245 +244 @@
 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