Run ranges now supported: plugin->SetRunRange(min,max). If run numbers are given...

[u/mrichter/AliRoot.git] / ANALYSIS / Makefile

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index c5b7797efa7f4dfe26e7b92f4f324b36d9726ec3..9ae14729e69535d63a277518ff1d5b43bc22f3c3 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -1,41 +1,52 @@
 
 include $(ROOTSYS)/test/Makefile.arch
 
-default-target: libANALYSIS_NEW.so
+PACKAGE = ANALYSIS
+
+default-target: lib$(PACKAGE).so
 
 ALICEINC      = -I.
 
-### define include dir for local case and par case
+# add include paths from other par files
 ifneq ($(ESD_INCLUDE),)
    ALICEINC += -I../$(ESD_INCLUDE)
-else
-  ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include 
-  endif
 endif
 
-# for building of ANALYSIS_NEW.par
-ifneq ($(ANALYSIS_NEW_INCLUDE),)
-  ALICEINC += -I../$(ANALYSIS_NEW_INCLUDE)
+ifneq ($(AOD_INCLUDE),)
+   ALICEINC += -I../$(AOD_INCLUDE)
+endif
+
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
+ifneq ($(ANALYSIS_INCLUDE),)
+   ALICEINC += -I../$(ANALYSIS_INCLUDE)
+endif
+
+# only if no par file was loaded before
+ifeq ($(ALICEINC),-I.)
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include
+  endif
 endif
 
 CXXFLAGS     += $(ALICEINC) -g
 
-PACKAGE = ANALYSIS_NEW
 include lib$(PACKAGE).pkg
 
-DHDR_ANALYSIS_NEW := $(DHDR)
-HDRS_ANALYSIS_NEW := $(HDRS)
-SRCS_ANALYSIS_NEW := $(SRCS) G__$(PACKAGE).cxx
-OBJS_ANALYSIS_NEW := $(SRCS_ANALYSIS_NEW:.cxx=.o)
+DHDR_ANALYSIS := $(DHDR)
+HDRS_ANALYSIS := $(HDRS)
+SRCS_ANALYSIS := $(SRCS) G__$(PACKAGE).cxx
+OBJS_ANALYSIS := $(SRCS_ANALYSIS:.cxx=.o)
 
 PARFILE       = $(PACKAGE).par
 
 
-lib$(PACKAGE).so: $(OBJS_ANALYSIS_NEW)
+lib$(PACKAGE).so: $(OBJS_ANALYSIS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -47,15 +58,15 @@ endif
        $(CXX) $(CXXFLAGS) $(PACKCXXFLAGS) -c $< -o $@
 
 clean:
-       @rm -f $(OBJS_ANALYSIS_NEW) *.so G__$(PACKAGE).* $(PARFILE)
+       @rm -f $(OBJS_ANALYSIS) *.so G__$(PACKAGE).* $(PARFILE)
 
 G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
        @echo "Generating dictionary ..."
-       rootcint -f $@ -c $(ALICEINC) $^
+       rootcint -f $@ -c $(CINTFLAGS) $(ALICEINC) $^
 
 ### CREATE PAR FILE
 
-$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_ANALYSIS_NEW) $(SRCS_ANALYSIS_NEW) $(DHDR_ANALYSIS_NEW) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
+$(PARFILE): $(patsubst %,$(PACKAGE)/%,$(filter-out G__%, $(HDRS_ANALYSIS) $(SRCS_ANALYSIS) $(DHDR_ANALYSIS) Makefile Makefile.arch lib$(PACKAGE).pkg PROOF-INF))
        @echo "Creating archive" $@ ...
        @tar cfzh $@ $(PACKAGE)
        @rm -rf $(PACKAGE)