Changeset 1169 in svn

Timestamp:

Jul 4, 2013, 1:36:57 AM (11 years ago)

Author:

Pavel Demin

Message:

update Makefile

Location:

trunk

Files:

• Makefile (modified) (4 diffs)
• doc/genMakefile.tcl (modified) (1 diff)

trunk/Makefile

@@ -21 +21 @@
 
 ifneq ($(PYTHIA8),)
+HAS_PYTHIA8 = true
 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include
-DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy
+DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy
+else
+ifneq ($(PYTHIA8DATA),)
+HAS_PYTHIA8 = true
+CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
+else
+ifneq ($(PYTHIA8DATA),)
+HAS_PYTHIA8 = true
+CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib/archive -lpythia8 -llhapdfdummy
 endif
+endif
+
 
 ###
@@ -905 +918 @@
         tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf)
 
-ifneq ($(PYTHIA8),)
+ifeq ($(HAS_PYTHIA8),true)
 DELPHES_OBJ +=  \
         tmp/modules/PileUpMergerPythia8.$(ObjSuf)
@@ -919 +932 @@
         tmp/display/DelphesCaloData.$(ObjSuf)
 
-ifneq ($(PYTHIA8),)
+ifeq ($(HAS_PYTHIA8),true)
 DISPLAY_OBJ +=  \
         
@@ -1380 +1393 @@
         @mkdir -p $(@D)
         @echo ">> Generating $@"
-        @rootcint -f $@ -c -Iexternal $<
+        @rootcint -f $@ -c $(CXXFLAGS) $<
         @echo "#define private public" > $@.arch
         @echo "#define protected public" >> $@.arch

trunk/doc/genMakefile.tcl

@@ -212 +212 @@
 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy
+else
+ifneq ($(PYTHIA8DATA),)
+HAS_PYTHIA8 = true
+CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include
+DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib/archive -lpythia8 -llhapdfdummy
 endif
 endif