- Timestamp:
- Jul 4, 2013, 1:19:15 PM (11 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- 5150e39
- Parents:
- af9008e
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
raf9008e r0d60c9d 41 41 ifneq ($(PYTHIA8),) 42 42 HAS_PYTHIA8 = true 43 CXXFLAGS += - DHAS_PYTHIA8 -I$(PYTHIA8)/include43 CXXFLAGS += -I$(PYTHIA8)/include 44 44 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy 45 45 else 46 46 ifneq ($(PYTHIA8DATA),) 47 47 HAS_PYTHIA8 = true 48 CXXFLAGS += - DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include48 CXXFLAGS += -I$(PYTHIA8DATA)/../include 49 49 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy 50 50 endif … … 288 288 EXECUTABLE_OBJ += \ 289 289 tmp/readers/DelphesPythia8.$(ObjSuf) 290 291 tmp/modules/Pythia8Dict.$(SrcSuf): \ 292 modules/Pythia8LinkDef.h \ 293 modules/PileUpMergerPythia8.h 294 DELPHES_DICT += \ 295 tmp/modules/Pythia8Dict.$(SrcSuf) 296 297 DELPHES_DICT_OBJ += \ 298 tmp/modules/Pythia8Dict.$(ObjSuf) 290 299 291 300 endif … … 321 330 modules/Cloner.h \ 322 331 modules/Weighter.h \ 323 modules/ExampleModule.h \ 324 modules/PileUpMergerPythia8.h 332 modules/ExampleModule.h 325 333 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \ 326 334 external/ExRootAnalysis/ExRootAnalysisLinkDef.h \ … … 335 343 external/ExRootAnalysis/ExRootConfReader.h \ 336 344 external/ExRootAnalysis/ExRootTask.h 337 DELPHES_DICT = \345 DELPHES_DICT += \ 338 346 tmp/classes/ClassesDict.$(SrcSuf) \ 339 347 tmp/modules/ModulesDict.$(SrcSuf) \ 340 348 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf) 341 349 342 DELPHES_DICT_OBJ = \350 DELPHES_DICT_OBJ += \ 343 351 tmp/classes/ClassesDict.$(ObjSuf) \ 344 352 tmp/modules/ModulesDict.$(ObjSuf) \ … … 349 357 display/DelphesDisplay.h \ 350 358 display/DelphesCaloData.h 351 DISPLAY_DICT = \359 DISPLAY_DICT += \ 352 360 tmp/display/DisplayDict.$(SrcSuf) 353 361 354 DISPLAY_DICT_OBJ = \362 DISPLAY_DICT_OBJ += \ 355 363 tmp/display/DisplayDict.$(ObjSuf) 356 364 … … 1094 1102 tmp/external/tcl/tclCmdMZ.$(ObjSuf): \ 1095 1103 external/tcl/tclCmdMZ.c 1096 TCL_OBJ = \1104 TCL_OBJ += \ 1097 1105 tmp/external/tcl/tclObj.$(ObjSuf) \ 1098 1106 tmp/external/tcl/tclUtil.$(ObjSuf) \ … … 1497 1505 @mkdir -p $(@D) 1498 1506 @echo ">> Generating $@" 1499 @rootcint -f $@ -c $(CXXFLAGS)$<1507 @rootcint -f $@ -c -Iexternal $< 1500 1508 @echo "#define private public" > $@.arch 1501 1509 @echo "#define protected public" >> $@.arch
Note:
See TracChangeset
for help on using the changeset viewer.