diff -u -r1.17 -r1.18
--- Makefile	6 Oct 2010 21:23:14 -0000	1.17
+++ Makefile	5 Nov 2010 13:11:47 -0000	1.18
@@ -1,13 +1,8 @@

-# $Id: Makefile,v 1.17 2010/10/06 21:23:14 jeremy Exp $

+# $Id: Makefile,v 1.18 2010/11/05 13:11:47 jeremy Exp $

 
 #

-# Makefile for the slicPandora project.  It requires that 
-# the variables PANDORAPFA and LCIO are set in the user's
-# environment.  These should point to the PandoraPFANew root
-# svn checkout and the LCIO cvs checkout, respectively.  The
-# user will also need to setup the LD_LIBRARY_PATH in the
-# environment.  (See ./example_setup_script.sh for how to 
-# do this.)

+# Makefile for the slicPandora project.  
+# environment.  

 #
 
 # Print an error message and exit if PANDORAPFA is not defined.

@@ -27,44 +22,49 @@

 # binary name
 BINNAME=slicPandora
 

-# C++ source files

+# C++ source files in slicPandora

 SRCDIR=$(PWD)/src
 SRCS=$(wildcard $(SRCDIR)/*.cpp)
 TESTSRCS=$(wildcard $(PWD)/tests/*.cpp)
 

-# objects

+# object files to generate

 OBJS=$(addsuffix .o, $(basename $(SRCS)))
 

-# ROOT libs, includes, flags

+# slicPandora include files
+INCDIR=$(PWD)/include 
+
+# slicPandora and internal includes
+INCLUDES=-I$(INCDIR) -I$(PANDORAPFA)/include -I$(LCIO)/src/cpp/include
+
+# external program libraries
+LIBS=-L$(PANDORAPFA)/lib -lPandoraPFANew -L$(LCIO)/lib -llcio -lsio
+
+# compiler flags
+CXXFLAGS=-Wall -g $(INCLUDES) -fPIC
+
+# need root if using monitoring
+ifdef USE_PANDORAMONITORING
+

 ROOTLIBS=$(shell root-config --glibs --ldflags) -lEve -lTMVA -lGeom -lGed -lGLEW 
 ROOTINCLUDES=$(shell root-config --incdir)
 ROOTFLAGS=$(shell root-config --cflags --auxcflags)
 

-# include files
-INCDIR=$(PWD)/include 
-INCLUDES=-I$(INCDIR) -I$(PANDORAPFA)/include -I$(LCIO)/src/cpp/include -I$(ROOTINCLUDES)

+INCLUDES+=-I$(ROOTINCLUDES)
+CXXFLAGS+=$(ROOTFLAGS)
+LIBS+=$(ROOTLIBS)

-# program libraries
-LIBS=-L$(PANDORAPFA)/lib -lPandoraPFANew -L$(LCIO)/lib -llcio -lsio $(ROOTLIBS)

+endif

 
 # runtime libs
 RUNLIBS=$(LIBS) -L$(PWD)/lib -l$(BINNAME)
 

-# tests
-TESTBINS=$(subst tests,bin,$(basename $(TESTSRCS)))
-TESTS=$(basename $(notdir $(TESTSRCS)))
-

 # compiler flags

-#CXXFLAGS=-v -Wall -g $(INCLUDES)
-CXXFLAGS=-Wall -g $(INCLUDES) -fPIC $(ROOTFLAGS)

+CXXFLAGS=-Wall -g $(INCLUDES)

 
 # tests
 TESTBINS=$(subst tests,bin,$(basename $(TESTSRCS)))
 TESTS=$(basename $(notdir $(TESTSRCS)))
 

-# compiler flags
-CXXFLAGS=-Wall -g $(INCLUDES)
-

 # Enable debug output for PFO creation.
 ifdef PFOPROCESSOR_DEBUG
 CXXFLAGS+="-DPFOPROCESSOR_DEBUG=1"