X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FMakefile;h=9ae14729e69535d63a277518ff1d5b43bc22f3c3;hb=0c75a99d0162cd666b1793fb2d06dbb8f0fd1af0;hp=c2d3814d0c27114045dbb4a32f588d6b90e709b0;hpb=06cc905afcb3504512e5404ee9ee2408f4863006;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index c2d3814d0c2..9ae14729e69 100644
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -1,30 +1,38 @@
 
 include $(ROOTSYS)/test/Makefile.arch
 
-default-target: libANALYSIS.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)
-	ifneq ($(AOD_INCLUDE),)
-		ALICEINC += -I../$(AOD_INCLUDE)
-	endif		
-else
-  ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include 
-  endif
 endif
 
-# for building of ANALYSIS.par
+ifneq ($(AOD_INCLUDE),)
+   ALICEINC += -I../$(AOD_INCLUDE)
+endif
+
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
 ifneq ($(ANALYSIS_INCLUDE),)
-  ALICEINC += -I../$(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
 include lib$(PACKAGE).pkg
 
 DHDR_ANALYSIS := $(DHDR)
@@ -38,7 +46,7 @@ PARFILE       = $(PACKAGE).par
 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 $@