Fork me on GitHub

Changeset cf14ea5 in git for Makefile


Ignore:
Timestamp:
Jul 4, 2013, 1:36:57 AM (11 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
b31dce0
Parents:
c466459
Message:

update Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rc466459 rcf14ea5  
    2121
    2222ifneq ($(PYTHIA8),)
     23HAS_PYTHIA8 = true
    2324CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
    24 DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy
     25DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
     26else
     27ifneq ($(PYTHIA8DATA),)
     28HAS_PYTHIA8 = true
     29CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     30DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
     31else
     32ifneq ($(PYTHIA8DATA),)
     33HAS_PYTHIA8 = true
     34CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
     35DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib/archive -lpythia8 -llhapdfdummy
    2536endif
     37endif
     38
    2639
    2740###
     
    905918        tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf)
    906919
    907 ifneq ($(PYTHIA8),)
     920ifeq ($(HAS_PYTHIA8),true)
    908921DELPHES_OBJ +=  \
    909922        tmp/modules/PileUpMergerPythia8.$(ObjSuf)
     
    919932        tmp/display/DelphesCaloData.$(ObjSuf)
    920933
    921 ifneq ($(PYTHIA8),)
     934ifeq ($(HAS_PYTHIA8),true)
    922935DISPLAY_OBJ +=  \
    923936       
     
    13801393        @mkdir -p $(@D)
    13811394        @echo ">> Generating $@"
    1382         @rootcint -f $@ -c -Iexternal $<
     1395        @rootcint -f $@ -c $(CXXFLAGS) $<
    13831396        @echo "#define private public" > $@.arch
    13841397        @echo "#define protected public" >> $@.arch
Note: See TracChangeset for help on using the changeset viewer.