Changeset 0d60c9d in git for Makefile

Timestamp:

Jul 4, 2013, 1:19:15 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5150e39

Parents:

af9008e

Message:

add modules/Pythia8LinkDef.h

File:

• Makefile (modified) (7 diffs)

Makefile

@@ -41 +41 @@
 ifneq ($(PYTHIA8),)
 HAS_PYTHIA8 = true
-CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
+CXXFLAGS += -I$(PYTHIA8)/include
 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
 else
 ifneq ($(PYTHIA8DATA),)
 HAS_PYTHIA8 = true
-CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+CXXFLAGS += -I$(PYTHIA8DATA)/../include
 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
 endif
@@ -288 +288 @@
 EXECUTABLE_OBJ +=  \
         tmp/readers/DelphesPythia8.$(ObjSuf)
+
+tmp/modules/Pythia8Dict.$(SrcSuf): \
+        modules/Pythia8LinkDef.h \
+        modules/PileUpMergerPythia8.h
+DELPHES_DICT +=  \
+        tmp/modules/Pythia8Dict.$(SrcSuf)
+
+DELPHES_DICT_OBJ +=  \
+        tmp/modules/Pythia8Dict.$(ObjSuf)
 
 endif
@@ -321 +330 @@
         modules/Cloner.h \
         modules/Weighter.h \
-        modules/ExampleModule.h \
-        modules/PileUpMergerPythia8.h
+        modules/ExampleModule.h
 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
         external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
@@ -335 +343 @@
         external/ExRootAnalysis/ExRootConfReader.h \
         external/ExRootAnalysis/ExRootTask.h
-DELPHES_DICT =  \
+DELPHES_DICT +=  \
         tmp/classes/ClassesDict.$(SrcSuf) \
         tmp/modules/ModulesDict.$(SrcSuf) \
         tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
 
-DELPHES_DICT_OBJ =  \
+DELPHES_DICT_OBJ +=  \
         tmp/classes/ClassesDict.$(ObjSuf) \
         tmp/modules/ModulesDict.$(ObjSuf) \
@@ -349 +357 @@
         display/DelphesDisplay.h \
         display/DelphesCaloData.h
-DISPLAY_DICT =  \
+DISPLAY_DICT +=  \
         tmp/display/DisplayDict.$(SrcSuf)
 
-DISPLAY_DICT_OBJ =  \
+DISPLAY_DICT_OBJ +=  \
         tmp/display/DisplayDict.$(ObjSuf)
 
@@ -1094 +1102 @@
 tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
         external/tcl/tclCmdMZ.c
-TCL_OBJ =  \
+TCL_OBJ +=  \
         tmp/external/tcl/tclObj.$(ObjSuf) \
         tmp/external/tcl/tclUtil.$(ObjSuf) \
@@ -1497 +1505 @@
         @mkdir -p $(@D)
         @echo ">> Generating $@"
-        @rootcint -f $@ -c $(CXXFLAGS) $<
+        @rootcint -f $@ -c -Iexternal $<
         @echo "#define private public" > $@.arch
         @echo "#define protected public" >> $@.arch