Fork me on GitHub

Changeset 1177 in svn for trunk/Makefile


Ignore:
Timestamp:
Jul 4, 2013, 1:19:15 PM (11 years ago)
Author:
Pavel Demin
Message:

add modules/Pythia8LinkDef.h

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r1176 r1177  
    4141ifneq ($(PYTHIA8),)
    4242HAS_PYTHIA8 = true
    43 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
     43CXXFLAGS += -I$(PYTHIA8)/include
    4444DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
    4545else
    4646ifneq ($(PYTHIA8DATA),)
    4747HAS_PYTHIA8 = true
    48 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     48CXXFLAGS += -I$(PYTHIA8DATA)/../include
    4949DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
    5050endif
     
    288288EXECUTABLE_OBJ +=  \
    289289        tmp/readers/DelphesPythia8.$(ObjSuf)
     290
     291tmp/modules/Pythia8Dict.$(SrcSuf): \
     292        modules/Pythia8LinkDef.h \
     293        modules/PileUpMergerPythia8.h
     294DELPHES_DICT +=  \
     295        tmp/modules/Pythia8Dict.$(SrcSuf)
     296
     297DELPHES_DICT_OBJ +=  \
     298        tmp/modules/Pythia8Dict.$(ObjSuf)
    290299
    291300endif
     
    321330        modules/Cloner.h \
    322331        modules/Weighter.h \
    323         modules/ExampleModule.h \
    324         modules/PileUpMergerPythia8.h
     332        modules/ExampleModule.h
    325333tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
    326334        external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
     
    335343        external/ExRootAnalysis/ExRootConfReader.h \
    336344        external/ExRootAnalysis/ExRootTask.h
    337 DELPHES_DICT =  \
     345DELPHES_DICT +=  \
    338346        tmp/classes/ClassesDict.$(SrcSuf) \
    339347        tmp/modules/ModulesDict.$(SrcSuf) \
    340348        tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
    341349
    342 DELPHES_DICT_OBJ =  \
     350DELPHES_DICT_OBJ +=  \
    343351        tmp/classes/ClassesDict.$(ObjSuf) \
    344352        tmp/modules/ModulesDict.$(ObjSuf) \
     
    349357        display/DelphesDisplay.h \
    350358        display/DelphesCaloData.h
    351 DISPLAY_DICT =  \
     359DISPLAY_DICT +=  \
    352360        tmp/display/DisplayDict.$(SrcSuf)
    353361
    354 DISPLAY_DICT_OBJ =  \
     362DISPLAY_DICT_OBJ +=  \
    355363        tmp/display/DisplayDict.$(ObjSuf)
    356364
     
    10941102tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
    10951103        external/tcl/tclCmdMZ.c
    1096 TCL_OBJ =  \
     1104TCL_OBJ +=  \
    10971105        tmp/external/tcl/tclObj.$(ObjSuf) \
    10981106        tmp/external/tcl/tclUtil.$(ObjSuf) \
     
    14971505        @mkdir -p $(@D)
    14981506        @echo ">> Generating $@"
    1499         @rootcint -f $@ -c $(CXXFLAGS) $<
     1507        @rootcint -f $@ -c -Iexternal $<
    15001508        @echo "#define private public" > $@.arch
    15011509        @echo "#define protected public" >> $@.arch
Note: See TracChangeset for help on using the changeset viewer.