Fork me on GitHub

Changeset 1177 in svn for trunk/doc/genMakefile.tcl


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/doc/genMakefile.tcl

    r1176 r1177  
    7171  }
    7272
    73   puts -nonewline "${dictVar} = $suffix"
     73  puts -nonewline "${dictVar} += $suffix"
    7474  puts [join $dictSrcFiles $suffix]
    7575  puts {}
    7676
    77   puts -nonewline "${dictVar}_OBJ = $suffix"
     77  puts -nonewline "${dictVar}_OBJ += $suffix"
    7878  puts [join $dictObjFiles $suffix]
    7979  puts {}
     
    133133  }
    134134
    135   puts -nonewline "TCL_OBJ = $suffix"
     135  puts -nonewline "TCL_OBJ += $suffix"
    136136  puts [join $srcObjFiles $suffix]
    137137  puts {}
     
    147147
    148148  foreach fileName $executable {
    149     if {$fileName == "examples/DelphesProMC.cpp"} continue
    150 
    151149    regsub {\.cpp} $fileName {} exeObjName
    152150    set exeObjName $prefix$exeObjName
     
    224222ifneq ($(PYTHIA8),)
    225223HAS_PYTHIA8 = true
    226 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
     224CXXFLAGS += -I$(PYTHIA8)/include
    227225DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
    228226else
    229227ifneq ($(PYTHIA8DATA),)
    230228HAS_PYTHIA8 = true
    231 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     229CXXFLAGS += -I$(PYTHIA8DATA)/../include
    232230DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
    233231endif
     
    267265puts {ifeq ($(HAS_PYTHIA8),true)}
    268266executableDeps {readers/DelphesPythia8.cpp}
     267dictDeps {DELPHES_DICT} {modules/Pythia8LinkDef.h}
    269268puts {endif}
    270269puts {}
    271270
    272 dictDeps {DELPHES_DICT} {classes/*LinkDef.h} {modules/*LinkDef.h} {external/ExRootAnalysis/*LinkDef.h}
    273 
    274 dictDeps {DISPLAY_DICT} {display/*LinkDef.h}
     271dictDeps {DELPHES_DICT} {classes/ClassesLinkDef.h} {modules/ModulesLinkDef.h} {external/ExRootAnalysis/ExRootAnalysisLinkDef.h}
     272
     273dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h}
    275274
    276275sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc}
     
    366365        @mkdir -p $(@D)
    367366        @echo ">> Generating $@"
    368         @rootcint -f $@ -c $(CXXFLAGS) $<
     367        @rootcint -f $@ -c -Iexternal $<
    369368        @echo "#define private public" > $@.arch
    370369        @echo "#define protected public" >> $@.arch
Note: See TracChangeset for help on using the changeset viewer.