Changeset d77b51d in git for doc/genMakefile.tcl
- Timestamp:
- Sep 29, 2015, 2:08:10 PM (9 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- a98c7ef
- Parents:
- d870fc5 (diff), 06ec139 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
doc/genMakefile.tcl
rd870fc5 rd77b51d 103 103 if {$fileName == "modules/PileUpMergerPythia8.cc"} { 104 104 lappend srcObjFilesPythia8 $srcObjName$objSuf 105 } elseif { [string match {modules/FastJet*.cc} $fileName]&& $srcPrefix != {FASTJET}} {105 } elseif {([string match {modules/FastJet*.cc} $fileName] || [string match {modules/RunPUPPI.cc} $fileName]) && $srcPrefix != {FASTJET}} { 106 106 continue 107 107 } else { … … 219 219 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH))) 220 220 endif 221 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormats PatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils221 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon 222 222 endif 223 223 … … 230 230 ifneq ($(PYTHIA8),) 231 231 #HAS_PYTHIA8 = true 232 #CXXFLAGS += -I$(PYTHIA8)/include233 #CXXFLAGS += -I$(PYTHIA8)/include/Pythia8234 #OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl232 CXXFLAGS += -I$(PYTHIA8)/include 233 CXXFLAGS += -I$(PYTHIA8)/include/Pythia8 234 OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl 235 235 endif 236 236 … … 285 285 sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/Hector/*.cc} 286 286 287 sourceDeps {FASTJET} {modules/FastJet*.cc} { external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} {external/fastjet/contribs/*/*.cc}287 sourceDeps {FASTJET} {modules/FastJet*.cc} {modules/RunPUPPI.cc} {external/PUPPI/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} {external/fastjet/contribs/*/*.cc} 288 288 289 289 sourceDeps {DISPLAY} {display/*.cc} … … 396 396 @echo ">> Building $(DISTTAR)" 397 397 @mkdir -p $(DISTDIR) 398 @cp -a CHANGELOG C OPYING CREDITS README VERSION Makefileconfigure cards classes converters display doc examples external modules python readers $(DISTDIR)398 @cp -a CHANGELOG CMakeLists.txt COPYING CREDITS DelphesEnv.sh README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers $(DISTDIR) 399 399 @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \; 400 400 @tar -czf $(DISTTAR) $(DISTDIR)
Note:
See TracChangeset
for help on using the changeset viewer.